Opened 3 years ago

Last modified 15 months ago

#1891 assigned task

Github PR: Hamcrest and Junit references added #11 by lukepadlp

Reported by: nextloop Owned by: str4d
Priority: minor Milestone: undecided
Component: unspecified Version: 0.9.28
Keywords: Cc: zzz
Parent Tickets: Sensitive: no

Description

Lukepadlp opened a pull request on our Github repository.
We probably have to merge it manually
https://github.com/i2p/i2p.i2p/pull/11

I append a patch. I am going to squash the two commits into one.

Subtickets

Change History (4)

comment:1 Changed 3 years ago by nextloop

Trac gives an error, trying to attach a file :-/

comment:2 Changed 3 years ago by nextloop

From b8ef6cae6855b121a087730e1bf03dbc01d5a798 Mon Sep 17 00:00:00 2001
From: lukepadlp <lukepadlp@gmail.com>
Date: Wed, 14 Dec 2016 15:06:09 -0600
Subject: [PATCH] Hamcrest and Junit references added

Added Hamcrest (all, 1.3) and JUnit (4.12) references into the .iml
files of all the apps (along with the installer and core) so the
matchers and test code (especially the stuff in core/java/test/junit)
could run.
---
 .idea/ant.xml                                      |  2 ++
 .idea/misc.xml                                     | 15 +------------
 apps/BOB/BOB.iml                                   |  4 ++++
 apps/addressbook/addressbook.iml                   |  5 +++++
 apps/admin/admin.iml                               |  4 ++++
 apps/desktopgui/desktopgui.iml                     |  4 ++++
 apps/i2psnark/i2psnark.iml                         |  4 ++++
 apps/i2ptunnel/i2ptunnel.iml                       |  4 ++++
 apps/imagegen/identicon/identicon.iml              |  4 ++++
 apps/imagegen/imagegen/imagegen.iml                |  4 ++++
 apps/imagegen/zxing/zxing.iml                      |  4 ++++
 apps/jetty/jetty.iml                               |  4 ++++
 apps/ministreaming/ministreaming.iml               |  4 ++++
 apps/routerconsole/routerconsole.iml               |  4 ++++
 apps/sam/sam.iml                                   |  4 ++++
 apps/streaming/streaming.iml                       |  4 ++++
 apps/susidns/susidns.iml                           |  4 ++++
 apps/susimail/susimail.iml                         |  4 ++++
 apps/systray/systray.iml                           |  4 ++++
 core/core.iml                                      | 16 +++++++++++++-
 installer/installer.iml                            |  4 ++++
 .../java/src/net/i2p/installer/FixWinPaths.java    |  3 ++-
 .../net/i2p/data/router/RouterAddressTest.java     | 18 ++++++++--------
 .../i2p/router/crypto/SessionEncryptionTest.java   | 18 ++++++++--------
 .../net/i2p/router/tunnel/GatewayTestBase.java     |  2 +-
 .../net/i2p/router/tunnel/InboundGatewayTest.java  |  2 +-
 .../junit/net/i2p/router/tunnel/InboundTest.java   |  4 ++--
 .../junit/net/i2p/router/tunnel/OutboundTest.java  |  2 +-
 router/router.iml                                  | 25 +++++++++++++++++++++-
 29 files changed, 140 insertions(+), 40 deletions(-)

diff --git a/.idea/ant.xml b/.idea/ant.xml
index a2a4769..9346142 100644
--- a/.idea/ant.xml
+++ b/.idea/ant.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="AntConfiguration">
+    <defaultAnt name="Apache Ant version 1.9.7" />
     <buildFile url="file://$PROJECT_DIR$/build.xml" />
+    <buildFile url="file://$PROJECT_DIR$/installer/java/build.xml" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index c82c6b6..62f9150 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -38,20 +38,7 @@
       <property name="caretWidth" class="java.lang.Integer" />
     </properties>
   </component>
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
-  </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build" />
   </component>
 </project>
\ No newline at end of file
diff --git a/apps/BOB/BOB.iml b/apps/BOB/BOB.iml
index bef2403..25b06e5 100644
--- a/apps/BOB/BOB.iml
+++ b/apps/BOB/BOB.iml
@@ -9,5 +9,9 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="core" />
     <orderEntry type="module" module-name="ministreaming" />
+    <orderEntry type="library" name="lib" level="project" />
+    <orderEntry type="library" name="tomcat-coyote-util" level="project" />
+    <orderEntry type="library" name="start" level="project" />
+    <orderEntry type="library" name="javax.servlet.jsp-2.2.0.v201112011158" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/apps/addressbook/addressbook.iml b/apps/addressbook/addressbook.iml
index a054410..b214c7b 100644
--- a/apps/addressbook/addressbook.iml
+++ b/apps/addressbook/addressbook.iml
@@ -21,5 +21,10 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="jettylib" level="project" />
     <orderEntry type="module" module-name="core" />
+    <orderEntry type="library" name="tomcat-lib" level="project" />
+    <orderEntry type="library" name="lib" level="project" />
+    <orderEntry type="library" name="tomcat-coyote-util" level="project" />
+    <orderEntry type="library" name="start" level="project" />
+    <orderEntry type="library" name="javax.servlet.jsp-2.2.0.v201112011158" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/apps/admin/admin.iml b/apps/admin/admin.iml
index c3afcd4..4de5d2a 100644
--- a/apps/admin/admin.iml
+++ b/apps/admin/admin.iml
@@ -10,5 +10,9 @@
     <orderEntry type="module" module-name="core" />
     <orderEntry type="module" module-name="router" />
     <orderEntry type="module" module-name="routerconsole" />
+    <orderEntry type="library" name="lib" level="project" />
+    <orderEntry type="library" name="tomcat-coyote-util" level="project" />
+    <orderEntry type="library" name="start" level="project" />
+    <orderEntry type="library" name="javax.servlet.jsp-2.2.0.v201112011158" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/apps/desktopgui/desktopgui.iml b/apps/desktopgui/desktopgui.iml
index d625059..6130c75 100644
--- a/apps/desktopgui/desktopgui.iml
+++ b/apps/desktopgui/desktopgui.iml
@@ -9,5 +9,9 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="core" />
     <orderEntry type="module" module-name="router" />
+    <orderEntry type="library" name="lib" level="project" />
+    <orderEntry type="library" name="tomcat-coyote-util" level="project" />
+    <orderEntry type="library" name="start" level="project" />
+    <orderEntry type="library" name="javax.servlet.jsp-2.2.0.v201112011158" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/apps/i2psnark/i2psnark.iml b/apps/i2psnark/i2psnark.iml
index 94bbb72..ba956b2 100644
--- a/apps/i2psnark/i2psnark.iml
+++ b/apps/i2psnark/i2psnark.iml
@@ -24,5 +24,9 @@
     <orderEntry type="module" module-name="ministreaming" />
     <orderEntry type="module" module-name="jetty" />
     <orderEntry type="module" module-name="systray" />
+    <orderEntry type="library" name="lib" level="project" />
+    <orderEntry type="library" name="tomcat-coyote-util" level="project" />
+    <orderEntry type="library" name="start" level="project" />
+    <orderEntry type="library" name="javax.servlet.jsp-2.2.0.v201112011158" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/apps/i2ptunnel/i2ptunnel.iml b/apps/i2ptunnel/i2ptunnel.iml
index d60f56b..88f22d5 100644
--- a/apps/i2ptunnel/i2ptunnel.iml
+++ b/apps/i2ptunnel/i2ptunnel.iml
@@ -28,5 +28,9 @@
     <orderEntry type="library" scope="TEST" name="junit:junit:4.12" level="application" />
     <orderEntry type="library" name="jettylib" level="project" />
     <orderEntry type="module" module-name="jetty" />
+    <orderEntry type="library" name="lib" level="project" />
+    <orderEntry type="library" name="tomcat-coyote-util" level="project" />
+    <orderEntry type="library" name="start" level="project" />
+    <orderEntry type="library" name="javax.servlet.jsp-2.2.0.v201112011158" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/apps/imagegen/identicon/identicon.iml b/apps/imagegen/identicon/identicon.iml
index c82b021..a138d0c 100644
--- a/apps/imagegen/identicon/identicon.iml
+++ b/apps/imagegen/identicon/identicon.iml
@@ -7,5 +7,9 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="lib" level="project" />
+    <orderEntry type="library" name="tomcat-coyote-util" level="project" />
+    <orderEntry type="library" name="start" level="project" />
+    <orderEntry type="library" name="javax.servlet.jsp-2.2.0.v201112011158" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/apps/imagegen/imagegen/imagegen.iml b/apps/imagegen/imagegen/imagegen.iml
index 2f95725..63d5430 100644
--- a/apps/imagegen/imagegen/imagegen.iml
+++ b/apps/imagegen/imagegen/imagegen.iml
@@ -23,5 +23,9 @@
     <orderEntry type="module" module-name="zxing" />
     <orderEntry type="module" module-name="core" />
     <orderEntry type="module" module-name="identicon" />
+    <orderEntry type="library" name="lib" level="project" />
+    <orderEntry type="library" name="tomcat-coyote-util" level="project" />
+    <orderEntry type="library" name="start" level="project" />
+    <orderEntry type="library" name="javax.servlet.jsp-2.2.0.v201112011158" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/apps/imagegen/zxing/zxing.iml b/apps/imagegen/zxing/zxing.iml
index 0c28884..8afb0a0 100644
--- a/apps/imagegen/zxing/zxing.iml
+++ b/apps/imagegen/zxing/zxing.iml
@@ -8,5 +8,9 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="lib" level="project" />
+    <orderEntry type="library" name="tomcat-coyote-util" level="project" />
+    <orderEntry type="library" name="start" level="project" />
+    <orderEntry type="library" name="javax.servlet.jsp-2.2.0.v201112011158" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/apps/jetty/jetty.iml b/apps/jetty/jetty.iml
index 520489b..c75d1c4 100644
--- a/apps/jetty/jetty.iml
+++ b/apps/jetty/jetty.iml
@@ -9,5 +9,9 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="jettylib" level="project" />
     <orderEntry type="module" module-name="core" />
+    <orderEntry type="library" name="lib" level="project" />
+    <orderEntry type="library" name="tomcat-coyote-util" level="project" />
+    <orderEntry type="library" name="start" level="project" />
+    <orderEntry type="library" name="javax.servlet.jsp-2.2.0.v201112011158" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/apps/ministreaming/ministreaming.iml b/apps/ministreaming/ministreaming.iml
index 0c5c3f0..ee44a08 100644
--- a/apps/ministreaming/ministreaming.iml
+++ b/apps/ministreaming/ministreaming.iml
@@ -12,5 +12,9 @@
     <orderEntry type="library" scope="TEST" name="junit:junit:4.12" level="application" />
     <orderEntry type="library" scope="TEST" name="org.hamcrest:hamcrest-library:1.3" level="application" />
     <orderEntry type="library" scope="TEST" name="org.mockito:mockito-core:2.0.54-beta" level="application" />
+    <orderEntry type="library" name="lib" level="project" />
+    <orderEntry type="library" name="tomcat-coyote-util" level="project" />
+    <orderEntry type="library" name="start" level="project" />
+    <orderEntry type="library" name="javax.servlet.jsp-2.2.0.v201112011158" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/apps/routerconsole/routerconsole.iml b/apps/routerconsole/routerconsole.iml
index dc25d9d..6a412b4 100644
--- a/apps/routerconsole/routerconsole.iml
+++ b/apps/routerconsole/routerconsole.iml
@@ -33,5 +33,9 @@
     <orderEntry type="module" module-name="router" />
     <orderEntry type="module" module-name="installer" />
     <orderEntry type="module" module-name="desktopgui" />
+    <orderEntry type="library" name="lib" level="project" />
+    <orderEntry type="library" name="tomcat-coyote-util" level="project" />
+    <orderEntry type="library" name="start" level="project" />
+    <orderEntry type="library" name="javax.servlet.jsp-2.2.0.v201112011158" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/apps/sam/sam.iml b/apps/sam/sam.iml
index dd854f2..a3e10d9 100644
--- a/apps/sam/sam.iml
+++ b/apps/sam/sam.iml
@@ -10,5 +10,9 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="core" />
     <orderEntry type="module" module-name="ministreaming" />
+    <orderEntry type="library" name="lib" level="project" />
+    <orderEntry type="library" name="tomcat-coyote-util" level="project" />
+    <orderEntry type="library" name="start" level="project" />
+    <orderEntry type="library" name="javax.servlet.jsp-2.2.0.v201112011158" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/apps/streaming/streaming.iml b/apps/streaming/streaming.iml
index 4c19244..9990390 100644
--- a/apps/streaming/streaming.iml
+++ b/apps/streaming/streaming.iml
@@ -13,5 +13,9 @@
     <orderEntry type="library" scope="TEST" name="junit:junit:4.12" level="application" />
     <orderEntry type="library" scope="TEST" name="org.hamcrest:hamcrest-library:1.3" level="application" />
     <orderEntry type="library" scope="TEST" name="org.mockito:mockito-core:2.0.54-beta" level="application" />
+    <orderEntry type="library" name="lib" level="project" />
+    <orderEntry type="library" name="tomcat-coyote-util" level="project" />
+    <orderEntry type="library" name="start" level="project" />
+    <orderEntry type="library" name="javax.servlet.jsp-2.2.0.v201112011158" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/apps/susidns/susidns.iml b/apps/susidns/susidns.iml
index c7494e4..3c2e3a7 100644
--- a/apps/susidns/susidns.iml
+++ b/apps/susidns/susidns.iml
@@ -8,5 +8,9 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="core" />
+    <orderEntry type="library" name="lib" level="project" />
+    <orderEntry type="library" name="tomcat-coyote-util" level="project" />
+    <orderEntry type="library" name="start" level="project" />
+    <orderEntry type="library" name="javax.servlet.jsp-2.2.0.v201112011158" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/apps/susimail/susimail.iml b/apps/susimail/susimail.iml
index 4b90a13..4aef0d2 100644
--- a/apps/susimail/susimail.iml
+++ b/apps/susimail/susimail.iml
@@ -22,5 +22,9 @@
     <orderEntry type="library" name="jettylib" level="project" />
     <orderEntry type="module" module-name="jetty" />
     <orderEntry type="module" module-name="core" />
+    <orderEntry type="library" name="lib" level="project" />
+    <orderEntry type="library" name="tomcat-coyote-util" level="project" />
+    <orderEntry type="library" name="start" level="project" />
+    <orderEntry type="library" name="javax.servlet.jsp-2.2.0.v201112011158" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/apps/systray/systray.iml b/apps/systray/systray.iml
index 25b9b6b..4f087de 100644
--- a/apps/systray/systray.iml
+++ b/apps/systray/systray.iml
@@ -9,5 +9,9 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="systray4j" level="project" />
     <orderEntry type="module" module-name="core" />
+    <orderEntry type="library" name="lib" level="project" />
+    <orderEntry type="library" name="tomcat-coyote-util" level="project" />
+    <orderEntry type="library" name="start" level="project" />
+    <orderEntry type="library" name="javax.servlet.jsp-2.2.0.v201112011158" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/core/core.iml b/core/core.iml
index b5994e7..e86fd78 100644
--- a/core/core.iml
+++ b/core/core.iml
@@ -10,6 +10,20 @@
     <orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" scope="TEST" name="junit:junit:4.12" level="application" />
-    <orderEntry type="library" scope="TEST" name="org.hamcrest:hamcrest-library:1.3" level="application" />
+    <orderEntry type="library" scope="TEST" name="org.hamcrest:hamcrest-all:1.3" level="application" />
+    <orderEntry type="library" name="lib" level="project" />
+    <orderEntry type="library" name="tomcat-coyote-util" level="project" />
+    <orderEntry type="library" name="start" level="project" />
+    <orderEntry type="library" name="javax.servlet.jsp-2.2.0.v201112011158" level="project" />
+    <orderEntry type="module-library" scope="TEST">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/java/test/junit/net/i2p/junit-4.12.jar!/" />
+          <root url="jar://$MODULE_DIR$/java/test/junit/net/i2p/hamcrest-all-1.3.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
   </component>
 </module>
\ No newline at end of file
diff --git a/installer/installer.iml b/installer/installer.iml
index 94d03de..342489f 100644
--- a/installer/installer.iml
+++ b/installer/installer.iml
@@ -10,5 +10,9 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="core" />
     <orderEntry type="module" module-name="router" />
+    <orderEntry type="library" name="lib" level="project" />
+    <orderEntry type="library" name="tomcat-coyote-util" level="project" />
+    <orderEntry type="library" name="start" level="project" />
+    <orderEntry type="library" name="javax.servlet.jsp-2.2.0.v201112011158" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/installer/java/src/net/i2p/installer/FixWinPaths.java b/installer/java/src/net/i2p/installer/FixWinPaths.java
index 698f610..bfb5bd9 100644
--- a/installer/java/src/net/i2p/installer/FixWinPaths.java
+++ b/installer/java/src/net/i2p/installer/FixWinPaths.java
@@ -8,7 +8,8 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
-import java.io.PrintStream;
+// Unused import
+//import java.io.PrintStream;
 
 
 /**
diff --git a/router/java/test/junit/net/i2p/data/router/RouterAddressTest.java b/router/java/test/junit/net/i2p/data/router/RouterAddressTest.java
index 090f7f4..ccbe01c 100644
--- a/router/java/test/junit/net/i2p/data/router/RouterAddressTest.java
+++ b/router/java/test/junit/net/i2p/data/router/RouterAddressTest.java
@@ -31,8 +31,8 @@ public class RouterAddressTest extends StructureTest {
         Properties options = new Properties();
         options.setProperty("hostname", "localhost");
         options.setProperty("portnum", "1234");
-        addr.setOptions(options);
-        addr.setTransportStyle("Blah");
+        addr.setOptions(options); // setOptions(...) is deprecated
+        addr.setTransportStyle("Blah"); // setTransportStyle(...) is also deprecated
         return addr; 
     }
     public DataStructure createStructureToRead() { return new RouterAddress(); }
@@ -41,7 +41,7 @@ public class RouterAddressTest extends StructureTest {
         RouterAddress addr = new RouterAddress();
         boolean error = false;
         try{
-            addr.setOptions(null);
+            addr.setOptions(null); // setOptions(...) is deprecated
         }catch(NullPointerException dfe){
             error = true;
         }
@@ -53,11 +53,11 @@ public class RouterAddressTest extends StructureTest {
         Properties options = new Properties();
         options.setProperty("hostname", "localhost");
         options.setProperty("portnum", "1234");
-        addr.setOptions(options);
+        addr.setOptions(options); // setOptions(...) is deprecated
         options.setProperty("portnum", "2345");
         boolean error = false;
         try{
-            addr.setOptions(options);
+            addr.setOptions(options); // setOptions(...) is deprecated
         }catch(IllegalStateException dfe){
             error = true;
         }
@@ -85,8 +85,8 @@ public class RouterAddressTest extends StructureTest {
         Properties options = new Properties();
         options.setProperty("hostname", "localhost");
         options.setProperty("portnum", "1234");
-        addr.setOptions(options);
-        addr.setTransportStyle("Blah");
+        addr.setOptions(options);  // setOptions(...) is deprecated
+        addr.setTransportStyle("Blah"); // setTransportStyle(...) is deprecated
         assertFalse(addr.equals(null));
         assertFalse(addr.equals(""));
     }
@@ -101,8 +101,8 @@ public class RouterAddressTest extends StructureTest {
         Properties options = new Properties();
         options.setProperty("hostname", "localhost");
         options.setProperty("portnum", "1234");
-        addr.setOptions(options);
-        addr.setTransportStyle("Blah");
+        addr.setOptions(options);  // setOptions(...) is deprecated
+        addr.setTransportStyle("Blah"); // setTransportStyle(...) is deprecated
         String ret = addr.toString();
         //assertEquals("[RouterAddress: \n\tTransportStyle: Blah\n\tCost: 42\n\tExpiration: Fri Jan 02 00:00:00 UTC 1970\n\tOptions: #: 2\n\t\t[hostname] = [localhost]\n\t\t[portnum] = [1234]]", ret);
         assertEquals("[RouterAddress: \n\tType: Blah\n\tCost: 42\n\tOptions (2):\n\t\t[hostname] = [localhost]\n\t\t[portnum] = [1234]]", ret);
diff --git a/router/java/test/junit/net/i2p/router/crypto/SessionEncryptionTest.java b/router/java/test/junit/net/i2p/router/crypto/SessionEncryptionTest.java
index 9f2b041..b92115e 100644
--- a/router/java/test/junit/net/i2p/router/crypto/SessionEncryptionTest.java
+++ b/router/java/test/junit/net/i2p/router/crypto/SessionEncryptionTest.java
@@ -48,7 +48,7 @@ public class SessionEncryptionTest extends TestCase{
         
         byte[] msg = DataHelper.getASCII("msg 1");
         
-        byte emsg[] = _context.elGamalAESEngine().encrypt(msg, pubKey, curKey, 64);
+        byte emsg[] = _context.elGamalAESEngine().encrypt(msg, pubKey, curKey, 64); // encrypt(...) is Deprecated
         byte dmsg[] = _context.elGamalAESEngine().decrypt(emsg, privKey, skm);
         assertTrue(DataHelper.eq(dmsg, msg));
     }
@@ -62,7 +62,7 @@ public class SessionEncryptionTest extends TestCase{
         
         byte[] msg = DataHelper.getASCII("msg 2");
         
-        byte emsg[] = _context.elGamalAESEngine().encrypt(msg, pubKey, curKey, 64);
+        byte emsg[] = _context.elGamalAESEngine().encrypt(msg, pubKey, curKey, 64); // encrypt(...) is Deprecated
         byte dmsg[] = _context.elGamalAESEngine().decrypt(emsg, privKey, skm);
         assertTrue(DataHelper.eq(dmsg, msg));
     }
@@ -101,7 +101,7 @@ public class SessionEncryptionTest extends TestCase{
         byte[] msg4 = DataHelper.getASCII("msg 4");
         byte[] msg5 = DataHelper.getASCII("msg 5");
         
-        byte emsg1[] = _context.elGamalAESEngine().encrypt(msg1, pubKey, curKey, firstTags, 64);
+        byte emsg1[] = _context.elGamalAESEngine().encrypt(msg1, pubKey, curKey, firstTags, 64); // encrypt(...) is Deprecated
         
         byte dmsg1[] = _context.elGamalAESEngine().decrypt(emsg1, privKey, skm);
         assertTrue(DataHelper.eq(dmsg1, msg1));
@@ -201,7 +201,7 @@ public class SessionEncryptionTest extends TestCase{
         byte[] msg4 = DataHelper.getASCII("msg 4");
         byte[] msg5 = DataHelper.getASCII("msg 5");
         
-        byte emsg1[] = _context.elGamalAESEngine().encrypt(msg1, pubKey, curKey, firstTags, 64);
+        byte emsg1[] = _context.elGamalAESEngine().encrypt(msg1, pubKey, curKey, firstTags, 64); // encrypt(...) is Deprecated
         
         byte dmsg1[] = _context.elGamalAESEngine().decrypt(emsg1, privKey, skm);
         assertTrue(DataHelper.eq(dmsg1, msg1));
@@ -216,7 +216,7 @@ public class SessionEncryptionTest extends TestCase{
         
         assertNotNull(curTag);
         
-        byte emsg2[] = _context.elGamalAESEngine().encrypt(msg2, pubKey, curKey, null, curTag, 64);
+        byte emsg2[] = _context.elGamalAESEngine().encrypt(msg2, pubKey, curKey, null, curTag, 64); // encrypt(...) is Deprecated
         
         byte dmsg2[] = _context.elGamalAESEngine().decrypt(emsg2, privKey, skm);
         assertTrue(DataHelper.eq(dmsg2, msg2));
@@ -229,7 +229,7 @@ public class SessionEncryptionTest extends TestCase{
         assertNotNull(curTag);
         assertNotNull(curKey);
         
-        byte emsg3[] = _context.elGamalAESEngine().encrypt(msg3, pubKey, curKey, secondTags, curTag, nextKey, 64);
+        byte emsg3[] = _context.elGamalAESEngine().encrypt(msg3, pubKey, curKey, secondTags, curTag, nextKey, 64); // encrypt(...) is Deprecated
         
         byte dmsg3[] = _context.elGamalAESEngine().decrypt(emsg3, privKey, skm);
         assertTrue(DataHelper.eq(dmsg3, msg3));
@@ -245,7 +245,7 @@ public class SessionEncryptionTest extends TestCase{
         assertNotNull(curTag);
         assertNotNull(curKey);
         
-        byte emsg4[] = _context.elGamalAESEngine().encrypt(msg4, pubKey, curKey, null, curTag, 64);
+        byte emsg4[] = _context.elGamalAESEngine().encrypt(msg4, pubKey, curKey, null, curTag, 64); // encrypt(...) is Deprecated
         
         byte dmsg4[] = _context.elGamalAESEngine().decrypt(emsg4, privKey, skm);
         assertTrue(DataHelper.eq(dmsg4, msg4));
@@ -258,7 +258,7 @@ public class SessionEncryptionTest extends TestCase{
         assertNotNull(curTag);
         assertNotNull(curKey);
         
-        byte emsg5[] = _context.elGamalAESEngine().encrypt(msg5, pubKey, curKey, null, curTag, 64);
+        byte emsg5[] = _context.elGamalAESEngine().encrypt(msg5, pubKey, curKey, null, curTag, 64); // encrypt(...) is Deprecated
         
         byte dmsg5[] = _context.elGamalAESEngine().decrypt(emsg5, privKey, skm);
         assertTrue(DataHelper.eq(dmsg5, msg5));
@@ -293,7 +293,7 @@ public class SessionEncryptionTest extends TestCase{
             
             byte[] msg = DataHelper.getASCII("msg " + i);
             
-            byte emsg[] = _context.elGamalAESEngine().encrypt(msg, pubKey, curKey, tags, curTag, nextKey, 64);
+            byte emsg[] = _context.elGamalAESEngine().encrypt(msg, pubKey, curKey, tags, curTag, nextKey, 64); // encrypt(...) is Deprecated
             
             byte dmsg[] = _context.elGamalAESEngine().decrypt(emsg, privKey, skm);
             assertTrue(DataHelper.eq(dmsg, msg));
diff --git a/router/java/test/junit/net/i2p/router/tunnel/GatewayTestBase.java b/router/java/test/junit/net/i2p/router/tunnel/GatewayTestBase.java
index 153515e..cca307d 100644
--- a/router/java/test/junit/net/i2p/router/tunnel/GatewayTestBase.java
+++ b/router/java/test/junit/net/i2p/router/tunnel/GatewayTestBase.java
@@ -158,7 +158,7 @@ public abstract class GatewayTestBase extends RouterTestBase {
             // fake all the hops...
             
             for (int i = 1; i <= _config.getLength() - getLastHop(); i++) {
-                HopProcessor hop = new HopProcessor(_context, _config.getConfig(i));
+                HopProcessor hop = new HopProcessor(_context, _config.getConfig(i)); // HopProcessor(...) is deprecated
                 assertTrue(hop.process(encrypted, 0, encrypted.length, _config.getConfig(i).getReceiveFrom()));
             }
             
diff --git a/router/java/test/junit/net/i2p/router/tunnel/InboundGatewayTest.java b/router/java/test/junit/net/i2p/router/tunnel/InboundGatewayTest.java
index ede9eae..782b0c6 100644
--- a/router/java/test/junit/net/i2p/router/tunnel/InboundGatewayTest.java
+++ b/router/java/test/junit/net/i2p/router/tunnel/InboundGatewayTest.java
@@ -37,7 +37,7 @@ public class InboundGatewayTest extends GatewayTestBase {
         @Override
         protected void handleAtEndpoint(byte []encrypted) {
             // now handle it at the endpoint
-            InboundEndpointProcessor end = new InboundEndpointProcessor(_context, _config);
+            InboundEndpointProcessor end = new InboundEndpointProcessor(_context, _config); // InboundEndpointProcessor(...) is deprecated
             assertTrue(end.retrievePreprocessedData(encrypted, 0, encrypted.length, _config.getPeer(_config.getLength()-2)));
         }
     }
diff --git a/router/java/test/junit/net/i2p/router/tunnel/InboundTest.java b/router/java/test/junit/net/i2p/router/tunnel/InboundTest.java
index c9266b2..1acccb6 100644
--- a/router/java/test/junit/net/i2p/router/tunnel/InboundTest.java
+++ b/router/java/test/junit/net/i2p/router/tunnel/InboundTest.java
@@ -35,12 +35,12 @@ public class InboundTest extends RouterTestBase {
         p.process(message, 0, message.length, null);
         
         for (int i = 1; i < numHops-1; i++) {
-            HopProcessor hop = new HopProcessor(_context, _config.getConfig(i));
+            HopProcessor hop = new HopProcessor(_context, _config.getConfig(i)); // HopProcessor(...) is deprecated
             Hash prev = _config.getConfig(i).getReceiveFrom();
             assertTrue(hop.process(message, 0, message.length, prev));
         }
         
-        InboundEndpointProcessor end = new InboundEndpointProcessor(_context, _config);
+        InboundEndpointProcessor end = new InboundEndpointProcessor(_context, _config); // InboundEndpointProcessor(...) is deprecated
         assertTrue(end.retrievePreprocessedData(message, 0, message.length, _config.getPeer(numHops-2)));
         
         assertTrue(DataHelper.eq(orig, 16, message, 16, orig.length - 16));
diff --git a/router/java/test/junit/net/i2p/router/tunnel/OutboundTest.java b/router/java/test/junit/net/i2p/router/tunnel/OutboundTest.java
index 870baea..9b1672f 100644
--- a/router/java/test/junit/net/i2p/router/tunnel/OutboundTest.java
+++ b/router/java/test/junit/net/i2p/router/tunnel/OutboundTest.java
@@ -38,7 +38,7 @@ public class OutboundTest extends TestCase{
         p.process(message, 0, message.length);
         
         for (int i = 0; i < numHops; i++) {
-            HopProcessor hop = new HopProcessor(_context, config.getConfig(i));
+            HopProcessor hop = new HopProcessor(_context, config.getConfig(i)); // HopProcessor(...) is deprecated
             Hash prev = config.getConfig(i).getReceiveFrom();
             assertTrue(hop.process(message, 0, message.length, prev));
         }
diff --git a/router/router.iml b/router/router.iml
index 26f20a0..194a658 100644
--- a/router/router.iml
+++ b/router/router.iml
@@ -9,6 +9,29 @@
     <orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="core" />
-    <orderEntry type="library" scope="TEST" name="junit:junit:4.12" level="application" />
+    <orderEntry type="library" name="junit:junit:4.12" level="application" />
+    <orderEntry type="library" name="lib" level="project" />
+    <orderEntry type="library" name="tomcat-coyote-util" level="project" />
+    <orderEntry type="library" name="start" level="project" />
+    <orderEntry type="library" name="javax.servlet.jsp-2.2.0.v201112011158" level="project" />
+    <orderEntry type="module-library" scope="TEST">
+      <library>
+        <CLASSES>
+          <root url="jar://$APPLICATION_HOME_DIR$/lib/junit.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" scope="TEST">
+      <library name="JUnit4">
+        <CLASSES>
+          <root url="jar://$APPLICATION_HOME_DIR$/lib/junit-4.12.jar!/" />
+          <root url="jar://$APPLICATION_HOME_DIR$/lib/hamcrest-core-1.3.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
   </component>
 </module>
\ No newline at end of file
-- 
2.9.3

Last edited 3 years ago by nextloop (previous) (diff)

comment:3 Changed 3 years ago by zzz

Owner: set to str4d
Status: newassigned

The .iml files are str4d's doing so assigning to him.
Possibly related: #1767 ?
Also note to him, the jrobin changes in .28 will probably require additional changes in all the IDE files.

comment:4 Changed 15 months ago by zzz

This patch is obsolete. Str4d removed almost all the iml files on 2017-11-27 for 0.9.33, now generated by gradle?
Only the following iml files remain:
apps/imagegen/imagegen/imagegen.iml
apps/imagegen/identicon/identicon.iml
apps/imagegen/zxing/zxing.iml
apps/admin/admin.iml
and the .idea/ dir still exists.

Still str4d's ticket to deal with or close. Also, did he intend to leave the above files or should they be deleted also?

Note: See TracTickets for help on using tickets.