svn commit: r1801214 - /uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/AnnotationTreeTest.java

[sc...@apache.org]

Author: schor
Date: Fri Jul  7 21:03:45 2017
New Revision: 1801214

URL: http://svn.apache.org/viewvc?rev=1801214&view=rev
Log:
[UIMA-5483] put in a dummy type priority in order to keep the old default type ordering so the tests still work.

Modified:
    uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/AnnotationTreeTest.java

Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/AnnotationTreeTest.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/AnnotationTreeTest.java?rev=1801214&r1=1801213&r2=1801214&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/AnnotationTreeTest.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/AnnotationTreeTest.java Fri Jul  7 21:03:45 2017
@@ -30,7 +30,10 @@ import org.apache.uima.cas.CAS;
 import org.apache.uima.cas.impl.XCASDeserializer;
 import org.apache.uima.cas.text.AnnotationTreeNode;
 import org.apache.uima.resource.metadata.FsIndexDescription;
+import org.apache.uima.resource.metadata.TypePriorities;
+import org.apache.uima.resource.metadata.TypePriorityList;
 import org.apache.uima.resource.metadata.TypeSystemDescription;
+import org.apache.uima.resource.metadata.impl.TypePriorities_impl;
 import org.apache.uima.test.junit_extension.JUnitExtension;
 import org.apache.uima.util.CasCreationUtils;
 import org.apache.uima.util.XMLInputSource;
@@ -66,21 +69,27 @@ public class AnnotationTreeTest extends
       // instantiate CAS to get type system. Also build style
       // map file if there is none.
       TypeSystemDescription tsDesc = (TypeSystemDescription) descriptor;
-      CAS cas = CasCreationUtils.createCas(tsDesc, null, new FsIndexDescription[0]);
+      
+      TypePriorities typePriorities = new TypePriorities_impl();
+      TypePriorityList priorityList = typePriorities.addPriorityList();
+      priorityList.addType("uima.cas.TOP");
+      priorityList.addType("uima.tcas.Annotation");
+      
+      CAS cas = CasCreationUtils.createCas(tsDesc, typePriorities, new FsIndexDescription[0]);
       SAXParser parser = SAXParserFactory.newInstance().newSAXParser();
       XCASDeserializer xcasDeserializer = new XCASDeserializer(cas.getTypeSystem());
       File xcasFile = new File(xcasDir, sampleXcas1FileName);
       parser.parse(xcasFile, xcasDeserializer.getXCASHandler(cas));
       AnnotationTreeNode root = cas.getAnnotationIndex().tree(cas.getDocumentAnnotation())
-	  .getRoot();
+                           	  .getRoot();
       // There are 7 paragraph annotations in the CAS.
       assertTrue("There should be 7 paragraphs, but are: " + root.getChildCount(), root
-	  .getChildCount() == 7);
+                          	  .getChildCount() == 7);
       // The first paragraph contains 19 sentences, each subsequent one
       // contains only one sentence.
       assertTrue(root.getChild(0).getChildCount() == 19);
       for (int i = 1; i < root.getChildCount(); i++) {
-	assertTrue(root.getChild(i).getChildCount() == 1);
+        assertTrue(root.getChild(i).getChildCount() == 1);
       }
       // First sentence contains 8 tokens.
       assertTrue(root.getChild(0).getChild(0).getChildCount() == 8);