Author: schor
Date: Mon Jul 8 20:20:54 2013
New Revision: 1500927
URL: http://svn.apache.org/r1500927
Log: (empty)
Modified:
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes6.java
uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/SerDesTest6.java
Modified:
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes6.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes6.java?rev=1500927&r1=1500926&r2=1500927&view=diff
==============================================================================
---
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes6.java
(original)
+++
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes6.java
Mon Jul 8 20:20:54 2013
@@ -1967,7 +1967,8 @@ public class BinaryCasSerDes6 {
fsIndexes.add(nbrViews);
fsIndexes.add(nbrSofas);
for (int i = 0; i < nbrSofas; i++) {
- fsIndexes.add(readVnumber(control_dis));
+ final int realAddrOfSofa =
fsStartIndexes.getSrcAddrFromTgtSeq(readVnumber(control_dis));
+ fsIndexes.add(realAddrOfSofa);
}
for (int i = 0; i < nbrViews; i++) {
Modified:
uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/SerDesTest6.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/SerDesTest6.java?rev=1500927&r1=1500926&r2=1500927&view=diff
==============================================================================
---
uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/SerDesTest6.java
(original)
+++
uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/SerDesTest6.java
Mon Jul 8 20:20:54 2013
@@ -29,7 +29,12 @@ import static org.apache.uima.cas.impl.S
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -60,6 +65,7 @@ import org.apache.uima.cas.impl.BinaryCa
import org.apache.uima.cas.test.AnnotatorInitializer;
import org.apache.uima.cas.test.CASInitializer;
import org.apache.uima.resource.ResourceInitializationException;
+import org.apache.uima.resource.metadata.TypeSystemDescription;
import org.apache.uima.util.CasCreationUtils;
import org.apache.uima.util.impl.SerializationMeasures;
/**
@@ -77,6 +83,7 @@ public class SerDesTest6 extends TestCas
Akof1, Akof2,
}
+ private final String testDocText = "test document text";
private CASImpl remoteCas;
private List<FeatureStructure> lfs;
@@ -282,6 +289,40 @@ public class SerDesTest6 extends TestCas
public void tearDown() {
}
+ public void testDocText() throws Exception
+ {
+ CAS cas = CasCreationUtils.createCas((TypeSystemDescription) null, null,
null);
+ cas.setDocumentLanguage("latin");
+ cas.setDocumentText("test");
+
+ ByteArrayOutputStream baos = new ByteArrayOutputStream(1024);
+
+ Serialization.serializeWithCompression(cas, baos, cas.getTypeSystem());
+
+ CAS cas2 = CasCreationUtils.createCas((TypeSystemDescription) null,
null, null);
+ ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
+ Serialization.deserializeCAS(cas2, bais);
+
+ assertEquals("latin", cas2.getDocumentLanguage());
+ assertEquals("test", cas2.getDocumentText());
+ }
+
+ public void testDocumentText() {
+// serdesSimple(getTT(EqTwoTypes));
+ remoteCas = setupCas(getTT(EqTwoTypes));
+ casSrc.reset();
+ casSrc.setDocumentText(testDocText);
+ loadCas(casSrc, mSrc);
+ verify(remoteCas);
+ assertEquals(remoteCas.getDocumentText(), testDocText);
+
+ // test case where serialization is done without type filtering,
+ // and deserialization is done with filtering
+ remoteCas.reset();
+ verifyDeserFilter(remoteCas);
+ assertEquals(remoteCas.getDocumentText(), testDocText);
+ }
+
/**
* Make one of each kind of artifact, including arrays
* serialize to byte stream, deserialize into new cas, compare
@@ -1119,12 +1160,14 @@ public class SerDesTest6 extends TestCas
ByteArrayOutputStream baos = new ByteArrayOutputStream(1024);
if (doPlain) {
(new CASSerializer()).addCAS(casSrc, baos);
- } else {
+ } else {
bcs = new BinaryCasSerDes6(casSrc, casTgt.getTypeSystemImpl());
- SerializationMeasures sm = bcs.serialize(baos);
- if (null != sm) {
- System.out.println(sm);
- }
+ Serialization.serializeWithCompression(casSrc, baos,
casTgt.getTypeSystemImpl());
+// bcs = new BinaryCasSerDes6(casSrc, casTgt.getTypeSystemImpl());
+// SerializationMeasures sm = bcs.serialize(baos);
+// if (null != sm) {
+// System.out.println(sm);
+// }
}
ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
casTgt.reinit(bais);
