svn commit: r1636868 - in /uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test: TestSuite.java helper/Testing.java

[degenaro]

Author: degenaro
Date: Wed Nov  5 13:13:51 2014
New Revision: 1636868

URL: http://svn.apache.org/r1636868
Log:
UIMA-4069 Redesign of JD toward the main goal of classpath separation for 
container (system) code.

Enable MetaCas prefix verification which is now fixed under Maven build.

Modified:
    
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestSuite.java
    
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/helper/Testing.java

Modified: 
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestSuite.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestSuite.java?rev=1636868&r1=1636867&r2=1636868&view=diff
==============================================================================
--- 
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestSuite.java
 (original)
+++ 
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestSuite.java
 Wed Nov  5 13:13:51 2014
@@ -88,7 +88,14 @@ public class TestSuite {
                        out_println(message);
                }
        }
-
+       
+       String prefix1 = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><xmi:XMI 
xmlns:tcas=\"http:///uima/tcas.ecore\"";;
+       String prefix0 = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><xmi:XMI 
xmlns:cas=\"http:///uima/cas.ecore\"";;
+        
+       private void checkCas(String cas) {
+               assertTrue(cas.startsWith(prefix0) || cas.startsWith(prefix1));
+       }
+       
        private void testIncludeAll(String[] userCP, String crXml, String 
crCfg) {
                try {
                        URL[] classLoaderUrls = new URL[userCP.length];
@@ -236,11 +243,8 @@ public class TestSuite {
                        asExpected("seqNo = "+seqNo);
                        assertTrue(seqNo == 1);
                        String serializedCas = (String)mc.getSerializedCas();
+                       checkCas(serializedCas);
                        asExpected("cas = "+serializedCas);
-                       if(Testing.isVerifyPrefix()) {
-                               String prefix = "<?xml version=\"1.0\" 
encoding=\"UTF-8\"?><xmi:XMI xmlns:cas=\"http:///uima/cas.ecore\"";;
-                               assertTrue(serializedCas.startsWith(prefix));
-                       }
                        String documentText = mc.getDocumentText();
                        asExpected("documentText = "+documentText);
                        assertTrue(documentText.equals("1"));
@@ -270,11 +274,8 @@ public class TestSuite {
                        asExpected("seqNo = "+seqNo);
                        assertTrue(seqNo == c);
                        String serializedCas = (String)mc.getSerializedCas();
+                       checkCas(serializedCas);
                        asExpected("cas = "+serializedCas);
-                       if(Testing.isVerifyPrefix()) {
-                               String prefix = "<?xml version=\"1.0\" 
encoding=\"UTF-8\"?><xmi:XMI xmlns:cas=\"http:///uima/cas.ecore\"";;
-                               assertTrue(serializedCas.startsWith(prefix));
-                       }
                        String documentText = mc.getDocumentText();
                        asExpected("documentText = "+documentText);
                        assertTrue(documentText.equals(""+c));

Modified: 
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/helper/Testing.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/helper/Testing.java?rev=1636868&r1=1636867&r2=1636868&view=diff
==============================================================================
--- 
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/helper/Testing.java
 (original)
+++ 
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/helper/Testing.java
 Wed Nov  5 13:13:51 2014
@@ -25,8 +25,6 @@ public class Testing {
        private static boolean warned = false;
        private static boolean debug = false;
        
-       private static boolean verifyPrefix = false;
-       
        public static boolean isDisabled(String name ) {
                if(disabled) {
                        if(!warned) {
@@ -45,7 +43,4 @@ public class Testing {
                return debug;
        }
        
-       public static boolean isVerifyPrefix() {
-               return verifyPrefix;
-       }
 }