Tests improved

Author: phax

.gitignore

@@ -13,3 +13,4 @@ hs_err_pid*
 /target/
 /**/.pmd
 /**/*.iml
+/**/*.rar

ph-as4-lib/pom.xml

@@ -90,16 +90,6 @@
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcmail-jdk15on</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.wss4j</groupId>
-      <artifactId>wss4j-ws-security-dom</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>javax.xml.stream</groupId>
-          <artifactId>stax-api</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>

ph-as4-lib/src/main/java/com/helger/as4/http/HttpMimeMessageEntity.java

@@ -68,7 +68,7 @@ public long getContentLength ()
 
   public boolean isStreaming ()
   {
-    return true;
+    return false;
   }
 
   public InputStream getContent () throws IOException

ph-as4-server-webapp-test/src/test/java/com/helger/as4/server/MockJettySetup.java

@@ -36,6 +36,9 @@
 
 public final class MockJettySetup extends AbstractClientSetUp
 {
+  public static final String SETTINGS_SERVER_JETTY_ENABLED = "server.jetty.enabled";
+  public static final String SETTINGS_SERVER_ADDRESS = "server.address";
+
   private static JettyRunner s_aJetty;
   private static AS4ResourceManager s_aResMgr;
 
@@ -44,12 +47,12 @@ private MockJettySetup ()
 
   private static boolean _isRunJetty ()
   {
-    return AS4ServerConfiguration.getSettings ().getAsBoolean ("server.jetty.enabled", false);
+    return AS4ServerConfiguration.getSettings ().getAsBoolean (SETTINGS_SERVER_JETTY_ENABLED, false);
   }
 
   private static int _getJettyPort ()
   {
-    return URLHelper.getAsURL (AS4ServerConfiguration.getSettings ().getAsString ("server.address")).getPort ();
+    return URLHelper.getAsURL (AS4ServerConfiguration.getSettings ().getAsString (SETTINGS_SERVER_ADDRESS)).getPort ();
   }
 
   @BeforeClass

ph-as4-server-webapp-test/src/test/java/com/helger/as4/server/message/AbstractUserMessageTestSetUp.java

@@ -124,7 +124,7 @@ private HttpPost _createPost ()
     LOG.info ("The following test case will only work if there is a local AS4 server running @ " + sURL);
     final HttpPost aPost = new HttpPost (sURL);
 
-    if (m_aSettings.getAsBoolean ("server.proxy.enabled", false))
+    if (m_aSettings.getAsBoolean ("server.proxy.enabled", false) && !"localhost".equals (aPost.getURI ().getHost ()))
     {
       aPost.setConfig (RequestConfig.custom ()
                                     .setProxy (new HttpHost (m_aSettings.getAsString ("server.proxy.address"),

ph-as4-servlet/src/main/java/com/helger/as4/servlet/AS4Handler.java

@@ -1374,10 +1374,8 @@ private static Document _readXML (@Nonnull final InputStream aRequestIS) throws
     if (true || isDebug ())
     {
       final byte [] aBytes = StreamHelper.getAllBytes (aRequestIS);
-      s_aLogger.info ("GOT[" +
-                      Charset.defaultCharset ().name () +
-                      "]:\n" +
-                      new String (aBytes, Charset.defaultCharset ()));
+      final Charset aCharset = Charset.defaultCharset ();
+      s_aLogger.info ("GOT[" + aCharset.name () + "]:\n" + new String (aBytes, aCharset));
       return DOMReader.readXMLDOM (aBytes);
     }
     return DOMReader.readXMLDOM (aRequestIS);

ph-as4-servlet/src/main/java/com/helger/as4/servlet/mgr/AS4DuplicateCleanupJob.java

@@ -30,7 +30,6 @@
 import com.helger.commons.collection.impl.ICommonsMap;
 import com.helger.commons.datetime.PDTFactory;
 import com.helger.commons.lang.ClassHelper;
-import com.helger.photon.basic.app.CApplicationID;
 import com.helger.photon.core.job.AbstractPhotonJob;
 import com.helger.quartz.DisallowConcurrentExecution;
 import com.helger.quartz.IJobExecutionContext;
@@ -47,10 +46,7 @@ public final class AS4DuplicateCleanupJob extends AbstractPhotonJob
   private static final String KEY_MINUTES = "mins";
 
   public AS4DuplicateCleanupJob ()
-  {
-    // Fixed ID
-    super (CApplicationID.APP_ID_SECURE);
-  }
+  {}
 
   @Override
   protected void onExecute (@Nonnull final JobDataMap aJobDataMap,

pom.xml

@@ -76,49 +76,49 @@
       <dependency>
         <groupId>com.helger</groupId>
         <artifactId>ph-commons-parent-pom</artifactId>
-        <version>9.0.0-b1</version>
+        <version>9.0.0-SNAPSHOT</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>com.helger</groupId>
         <artifactId>ph-xsds-parent-pom</artifactId>
-        <version>2.0.0-b1</version>
+        <version>2.0.0-SNAPSHOT</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>com.helger</groupId>
         <artifactId>ph-schedule-parent-pom</artifactId>
-        <version>4.0.0-b1</version>
+        <version>4.0.0-SNAPSHOT</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>com.helger</groupId>
         <artifactId>ph-web-parent-pom</artifactId>
-        <version>9.0.0-b1</version>
+        <version>9.0.0-SNAPSHOT</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>com.helger</groupId>
         <artifactId>ph-masterdata-parent-pom</artifactId>
-        <version>6.0.0-b1</version>
+        <version>6.0.0-SNAPSHOT</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>com.helger</groupId>
         <artifactId>ph-oton-parent-pom</artifactId>
-        <version>8.0.0-b1</version>
+        <version>8.0.0-SNAPSHOT</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>com.helger</groupId>
         <artifactId>peppol-commons-parent-pom</artifactId>
-        <version>6.0.0-b1</version>
+        <version>6.0.0-SNAPSHOT</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -139,6 +139,7 @@
         <artifactId>wss4j-ws-security-dom</artifactId>
         <version>${wss4j.version}</version>
         <exclusions>
+          <!-- Conflicts with javax.mail -->
           <exclusion>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-javamail_1.4_spec</artifactId>
@@ -201,4 +202,20 @@
       </plugins>
     </pluginManagement>
   </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.wss4j</groupId>
+      <artifactId>wss4j-ws-security-dom</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>javax.xml.stream</groupId>
+          <artifactId>stax-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.geronimo.javamail</groupId>
+          <artifactId>geronimo-javamail_1.4_mail</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+  </dependencies>
 </project>