support for multiple equal type meta queries and test classes
diff --git a/src/test/java/MetaQuerySerializationTest.java b/src/test/java/MetaQuerySerializationTest.java
index 03cd549..c5d1fbd 100644
--- a/src/test/java/MetaQuerySerializationTest.java
+++ b/src/test/java/MetaQuerySerializationTest.java
@@ -3,10 +3,8 @@
import com.fasterxml.jackson.databind.JsonMappingException;
import de.ids_mannheim.korap.query.serialize.CollectionQuery;
import de.ids_mannheim.korap.query.serialize.QuerySerializer;
-import de.ids_mannheim.korap.query.serialize.MetaQuery;
import de.ids_mannheim.korap.util.QueryException;
-import org.joda.time.DateTime;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -31,7 +29,10 @@
b.append("pubPlace:Erfurt");
b.append(" AND ");
b.append("textClass:wissenschaft");
- CollectionQuery qu = new CollectionQuery().addMetaFilter(b.toString());
+// CollectionQuery qu = new CollectionQuery().addMetaFilter(b.toString());
+ CollectionQuery query = new CollectionQuery().addMetaFilter(b.toString());
+ System.out.println(query.build());
+ System.out.println(query.toCollections());
// System.out.println("value reference " + qu.stringify());
// System.out.println();
}
@@ -40,7 +41,7 @@
public void testSingle() throws IOException {
CollectionQuery query = new CollectionQuery().addMetaFilter("textClass", "wissenschaft");
// System.out.println("------ TEXT SINGLE " + query.stringify());
- System.out.println();
+ System.out.println(query.build());
}
@Test
@@ -52,9 +53,9 @@
b.append(" AND ");
b.append("author:Goethe");
CollectionQuery query = new CollectionQuery().addMetaFilter(b.toString());
- System.out.println("value until/since : " + query.stringify());
+ System.out.println("value until/since : " + query.build());
System.out.println("meta value until/since " + query.toCollections());
- Assert.assertEquals("[{\"@type\":\"korap:meta-filter\",\"@value\":{\"@type\":\"korap:group\",\"relation\":\"and\",\"operands\":[{\"@type\":\"korap:term\",\"@field\":\"korap:field#author\",\"@value\":\"Goethe\"},{\"@type\":\"korap:group\",\"@field\":\"korap:field#pubDate\",\"relation\":\"between\",\"operands\":[{\"@type\":\"korap:date\",\"@value\":\"2012-04-01\"},{\"@type\":\"korap:date\",\"@value\":\"2013-04-01\"}]}]}}]", query.stringify());
+ Assert.assertEquals("[{\"@type\":\"korap:meta-filter\",\"@value\":{\"@type\":\"korap:group\",\"relation\":\"and\",\"operands\":[{\"@type\":\"korap:term\",\"@field\":\"korap:field#author\",\"@value\":\"Goethe\"},{\"@type\":\"korap:group\",\"@field\":\"korap:field#pubDate\",\"relation\":\"between\",\"operands\":[{\"@type\":\"korap:date\",\"@value\":\"2012-04-01\"},{\"@type\":\"korap:date\",\"@value\":\"2013-04-01\"}]}]}}]", query.build());
// System.out.println();
}
@@ -66,7 +67,7 @@
b.append("author:Hesse");
CollectionQuery query = new CollectionQuery().addMetaFilter(b.toString());
System.out.println("Running date check (until) with additional attribute author");
- Assert.assertEquals("[{\"@type\":\"korap:meta-filter\",\"@value\":{\"@type\":\"korap:group\",\"relation\":\"and\",\"operands\":[{\"@type\":\"korap:term\",\"@field\":\"korap:field#author\",\"@value\":\"Hesse\"},{\"@type\":\"korap:group\",\"@field\":\"korap:field#pubDate\",\"relation\":\"until\",\"operands\":[{\"@type\":\"korap:date\",\"@value\":\"2013-12-10\"}]}]}}]", query.stringify());
+ Assert.assertEquals("[{\"@type\":\"korap:meta-filter\",\"@value\":{\"@type\":\"korap:group\",\"relation\":\"and\",\"operands\":[{\"@type\":\"korap:term\",\"@field\":\"korap:field#author\",\"@value\":\"Hesse\"},{\"@type\":\"korap:group\",\"@field\":\"korap:field#pubDate\",\"relation\":\"until\",\"operands\":[{\"@type\":\"korap:date\",\"@value\":\"2013-12-10\"}]}]}}]", query.build());
// System.out.println("value until : " + query.stringify());
// System.out.println();
}
@@ -78,11 +79,11 @@
b.append(" AND ");
b.append("author:Kafka");
CollectionQuery query = new CollectionQuery().addMetaFilter(b.toString());
- System.out.println("value since : " + query.stringify());
+ System.out.println("value since : " + query.build());
System.out.println("meta value since " + query.toCollections());
// System.out.println();
System.out.println("Running date check (since) with additional attribute author");
- Assert.assertEquals("[{\"@type\":\"korap:meta-filter\",\"@value\":{\"@type\":\"korap:group\",\"relation\":\"and\",\"operands\":[{\"@type\":\"korap:term\",\"@field\":\"korap:field#author\",\"@value\":\"Kafka\"},{\"@type\":\"korap:group\",\"@field\":\"korap:field#pubDate\",\"relation\":\"since\",\"operands\":[{\"@type\":\"korap:date\",\"@value\":\"2013-12-10\"}]}]}}]", query.stringify());
+ Assert.assertEquals("[{\"@type\":\"korap:meta-filter\",\"@value\":{\"@type\":\"korap:group\",\"relation\":\"and\",\"operands\":[{\"@type\":\"korap:term\",\"@field\":\"korap:field#author\",\"@value\":\"Kafka\"},{\"@type\":\"korap:group\",\"@field\":\"korap:field#pubDate\",\"relation\":\"since\",\"operands\":[{\"@type\":\"korap:date\",\"@value\":\"2013-12-10\"}]}]}}]", query.build());
}
@Test
@@ -125,11 +126,11 @@
b.append("pubDate:<2013-12-10");
b.append(" AND ");
b.append("author:Kafka");
- CollectionQuery query = new CollectionQuery().addMetaFilter(b.toString());
- query.addMetaExtend("author", "Hesse");
+ CollectionQuery q = new CollectionQuery().addMetaFilter(b.toString());
+ q.addMetaExtend("author", "Hesse");
-// System.out.println("--- ALL " + query.stringify());
-// System.out.println();
+ System.out.println("--- ALL " + q.build());
+ System.out.println();
}
@@ -140,8 +141,8 @@
b.append(" AND ");
b.append("author:Kafka");
CollectionQuery q = new CollectionQuery().addMetaExtend(b.toString());
-// System.out.println("array repres " + q.toMeta());
-// System.out.println();
+ System.out.println("array repres " + q.build());
+ System.out.println();
}
@Test
@@ -149,9 +150,9 @@
CollectionQuery q = new CollectionQuery().addMetaFilter("corpusID", "A00");
q.addMetaExtend("corpusID", "A01");
-// System.out.println("results stringified " + q.stringify());
-// System.out.println("results to meta" + q.toMeta());
-// System.out.println();
+ System.out.println("results stringified " + q.build());
+ System.out.println("results to meta" + q.toCollections());
+ System.out.println();
}
/**
@@ -164,17 +165,15 @@
public void testResources() throws IOException {
String meta = "[{\"@type\":\"korap:meta-filter\",\"@value\":{\"@type\":\"korap:term\",\"@field\":\"korap:field#corpusID\",\"@value\":\"WPD\"}}]";
CollectionQuery q = new CollectionQuery().addResource(meta);
- org.junit.Assert.assertEquals("String should be empty", "", q.stringify());
-// System.out.println("meta string " + q.toMeta());
System.out.println("Testing Resource Meta data");
- org.junit.Assert.assertEquals("{\"meta\":" + meta + "}", q.toCollections());
+ org.junit.Assert.assertEquals("{\"collections\":" + meta + "}", q.toCollections());
}
@Test
public void testA00() throws IOException {
CollectionQuery q = new CollectionQuery().addMetaExtend("corpusID", "A00").addMetaExtend("corpusID", "A01");
-// System.out.println("A meta: " + q.stringify());
-// System.out.println();
+ System.out.println("A meta: " + q.build());
+ System.out.println();
}
@Test
@@ -182,8 +181,8 @@
String meta = "[{\"@type\":\"korap:meta-filter\",\"@value\":{\"@type\":\"korap:term\",\"@field\":\"korap:field#corpusID\",\"@value\":\"WPD\"}}]";
CollectionQuery q = new CollectionQuery().addResource(meta);
q.addMetaFilter("textClass", "wissenschaft");
-// System.out.println("stringified meta " + q.stringify());
-// System.out.println("meta string " + q.toMeta());
+ System.out.println("stringified meta " + q.build());
+ System.out.println("meta string " + q.toCollections());
}
}