svn commit: r1896024 - in /manifoldcf/trunk/connectors/alfresco-webscript/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/tests: APISanityHSQLDBIT.java BaseITHSQLDB.java

[schuch]

Author: schuch
Date: Thu Dec 16 07:28:38 2021
New Revision: 1896024

URL: http://svn.apache.org/viewvc?rev=1896024&view=rev
Log:
CONNECTORS-1685: Disable test setup, too

Modified:
    
manifoldcf/trunk/connectors/alfresco-webscript/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/tests/APISanityHSQLDBIT.java
    
manifoldcf/trunk/connectors/alfresco-webscript/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/tests/BaseITHSQLDB.java

Modified: 
manifoldcf/trunk/connectors/alfresco-webscript/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/tests/APISanityHSQLDBIT.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/alfresco-webscript/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/tests/APISanityHSQLDBIT.java?rev=1896024&r1=1896023&r2=1896024&view=diff
==============================================================================
--- 
manifoldcf/trunk/connectors/alfresco-webscript/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/tests/APISanityHSQLDBIT.java
 (original)
+++ 
manifoldcf/trunk/connectors/alfresco-webscript/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/tests/APISanityHSQLDBIT.java
 Thu Dec 16 07:28:38 2021
@@ -59,7 +59,9 @@ public class APISanityHSQLDBIT extends B
     throws Exception
   {
     removeTestArea();
-    
+    if (wrongJavaVersion()) {
+      return;
+    }
     try
     {
       //Adding a document in Alfresco via CMIS
@@ -84,20 +86,6 @@ public class APISanityHSQLDBIT extends B
   {
   }
   
-  public static boolean wrongJavaVersion() throws Exception {
-    String version = System.getProperty("java.version");
-    int index = version.indexOf("_");
-    if (index == -1) {
-      return false;
-    }
-    String update = version.substring(index + 1);
-    if (Integer.parseInt(update) <= 255) {
-      return false;
-    }
-    System.err.println("Not running Alfresco integration test because your 
version of java is incompatible: "+version);
-    return true;
-  }
-  
   @Test
   public void sanityCheck()
     throws Exception

Modified: 
manifoldcf/trunk/connectors/alfresco-webscript/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/tests/BaseITHSQLDB.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/alfresco-webscript/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/tests/BaseITHSQLDB.java?rev=1896024&r1=1896023&r2=1896024&view=diff
==============================================================================
--- 
manifoldcf/trunk/connectors/alfresco-webscript/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/tests/BaseITHSQLDB.java
 (original)
+++ 
manifoldcf/trunk/connectors/alfresco-webscript/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/tests/BaseITHSQLDB.java
 Thu Dec 16 07:28:38 2021
@@ -54,6 +54,10 @@ public class BaseITHSQLDB extends org.ap
   public void setUpAlfresco()
     throws Exception
   {
+    if (wrongJavaVersion()) {
+      return;
+    }
+
     alfrescoServer = new Server(9090);
     alfrescoServer.setStopAtShutdown(true);
 
@@ -84,4 +88,19 @@ public class BaseITHSQLDB extends org.ap
       Thread.sleep(5000);
     }
   }
+
+  public static boolean wrongJavaVersion() throws Exception {
+    String version = System.getProperty("java.version");
+    System.out.println(version);
+    int index = version.indexOf("_");
+    if (index == -1) {
+      return false;
+    }
+    String update = version.substring(index + 1);
+    if (Integer.parseInt(update) <= 255) {
+      return false;
+    }
+    System.err.println("Not running Alfresco integration test because your 
version of java is incompatible: "+version);
+    return true;
+  }
 }