You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2018/01/24 20:38:14 UTC
svn commit: r1822161 - in
/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl:
XCASDeserializerTest.java XmiCasDeserializerTest.java
Author: schor
Date: Wed Jan 24 20:38:14 2018
New Revision: 1822161
URL: http://svn.apache.org/viewvc?rev=1822161&view=rev
Log:
no Jira use official deserialize APIs, in order to pick up v2-ids support
Modified:
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/XCASDeserializerTest.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/XmiCasDeserializerTest.java
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/XCASDeserializerTest.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/XCASDeserializerTest.java?rev=1822161&r1=1822160&r2=1822161&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/XCASDeserializerTest.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/XCASDeserializerTest.java Wed Jan 24 20:38:14 2018
@@ -145,13 +145,17 @@ public class XCASDeserializerTest extend
TypeSystemImpl tsi = casImpl.getTypeSystemImpl();
InputStream serCasStream = new FileInputStream(JUnitExtension.getFile("ExampleCas/cas.xml"));
- XCASDeserializer deser = new XCASDeserializer(cas.getTypeSystem());
- ContentHandler deserHandler = deser.getXCASHandler(cas);
- SAXParserFactory fact = SAXParserFactory.newInstance();
- SAXParser parser = fact.newSAXParser();
- XMLReader xmlReader = parser.getXMLReader();
- xmlReader.setContentHandler(deserHandler);
- xmlReader.parse(new InputSource(serCasStream));
+
+ XCASDeserializer.deserialize(serCasStream, cas, false); // not lenient
+
+ // next is missing the support for v2 ids
+// XCASDeserializer deser = new XCASDeserializer(cas.getTypeSystem());
+// ContentHandler deserHandler = deser.getXCASHandler(cas);
+// SAXParserFactory fact = SAXParserFactory.newInstance();
+// SAXParser parser = fact.newSAXParser();
+// XMLReader xmlReader = parser.getXMLReader();
+// xmlReader.setContentHandler(deserHandler);
+// xmlReader.parse(new InputSource(serCasStream));
serCasStream.close();
// //print some statistics to aid in verifying deserialization was correct
@@ -217,15 +221,18 @@ public class XCASDeserializerTest extend
cas2.getJCas();
}
+ XCASDeserializer.deserialize(new StringReader(xml), cas2, false); // not lenient
+
+ // next doesn't handle v2 form
// deserialize into another CAS
- XCASDeserializer deser2 = new XCASDeserializer(cas2.getTypeSystem());
- ContentHandler deserHandler2 = deser2.getXCASHandler(cas2);
- xmlReader.setContentHandler(deserHandler2);
-// // debug
-// PrintStream ps = new PrintStream(new BufferedOutputStream(new FileOutputStream("debug.log.txt", false)));
-// ps.println(xml);
-// ps.close();
- xmlReader.parse(new InputSource(new StringReader(xml)));
+// XCASDeserializer deser2 = new XCASDeserializer(cas2.getTypeSystem());
+// ContentHandler deserHandler2 = deser2.getXCASHandler(cas2);
+// xmlReader.setContentHandler(deserHandler2);
+//// // debug
+//// PrintStream ps = new PrintStream(new BufferedOutputStream(new FileOutputStream("debug.log.txt", false)));
+//// ps.println(xml);
+//// ps.close();
+// xmlReader.parse(new InputSource(new StringReader(xml)));
// compare
// if (cas.getAnnotationIndex().size() != cas2.getAnnotationIndex().size()) {
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/XmiCasDeserializerTest.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/XmiCasDeserializerTest.java?rev=1822161&r1=1822160&r2=1822161&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/XmiCasDeserializerTest.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/XmiCasDeserializerTest.java Wed Jan 24 20:38:14 2018
@@ -57,6 +57,7 @@ import org.apache.uima.cas.text.Annotati
import org.apache.uima.cas_data.impl.CasComparer;
import org.apache.uima.internal.util.MultiThreadUtils;
import org.apache.uima.internal.util.MultiThreadUtils.ThreadM;
+import org.apache.uima.internal.util.XMLUtils;
import org.apache.uima.internal.util.XmlAttribute;
import org.apache.uima.internal.util.XmlElementNameAndContents;
import org.apache.uima.jcas.JCas;
@@ -346,13 +347,17 @@ public class XmiCasDeserializerTest exte
}
InputStream serCasStream = new FileInputStream(JUnitExtension.getFile("ExampleCas/cas.xml"));
- XCASDeserializer deser = new XCASDeserializer(cas.getTypeSystem());
- ContentHandler deserHandler = deser.getXCASHandler(cas);
- SAXParserFactory fact = SAXParserFactory.newInstance();
- SAXParser parser = fact.newSAXParser();
- XMLReader xmlReader = parser.getXMLReader();
- xmlReader.setContentHandler(deserHandler);
- xmlReader.parse(new InputSource(serCasStream));
+
+ XCASDeserializer.deserialize(serCasStream, cas, false); // not lenient
+
+ // next is missing the support for v2 ids
+// XCASDeserializer deser = new XCASDeserializer(cas.getTypeSystem());
+// ContentHandler deserHandler = deser.getXCASHandler(cas);
+// SAXParserFactory fact = SAXParserFactory.newInstance();
+// SAXParser parser = fact.newSAXParser();
+// XMLReader xmlReader = parser.getXMLReader();
+// xmlReader.setContentHandler(deserHandler);
+// xmlReader.parse(new InputSource(serCasStream));
serCasStream.close();
// reserialize as XMI
@@ -365,6 +370,9 @@ public class XmiCasDeserializerTest exte
if (useJCas) {
cas2.getJCas();
}
+
+ XMLReader xmlReader = XMLUtils.createSAXParserFactory().newSAXParser().getXMLReader();
+
XmiCasDeserializer deser2 = new XmiCasDeserializer(cas2.getTypeSystem());
ContentHandler deserHandler2 = deser2.getXmiCasHandler(cas2);
xmlReader.setContentHandler(deserHandler2);
@@ -374,7 +382,17 @@ public class XmiCasDeserializerTest exte
if (IS_CAS_COMPARE) {
CasCompare cc = new CasCompare((CASImpl)cas, (CASImpl)cas2);
// ids won't be the same, don't compare these
- cc.compareCASes();
+ // tune debug
+ long start = System.nanoTime();
+ int i = 0;
+// for (; i < 1000; i++) {
+ cc.compareCASes();
+// if (i % 10 == 0) {
+ long end = System.nanoTime();
+ System.out.format("compareCASes i: %d, time: %,d millisec%n", i, (end - start) / 1000000L);
+ start = end;
+// }
+// }
}
assertEquals(cas.getAnnotationIndex().size(), cas2.getAnnotationIndex().size());