nullpointer fix for multiple toJson calls on one serializer instance
Change-Id: Ibc6153b82348fa43814a30af49a85162ac7febfa
diff --git a/src/test/java/de/ids_mannheim/korap/query/serialize/CollectionQueryDuplicateTest.java b/src/test/java/de/ids_mannheim/korap/query/serialize/CollectionQueryDuplicateTest.java
index d3c1faa..ed8e40f 100644
--- a/src/test/java/de/ids_mannheim/korap/query/serialize/CollectionQueryDuplicateTest.java
+++ b/src/test/java/de/ids_mannheim/korap/query/serialize/CollectionQueryDuplicateTest.java
@@ -2,10 +2,14 @@
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.Assert;
import org.junit.Test;
import java.io.IOException;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
/**
* @author hanl
* @date 28/07/2015
@@ -13,20 +17,16 @@
public class CollectionQueryDuplicateTest {
@Test
- public void testCollectionQueryDuplicateThrowsAssertionException() {
+ public void testCollectionQueryDuplicateThrowsAssertionException() throws IOException {
QuerySerializer serializer = new QuerySerializer();
serializer.setQuery("[base=Haus]", "poliqarp");
serializer.setCollection("textClass=politik & corpusID=WPD");
ObjectMapper m = new ObjectMapper();
- try {
- JsonNode first = m.readTree(serializer.toJSON());
- JsonNode second = m.readTree(serializer.toJSON());
-
- assert first.at("/collection").equals(second.at("/collection"));
-
- }catch (IOException e) {
- e.printStackTrace();
- }
+ JsonNode first = m.readTree(serializer.toJSON());
+ assertNotNull(first);
+ assertEquals(first.at("/collection"), m.readTree(serializer.toJSON()).at("/collection"));
+ assertEquals(first.at("/collection"), m.readTree(serializer.toJSON()).at("/collection"));
+ assertEquals(first.at("/collection"), m.readTree(serializer.toJSON()).at("/collection"));
}
}
diff --git a/src/test/java/de/ids_mannheim/korap/query/serialize/EmptyResultsTest.java b/src/test/java/de/ids_mannheim/korap/query/serialize/EmptyResultsTest.java
index fd2e64f..58d775b 100644
--- a/src/test/java/de/ids_mannheim/korap/query/serialize/EmptyResultsTest.java
+++ b/src/test/java/de/ids_mannheim/korap/query/serialize/EmptyResultsTest.java
@@ -5,6 +5,8 @@
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
/**
* @author hanl
* @date 02/07/2015
@@ -18,8 +20,8 @@
QuerySerializer s = new QuerySerializer();
s.setQuery("prox/unit=word/distance<=5", "cql");
JsonNode node = mapper.valueToTree(s.build());
- Assert.assertEquals(node.has("query"), false);
- Assert.assertEquals(node.has("collection"), false);
+ assertEquals(node.has("query"), false);
+ assertEquals(node.has("collection"), false);
}
@Test
@@ -28,8 +30,8 @@
s.setQuery("[base=Wort]", "poliqarp");
JsonNode node = mapper.valueToTree(s.build());
- Assert.assertEquals(node.has("query"), true);
- Assert.assertEquals(node.has("collection"), false);
+ assertEquals(node.has("query"), true);
+ assertEquals(node.has("collection"), false);
}
@Test
@@ -38,7 +40,7 @@
s.setQuery("[base=Wort]", "poliqarp");
JsonNode node = mapper.valueToTree(s.build());
- Assert.assertEquals(node.has("meta"), false);
+ assertEquals(node.has("meta"), false);
}
}
diff --git a/src/test/java/de/ids_mannheim/korap/query/serialize/PoliqarpPlusQueryProcessorTest.java b/src/test/java/de/ids_mannheim/korap/query/serialize/PoliqarpPlusQueryProcessorTest.java
index 171f1b3..b918649 100644
--- a/src/test/java/de/ids_mannheim/korap/query/serialize/PoliqarpPlusQueryProcessorTest.java
+++ b/src/test/java/de/ids_mannheim/korap/query/serialize/PoliqarpPlusQueryProcessorTest.java
@@ -148,6 +148,7 @@
query = "z.B./x";
qs.setQuery(query, "poliqarpplus");
res = mapper.readTree(qs.toJSON());
+ System.out.println("QUERY IS "+ res);
assertEquals("koral:token", res.at("/query/@type").asText());
assertEquals("koral:term", res.at("/query/wrap/@type").asText());
assertEquals(".*?z\\.B\\..*?", res.at("/query/wrap/key").asText());
@@ -159,12 +160,13 @@
query = "\"a\\.\"";
qs.setQuery(query, "poliqarpplus");
res = mapper.readTree(qs.toJSON());
+ System.out.println("QUERY IS "+ res);
assertEquals("koral:token", res.at("/query/@type").asText());
assertEquals("koral:term", res.at("/query/wrap/@type").asText());
- assertEquals("a\\.", res.at("/query/wrap/key").asText());
assertEquals("type:regex", res.at("/query/wrap/type").asText());
assertEquals("orth", res.at("/query/wrap/layer").asText());
assertEquals("match:eq", res.at("/query/wrap/match").asText());
+ assertEquals("a\\.", res.at("/query/wrap/key").asText());
}