You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by al...@apache.org on 2007/01/16 19:06:19 UTC
svn commit: r496804 [1/7] - in
/incubator/uima/uimaj/trunk/uimaj-core/src/test:
java/org/apache/uima/cas/impl/ java/org/apache/uima/util/
resources/ExampleCas/
Author: alally
Date: Tue Jan 16 10:06:18 2007
New Revision: 496804
URL: http://svn.apache.org/viewvc?view=rev&rev=496804
Log:
Cleaning up test cases... scaled down hutt.xml and merged with
testTypeSystem.xml, renamed types to use namespace
org.apache.uima.testTypeSystem.
UIMA-45: http://issues.apache.org/jira/browse/UIMA-45
Added:
incubator/uima/uimaj/trunk/uimaj-core/src/test/resources/ExampleCas/testIndexes.xml
- copied, changed from r496391, incubator/uima/uimaj/trunk/uimaj-core/src/test/resources/ExampleCas/kltIndexes.xml
Removed:
incubator/uima/uimaj/trunk/uimaj-core/src/test/resources/ExampleCas/hutt.xml
incubator/uima/uimaj/trunk/uimaj-core/src/test/resources/ExampleCas/klt.xml
incubator/uima/uimaj/trunk/uimaj-core/src/test/resources/ExampleCas/kltIndexes.xml
Modified:
incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/XCASDeserializerTest.java
incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/XmiCasDeserializerTest.java
incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/util/CasCopierTest.java
incubator/uima/uimaj/trunk/uimaj-core/src/test/resources/ExampleCas/cas.xml
incubator/uima/uimaj/trunk/uimaj-core/src/test/resources/ExampleCas/partialTestTypeSystem.xml
incubator/uima/uimaj/trunk/uimaj-core/src/test/resources/ExampleCas/testTypeSystem.xml
incubator/uima/uimaj/trunk/uimaj-core/src/test/resources/ExampleCas/testTypeSystem_withMultiRefs.xml
incubator/uima/uimaj/trunk/uimaj-core/src/test/resources/ExampleCas/v1cas.xml
incubator/uima/uimaj/trunk/uimaj-core/src/test/resources/ExampleCas/v1xmiCas.xml
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/XCASDeserializerTest.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/XCASDeserializerTest.java?view=diff&rev=496804&r1=496803&r2=496804
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/XCASDeserializerTest.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/XCASDeserializerTest.java Tue Jan 16 10:06:18 2007
@@ -72,7 +72,7 @@
protected void setUp() throws Exception {
File typeSystemFile = JUnitExtension.getFile("ExampleCas/testTypeSystem.xml");
- File indexesFile = JUnitExtension.getFile("ExampleCas/kltIndexes.xml");
+ File indexesFile = JUnitExtension.getFile("ExampleCas/testIndexes.xml");
typeSystem = UIMAFramework.getXMLParser().parseTypeSystemDescription(
new XMLInputSource(typeSystemFile));
@@ -135,9 +135,9 @@
serCasStream.close();
// check that array refs are not null
- Type entityType = cas.getTypeSystem().getType("org.apache.uima.klt.Entity");
+ Type entityType = cas.getTypeSystem().getType("org.apache.uima.testTypeSystem.Entity");
Feature classesFeat = entityType.getFeatureByBaseName("classes");
- Iterator iter = cas.getIndexRepository().getIndex("kltEntityIndex").iterator();
+ Iterator iter = cas.getIndexRepository().getIndex("testEntityIndex").iterator();
assertTrue(iter.hasNext());
while (iter.hasNext()) {
FeatureStructure fs = (FeatureStructure) iter.next();
@@ -200,9 +200,9 @@
xmlReader.parse(new InputSource(new StringReader(xml)));
// check that array refs are not null
- Type entityType = cas2.getTypeSystem().getType("org.apache.uima.klt.Entity");
+ Type entityType = cas2.getTypeSystem().getType("org.apache.uima.testTypeSystem.Entity");
Feature classesFeat = entityType.getFeatureByBaseName("classes");
- Iterator iter = cas2.getIndexRepository().getIndex("kltEntityIndex").iterator();
+ Iterator iter = cas2.getIndexRepository().getIndex("testEntityIndex").iterator();
assertTrue(iter.hasNext());
while (iter.hasNext()) {
FeatureStructure fs = (FeatureStructure) iter.next();
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/XmiCasDeserializerTest.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/XmiCasDeserializerTest.java?view=diff&rev=496804&r1=496803&r2=496804
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/XmiCasDeserializerTest.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/XmiCasDeserializerTest.java Tue Jan 16 10:06:18 2007
@@ -73,7 +73,7 @@
protected void setUp() throws Exception {
File typeSystemFile = JUnitExtension.getFile("ExampleCas/testTypeSystem.xml");
- File indexesFile = JUnitExtension.getFile("ExampleCas/kltIndexes.xml");
+ File indexesFile = JUnitExtension.getFile("ExampleCas/testIndexes.xml");
typeSystem = UIMAFramework.getXMLParser().parseTypeSystemDescription(
new XMLInputSource(typeSystemFile));
@@ -125,9 +125,9 @@
// CasComparer.assertEquals(tcas,tcas2);
// check that array refs are not null
- Type entityType = cas2.getTypeSystem().getType("org.apache.uima.klt.Entity");
+ Type entityType = cas2.getTypeSystem().getType("org.apache.uima.testTypeSystem.Entity");
Feature classesFeat = entityType.getFeatureByBaseName("classes");
- Iterator iter = cas2.getIndexRepository().getIndex("kltEntityIndex").iterator();
+ Iterator iter = cas2.getIndexRepository().getIndex("testEntityIndex").iterator();
assertTrue(iter.hasNext());
while (iter.hasNext()) {
FeatureStructure fs = (FeatureStructure) iter.next();
@@ -241,13 +241,13 @@
xmlReader.parse(new InputSource(new StringReader(xml)));
// check that types have been filtered out
- Type orgType = cas2.getTypeSystem().getType("org.apache.hutt.Organization");
+ Type orgType = cas2.getTypeSystem().getType("org.apache.uima.testTypeSystem.Organization");
assertNotNull(orgType);
assertTrue(cas2.getAnnotationIndex(orgType).size() == 0);
assertTrue(cas.getAnnotationIndex(orgType).size() > 0);
// but that some types are still there
- Type personType = cas2.getTypeSystem().getType("org.apache.hutt.Person");
+ Type personType = cas2.getTypeSystem().getType("org.apache.uima.testTypeSystem.Person");
FSIndex personIndex = cas2.getAnnotationIndex(personType);
assertTrue(personIndex.size() > 0);
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/util/CasCopierTest.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/util/CasCopierTest.java?view=diff&rev=496804&r1=496803&r2=496804
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/util/CasCopierTest.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/util/CasCopierTest.java Tue Jan 16 10:06:18 2007
@@ -47,17 +47,10 @@
protected void setUp() throws Exception {
File typeSystemFile1 = JUnitExtension.getFile("ExampleCas/testTypeSystem.xml");
- File typeSystemFile2 = JUnitExtension.getFile("ExampleCas/hutt.xml");
- File indexesFile = JUnitExtension.getFile("ExampleCas/kltIndexes.xml");
+ File indexesFile = JUnitExtension.getFile("ExampleCas/testIndexes.xml");
- TypeSystemDescription typeSystem1 = UIMAFramework.getXMLParser().parseTypeSystemDescription(
+ typeSystem = UIMAFramework.getXMLParser().parseTypeSystemDescription(
new XMLInputSource(typeSystemFile1));
- TypeSystemDescription typeSystem2 = UIMAFramework.getXMLParser().parseTypeSystemDescription(
- new XMLInputSource(typeSystemFile2));
- ArrayList typeSystems = new ArrayList();
- typeSystems.add(typeSystem1);
- typeSystems.add(typeSystem2);
- typeSystem = CasCreationUtils.mergeTypeSystems(typeSystems);
indexes = UIMAFramework.getXMLParser().parseFsIndexCollection(new XMLInputSource(indexesFile))
.getFsIndexes();
}
@@ -120,7 +113,7 @@
CasComparer.assertEquals(annot, copy);
// copy a Relation (which will have references)
- Iterator relationIter = srcCas.getIndexRepository().getIndex("kltRelationIndex").iterator();
+ Iterator relationIter = srcCas.getIndexRepository().getIndex("testRelationIndex").iterator();
FeatureStructure relFS = (FeatureStructure) relationIter.next();
FeatureStructure relCopy = copier.copyFs(relFS);
// verify copy