Fix collection/corpus paths in the test suite.
Change-Id: Ib6527e724650e01cc9b53e7c660decf009d4bf23
diff --git a/Changes b/Changes
index 23235d7..5d3a090 100644
--- a/Changes
+++ b/Changes
@@ -15,6 +15,7 @@
- Add API version to NamedVCLoader (#806)
- Add corpus support at VirtualCorpusRewrite (#806)
- Add apiVersion to rewrite (#806)
+- Fix collection/corpus paths in the test suite (#806)
# version 0.79.1
diff --git a/src/test/java/de/ids_mannheim/korap/config/LiteJerseyTest.java b/src/test/java/de/ids_mannheim/korap/config/LiteJerseyTest.java
index f48b8b3..a4edbd1 100644
--- a/src/test/java/de/ids_mannheim/korap/config/LiteJerseyTest.java
+++ b/src/test/java/de/ids_mannheim/korap/config/LiteJerseyTest.java
@@ -20,8 +20,7 @@
@ContextConfiguration("classpath:test-config-lite.xml")
public abstract class LiteJerseyTest extends JerseyTest {
- public static final String API_VERSION = "v1.0";
-
+ public final static String API_VERSION = "v1.0";
protected final static String freeCorpusAccess = "Free corpus access policy "
+ "has been added.";
diff --git a/src/test/java/de/ids_mannheim/korap/config/SpringJerseyTest.java b/src/test/java/de/ids_mannheim/korap/config/SpringJerseyTest.java
index dc2e429..2bed357 100644
--- a/src/test/java/de/ids_mannheim/korap/config/SpringJerseyTest.java
+++ b/src/test/java/de/ids_mannheim/korap/config/SpringJerseyTest.java
@@ -28,8 +28,8 @@
protected final static double API_VERSION_DOUBLE =
Double.parseDouble(API_VERSION.substring(1));
- protected final static String COLLECTION_NODE_NAME =
- (API_VERSION_DOUBLE >= 1.1) ? "corpus" : "collection";
+ protected final static String CORPUS_PATH =
+ (API_VERSION_DOUBLE >= 1.1) ? "/corpus" : "/collection";
protected final static String allCorpusAccess = "All corpus access policy "
+ "has been added.";
diff --git a/src/test/java/de/ids_mannheim/korap/rewrite/AvailabilityRewriteTest.java b/src/test/java/de/ids_mannheim/korap/rewrite/AvailabilityRewriteTest.java
index 648292f..3fc44a2 100644
--- a/src/test/java/de/ids_mannheim/korap/rewrite/AvailabilityRewriteTest.java
+++ b/src/test/java/de/ids_mannheim/korap/rewrite/AvailabilityRewriteTest.java
@@ -25,8 +25,7 @@
public KustvaktConfiguration config;
private double apiVersion = Double.parseDouble(API_VERSION.substring(1));
- private String collectionNodeName = (apiVersion >= 1.1) ? "corpus"
- : "collection";
+
@Disabled
@Test
@@ -41,7 +40,7 @@
JsonNode node = JsonUtils.readTree(handler.processQuery(result,
User.UserFactory.getUser("test_user"), API_VERSION_DOUBLE));
assertNotNull(node);
- assertEquals(1, node.at("/"+collectionNodeName+"/operands").size());
+ assertEquals(1, node.at(CORPUS_PATH+"/operands").size());
}
@Test
@@ -60,9 +59,9 @@
JsonNode node = JsonUtils.readTree(handler.processQuery(result,
User.UserFactory.getUser("test_user"), API_VERSION_DOUBLE));
assertNotNull(node);
- assertEquals(0, node.at("/collection/operands").size());
+ assertEquals(0, node.at(CORPUS_PATH+"/operands").size());
assertEquals("koral:rewrite",
- node.at("/collection/rewrites/0/@type").asText());
+ node.at(CORPUS_PATH+"/rewrites/0/@type").asText());
}
@Disabled
@@ -80,11 +79,11 @@
User.UserFactory.getUser("test_user"), API_VERSION_DOUBLE));
assertNotNull(node);
assertEquals("koral:docGroup",
- node.at("/collection/operands/0/@type").asText());
+ node.at(CORPUS_PATH+"/operands/0/@type").asText());
assertEquals("textClass",
- node.at("/collection/operands/0/operands/0/key").asText());
+ node.at(CORPUS_PATH+"/operands/0/operands/0/key").asText());
assertEquals("koral:rewrite",
- node.at("/collection/rewrites/0/@type").asText());
+ node.at(CORPUS_PATH+"/rewrites/0/@type").asText());
}
// fixme: will probably fail when one doc groups are being refactored
@@ -103,14 +102,14 @@
JsonNode node = JsonUtils.readTree(handler.processQuery(result,
User.UserFactory.getUser("test_user"), API_VERSION_DOUBLE));
assertNotNull(node);
- assertEquals("koral:docGroup", node.at("/collection/@type").asText());
- assertEquals(2, node.at("/collection/operands").size());
+ assertEquals("koral:docGroup", node.at(CORPUS_PATH+"/@type").asText());
+ assertEquals(2, node.at(CORPUS_PATH+"/operands").size());
assertEquals("textClass",
- node.at("/collection/operands/0/key").asText());
+ node.at(CORPUS_PATH+"/operands/0/key").asText());
assertEquals("textClass",
- node.at("/collection/operands/1/key").asText());
+ node.at(CORPUS_PATH+"/operands/1/key").asText());
assertEquals("koral:rewrite",
- node.at("/collection/rewrites/0/@type").asText());
+ node.at(CORPUS_PATH+"/rewrites/0/@type").asText());
}
@Disabled
@@ -127,11 +126,11 @@
JsonNode node = JsonUtils.readTree(handler.processQuery(result,
User.UserFactory.getUser("test_user"), API_VERSION_DOUBLE));
assertNotNull(node);
- assertEquals("koral:doc", node.at("/collection/@type").asText());
- assertEquals("textClass", node.at("/collection/key").asText());
- assertEquals("wissenschaft", node.at("/collection/value").asText());
+ assertEquals("koral:doc", node.at(CORPUS_PATH+"/@type").asText());
+ assertEquals("textClass", node.at(CORPUS_PATH+"/key").asText());
+ assertEquals("wissenschaft", node.at(CORPUS_PATH+"/value").asText());
assertEquals("koral:rewrite",
- node.at("/collection/rewrites/0/@type").asText());
+ node.at(CORPUS_PATH+"/rewrites/0/@type").asText());
}
@Disabled
@@ -149,10 +148,10 @@
JsonNode node = JsonUtils.readTree(handler.processQuery(result,
User.UserFactory.getUser("test_user"), API_VERSION_DOUBLE));
assertNotNull(node);
- assertEquals("koral:doc", node.at("/collection/@type").asText());
- assertEquals("textClass", node.at("/collection/key").asText());
+ assertEquals("koral:doc", node.at(CORPUS_PATH+"/@type").asText());
+ assertEquals("textClass", node.at(CORPUS_PATH+"/key").asText());
assertEquals("koral:rewrite",
- node.at("/collection/rewrites/0/@type").asText());
+ node.at(CORPUS_PATH+"/rewrites/0/@type").asText());
}
@Disabled
@@ -170,14 +169,14 @@
JsonNode node = JsonUtils.readTree(handler.processQuery(org,
User.UserFactory.getUser("test_user"), API_VERSION_DOUBLE));
assertNotNull(node);
- assertEquals("koral:docGroup", node.at("/collection/@type").asText());
- assertEquals(2, node.at("/collection/operands").size());
+ assertEquals("koral:docGroup", node.at(CORPUS_PATH+"/@type").asText());
+ assertEquals(2, node.at(CORPUS_PATH+"/operands").size());
assertEquals("koral:doc",
- node.at("/collection/operands/0/@type").asText());
+ node.at(CORPUS_PATH+"/operands/0/@type").asText());
assertEquals("koral:doc",
- node.at("/collection/operands/1/@type").asText());
+ node.at(CORPUS_PATH+"/operands/1/@type").asText());
assertEquals("koral:rewrite",
- node.at("/collection/rewrites/0/@type").asText());
+ node.at(CORPUS_PATH+"/rewrites/0/@type").asText());
}
@Test
@@ -192,18 +191,18 @@
JsonNode node = JsonUtils.readTree(handler.processQuery(org,
User.UserFactory.getUser("test_user"), API_VERSION_DOUBLE));
assertNotNull(node);
- assertEquals(2, node.at("/collection/operands").size());
+ assertEquals(2, node.at(CORPUS_PATH+"/operands").size());
assertEquals("availability",
- node.at("/collection/operands/0/key").asText());
+ node.at(CORPUS_PATH+"/operands/0/key").asText());
assertEquals("CC.*",
- node.at("/collection/operands/0/value").asText());
+ node.at(CORPUS_PATH+"/operands/0/value").asText());
assertEquals("docSigle",
- node.at("/collection/operands/1/operands/0/key").asText());
+ node.at(CORPUS_PATH+"/operands/1/operands/0/key").asText());
assertEquals("textClass",
- node.at("/collection/operands/1/operands/1/key").asText());
+ node.at(CORPUS_PATH+"/operands/1/operands/1/key").asText());
assertEquals("koral:rewrite",
- node.at("/collection/rewrites/0/@type").asText());
-// assertEquals(node.at("/collection/rewrites/0/scope").asText(),
+ node.at(CORPUS_PATH+"/rewrites/0/@type").asText());
+// assertEquals(node.at(CORPUS_PATH+"/rewrites/0/scope").asText(),
// "availability(FREE)");
}
@@ -218,12 +217,12 @@
JsonNode node = JsonUtils.readTree(handler.processQuery(org,
User.UserFactory.getUser("test_user"), API_VERSION_DOUBLE));
assertNotNull(node);
- assertEquals(node.at("/"+collectionNodeName+"/key").asText(), "availability");
- assertEquals(node.at("/"+collectionNodeName+"/value").asText(), "CC.*");
- assertEquals(node.at("/"+collectionNodeName+"/rewrites/0/@type").asText(),
+ assertEquals(node.at(CORPUS_PATH+"/key").asText(), "availability");
+ assertEquals(node.at(CORPUS_PATH+"/value").asText(), "CC.*");
+ assertEquals(node.at(CORPUS_PATH+"/rewrites/0/@type").asText(),
"koral:rewrite");
assertEquals(freeCorpusAccess,
- node.at("/"+collectionNodeName+"/rewrites/0/_comment").asText());
+ node.at(CORPUS_PATH+"/rewrites/0/_comment").asText());
}
@@ -242,16 +241,16 @@
User.UserFactory.getUser("test_user"), API_VERSION_DOUBLE));
assertNotNull(node);
- assertEquals("koral:docGroup", node.at("/collection/@type").asText());
- assertEquals(2, node.at("/collection/operands").size());
+ assertEquals("koral:docGroup", node.at(CORPUS_PATH+"/@type").asText());
+ assertEquals(2, node.at(CORPUS_PATH+"/operands").size());
assertEquals("koral:docGroup",
- node.at("/collection/operands/0/@type").asText());
+ node.at(CORPUS_PATH+"/operands/0/@type").asText());
assertEquals("koral:docGroup",
- node.at("/collection/operands/1/@type").asText());
- assertEquals(1, node.at("/collection/operands/0/operands").size());
- assertEquals(1, node.at("/collection/operands/1/operands").size());
+ node.at(CORPUS_PATH+"/operands/1/@type").asText());
+ assertEquals(1, node.at(CORPUS_PATH+"/operands/0/operands").size());
+ assertEquals(1, node.at(CORPUS_PATH+"/operands/1/operands").size());
assertEquals("koral:rewrite",
- node.at("/collection/rewrites/0/@type").asText());
+ node.at(CORPUS_PATH+"/rewrites/0/@type").asText());
}
@Disabled
@@ -271,23 +270,23 @@
User.UserFactory.getUser("test_user"), API_VERSION_DOUBLE));
assertNotNull(node);
- assertEquals("koral:docGroup", node.at("/collection/@type").asText());
- assertEquals(2, node.at("/collection/operands").size());
+ assertEquals("koral:docGroup", node.at(CORPUS_PATH+"/@type").asText());
+ assertEquals(2, node.at(CORPUS_PATH+"/operands").size());
assertEquals("koral:doc",
- node.at("/collection/operands/0/@type").asText());
+ node.at(CORPUS_PATH+"/operands/0/@type").asText());
assertEquals("koral:doc",
- node.at("/collection/operands/0/@type").asText());
+ node.at(CORPUS_PATH+"/operands/0/@type").asText());
assertEquals("textClass",
- node.at("/collection/operands/0/key").asText());
+ node.at(CORPUS_PATH+"/operands/0/key").asText());
assertEquals("wissenschaft",
- node.at("/collection/operands/0/value").asText());
+ node.at(CORPUS_PATH+"/operands/0/value").asText());
assertEquals("koral:doc",
- node.at("/collection/operands/1/@type").asText());
+ node.at(CORPUS_PATH+"/operands/1/@type").asText());
assertEquals("textClass",
- node.at("/collection/operands/1/key").asText());
+ node.at(CORPUS_PATH+"/operands/1/key").asText());
assertEquals("freizeit",
- node.at("/collection/operands/1/value").asText());
+ node.at(CORPUS_PATH+"/operands/1/value").asText());
assertEquals("koral:rewrite",
- node.at("/collection/rewrites/0/@type").asText());
+ node.at(CORPUS_PATH+"/rewrites/0/@type").asText());
}
}
diff --git a/src/test/java/de/ids_mannheim/korap/rewrite/VirtualCorpusReferenceRewriteTest.java b/src/test/java/de/ids_mannheim/korap/rewrite/VirtualCorpusReferenceRewriteTest.java
index 188dbcd..a4c0e05 100644
--- a/src/test/java/de/ids_mannheim/korap/rewrite/VirtualCorpusReferenceRewriteTest.java
+++ b/src/test/java/de/ids_mannheim/korap/rewrite/VirtualCorpusReferenceRewriteTest.java
@@ -39,7 +39,7 @@
.queryParam("cq", "referTo named-vc1").request().get();
String ent = response.readEntity(String.class);
JsonNode node = JsonUtils.readTree(ent);
- assertEquals("koral:docGroup", node.at("/collection/@type").asText());
+ assertEquals("koral:docGroup", node.at(CORPUS_PATH+"/@type").asText());
assertTrue(node.at("/operands/1/rewrites").isMissingNode());
testRefCachedVCWithUsername();
@@ -55,7 +55,7 @@
String ent = response.readEntity(String.class);
JsonNode node = JsonUtils.readTree(ent);
assertTrue(node.at("/matches").size()>0);
- node = node.at("/collection");
+ node = node.at(CORPUS_PATH+"");
assertEquals("koral:docGroup", node.at("/@type").asText());
node = node.at("/operands/1/rewrites");
@@ -75,7 +75,7 @@
.queryParam("cq", "referTo \"system-vc\"").request().get();
String ent = response.readEntity(String.class);
JsonNode node = JsonUtils.readTree(ent);
- node = node.at("/collection");
+ node = node.at(CORPUS_PATH+"");
assertEquals("koral:docGroup", node.at("/@type").asText());
assertEquals("operation:and", node.at("/operation").asText());
@@ -106,7 +106,7 @@
.header(HttpHeaders.X_FORWARDED_FOR, "149.27.0.32").get();
String ent = response.readEntity(String.class);
JsonNode node = JsonUtils.readTree(ent);
- node = node.at("/collection");
+ node = node.at(CORPUS_PATH+"");
assertEquals("koral:docGroup", node.at("/@type").asText());
assertEquals("operation:and", node.at("/operation").asText());
assertEquals(2, node.at("/operands").size());
@@ -149,7 +149,7 @@
.get();
String ent = response.readEntity(String.class);
JsonNode node = JsonUtils.readTree(ent);
- node = node.at("/collection");
+ node = node.at(CORPUS_PATH);
assertEquals("koral:docGroup", node.at("/@type").asText());
assertEquals("operation:and", node.at("/operation").asText());
diff --git a/src/test/java/de/ids_mannheim/korap/web/controller/AvailabilityTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/AvailabilityTest.java
index f83feb6..1167c5a 100644
--- a/src/test/java/de/ids_mannheim/korap/web/controller/AvailabilityTest.java
+++ b/src/test/java/de/ids_mannheim/korap/web/controller/AvailabilityTest.java
@@ -27,7 +27,7 @@
private void checkAndFree (String json, JsonNode original)
throws KustvaktException {
- JsonNode node = JsonUtils.readTree(json).at("/collection");
+ JsonNode node = JsonUtils.readTree(json).at(CORPUS_PATH+"");
assertEquals("availability", node.at("/operands/0/key").asText());
assertEquals("CC.*", node.at("/operands/0/value").asText());
assertEquals("operation:override",
@@ -39,7 +39,7 @@
private void checkAndPublic (String json, JsonNode original)
throws KustvaktException {
- JsonNode node = JsonUtils.readTree(json).at("/collection");
+ JsonNode node = JsonUtils.readTree(json).at(CORPUS_PATH+"");
assertNotNull(node);
assertEquals("operation:and", node.at("/operation").asText());
assertEquals("koral:rewrite", node.at("/rewrites/0/@type").asText());
@@ -66,7 +66,7 @@
private void checkAndAllWithACA (String json, JsonNode original)
throws KustvaktException {
- JsonNode node = JsonUtils.readTree(json).at("/collection");
+ JsonNode node = JsonUtils.readTree(json).at(CORPUS_PATH+"");
assertEquals("operation:and", node.at("/operation").asText());
assertEquals("operation:and", node.at("/operation").asText());
assertEquals("koral:rewrite", node.at("/rewrites/0/@type").asText());
@@ -121,7 +121,7 @@
assertEquals(Status.OK.getStatusCode(), response.getStatus());
String json = response.readEntity(String.class);
- JsonNode node = JsonUtils.readTree(json).at("/collection");
+ JsonNode node = JsonUtils.readTree(json).at(CORPUS_PATH+"");
assertEquals("availability", node.at("/key").asText());
assertEquals("CC.*", node.at("/value").asText());
assertEquals("operation:injection",
@@ -141,7 +141,7 @@
assertEquals(Status.OK.getStatusCode(), response.getStatus());
String json = response.readEntity(String.class);
- JsonNode node = JsonUtils.readTree(json).at("/collection");
+ JsonNode node = JsonUtils.readTree(json).at(CORPUS_PATH+"");
String expected = """
{
@@ -195,7 +195,7 @@
assertEquals(Status.OK.getStatusCode(), response.getStatus());
String json = response.readEntity(String.class);
- JsonNode node = JsonUtils.readTree(json).at("/collection");
+ JsonNode node = JsonUtils.readTree(json).at(CORPUS_PATH+"");
String expected = """
{
"operands" : [ {
@@ -293,7 +293,7 @@
assertEquals(Status.OK.getStatusCode(), response.getStatus());
String json = response.readEntity(String.class);
JsonNode node = JsonUtils.readTree(json);
- assertTrue(node.at("/collection/rewrite").isMissingNode());
+ assertTrue(node.at(CORPUS_PATH+"/rewrite").isMissingNode());
}
@Test
@@ -304,18 +304,18 @@
String json = response.readEntity(String.class);
JsonNode node = JsonUtils.readTree(json);
assertEquals("operation:and",
- node.at("/collection/operation").asText());
+ node.at(CORPUS_PATH+"/operation").asText());
assertEquals("match:eq",
- node.at("/collection/operands/0/match").asText());
+ node.at(CORPUS_PATH+"/operands/0/match").asText());
assertEquals("type:regex",
- node.at("/collection/operands/0/type").asText());
+ node.at(CORPUS_PATH+"/operands/0/type").asText());
assertEquals("availability",
- node.at("/collection/operands/0/key").asText());
+ node.at(CORPUS_PATH+"/operands/0/key").asText());
assertEquals("CC.*",
- node.at("/collection/operands/0/value").asText());
+ node.at(CORPUS_PATH+"/operands/0/value").asText());
assertEquals("match:eq",
- node.at("/collection/operands/1/match").asText());
- assertEquals("ACA.*", node.at("/collection/operands/1/value").asText());
+ node.at(CORPUS_PATH+"/operands/1/match").asText());
+ assertEquals("ACA.*", node.at(CORPUS_PATH+"/operands/1/value").asText());
}
@@ -619,8 +619,8 @@
assertEquals(Status.OK.getStatusCode(), response.getStatus());
String json = response.readEntity(String.class);
JsonNode node = JsonUtils.readTree(json);
- assertTrue(node.at("/collection/rewrites").isMissingNode());
- assertEquals("operation:or", node.at("/collection/operation").asText());
+ assertTrue(node.at(CORPUS_PATH+"/rewrites").isMissingNode());
+ assertEquals("operation:or", node.at(CORPUS_PATH+"/operation").asText());
}
@Test
diff --git a/src/test/java/de/ids_mannheim/korap/web/controller/MultipleCorpusQueryTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/MultipleCorpusQueryTest.java
index 05378f7..5659694 100644
--- a/src/test/java/de/ids_mannheim/korap/web/controller/MultipleCorpusQueryTest.java
+++ b/src/test/java/de/ids_mannheim/korap/web/controller/MultipleCorpusQueryTest.java
@@ -25,7 +25,7 @@
assertEquals(Status.OK.getStatusCode(), response.getStatus());
String entity = response.readEntity(String.class);
JsonNode node = JsonUtils.readTree(entity);
- node = node.at("/collection/operands/1");
+ node = node.at(CORPUS_PATH+"/operands/1");
assertEquals("koral:docGroup", node.at("/@type").asText());
assertEquals("operation:and", node.at("/operation").asText());
assertEquals(2, node.at("/operands").size());
diff --git a/src/test/java/de/ids_mannheim/korap/web/controller/QuerySerializationControllerTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/QuerySerializationControllerTest.java
index 1ee965e..b795936 100644
--- a/src/test/java/de/ids_mannheim/korap/web/controller/QuerySerializationControllerTest.java
+++ b/src/test/java/de/ids_mannheim/korap/web/controller/QuerySerializationControllerTest.java
@@ -35,8 +35,8 @@
String ent = response.readEntity(String.class);
JsonNode node = JsonUtils.readTree(ent);
assertNotNull(node);
- assertEquals("corpusSigle", node.at("/collection/key").asText());
- assertEquals("WPD13", node.at("/collection/value").asText());
+ assertEquals("corpusSigle", node.at(CORPUS_PATH+"/key").asText());
+ assertEquals("WPD13", node.at(CORPUS_PATH+"/value").asText());
}
@Test
@@ -84,9 +84,9 @@
String ent = response.readEntity(String.class);
JsonNode node = JsonUtils.readTree(ent);
assertNotNull(node);
- assertEquals("koral:doc", node.at("/collection/@type").asText());
- assertEquals("corpusSigle", node.at("/collection/key").asText());
- assertEquals("BRZ10", node.at("/collection/value").asText());
+ assertEquals("koral:doc", node.at(CORPUS_PATH+"/@type").asText());
+ assertEquals("corpusSigle", node.at(CORPUS_PATH+"/key").asText());
+ assertEquals("BRZ10", node.at(CORPUS_PATH+"/value").asText());
}
@Test
@@ -146,23 +146,23 @@
node = JsonUtils.readTree(ent);
assertNotNull(node);
// System.out.println("NODE " + ent);
- assertEquals("koral:docGroup", node.at("/collection/@type").asText());
+ assertEquals("koral:docGroup", node.at(CORPUS_PATH+"/@type").asText());
assertEquals("koral:doc",
- node.at("/collection/operands/0/@type").asText());
+ node.at(CORPUS_PATH+"/operands/0/@type").asText());
assertEquals("creationDate",
- node.at("/collection/operands/0/key").asText());
- assertEquals("1775", node.at("/collection/operands/0/value").asText());
+ node.at(CORPUS_PATH+"/operands/0/key").asText());
+ assertEquals("1775", node.at(CORPUS_PATH+"/operands/0/value").asText());
assertEquals("type:date",
- node.at("/collection/operands/0/type").asText());
+ node.at(CORPUS_PATH+"/operands/0/type").asText());
assertEquals("match:geq",
- node.at("/collection/operands/0/match").asText());
+ node.at(CORPUS_PATH+"/operands/0/match").asText());
assertEquals("koral:doc",
- node.at("/collection/operands/1/@type").asText());
+ node.at(CORPUS_PATH+"/operands/1/@type").asText());
assertEquals("corpusSigle",
- node.at("/collection/operands/1/key").asText());
- assertEquals("GOE", node.at("/collection/operands/1/value").asText());
+ node.at(CORPUS_PATH+"/operands/1/key").asText());
+ assertEquals("GOE", node.at(CORPUS_PATH+"/operands/1/value").asText());
assertEquals("match:eq",
- node.at("/collection/operands/1/match").asText());
+ node.at(CORPUS_PATH+"/operands/1/match").asText());
}
@Test
@@ -177,16 +177,16 @@
JsonNode node = JsonUtils.readTree(ent);
assertNotNull(node);
assertEquals("koral:doc",
- node.at("/collection/operands/0/@type").asText());
+ node.at(CORPUS_PATH+"/operands/0/@type").asText());
assertEquals("corpusSigle",
- node.at("/collection/operands/0/key").asText());
- assertEquals("GOE", node.at("/collection/operands/0/value").asText());
+ node.at(CORPUS_PATH+"/operands/0/key").asText());
+ assertEquals("GOE", node.at(CORPUS_PATH+"/operands/0/value").asText());
assertEquals("koral:doc",
- node.at("/collection/operands/1/@type").asText());
+ node.at(CORPUS_PATH+"/operands/1/@type").asText());
assertEquals("creationDate",
- node.at("/collection/operands/1/key").asText());
+ node.at(CORPUS_PATH+"/operands/1/key").asText());
assertEquals("1810-01-01",
- node.at("/collection/operands/1/value").asText());
+ node.at(CORPUS_PATH+"/operands/1/value").asText());
}
@Test
diff --git a/src/test/java/de/ids_mannheim/korap/web/controller/SearchControllerTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/SearchControllerTest.java
index 55a31b6..98c8c3d 100644
--- a/src/test/java/de/ids_mannheim/korap/web/controller/SearchControllerTest.java
+++ b/src/test/java/de/ids_mannheim/korap/web/controller/SearchControllerTest.java
@@ -117,13 +117,13 @@
String ent = response.readEntity(String.class);
JsonNode node = JsonUtils.readTree(ent);
assertNotNull(node);
- assertEquals("koral:doc", node.at("/collection/@type").asText());
- assertEquals("availability", node.at("/collection/key").asText());
- assertEquals("CC.*", node.at("/collection/value").asText());
+ assertEquals("koral:doc", node.at(CORPUS_PATH+"/@type").asText());
+ assertEquals("availability", node.at(CORPUS_PATH+"/key").asText());
+ assertEquals("CC.*", node.at(CORPUS_PATH+"/value").asText());
assertEquals(freeCorpusAccess,
- node.at("/collection/rewrites/0/_comment").asText());
+ node.at(CORPUS_PATH+"/rewrites/0/_comment").asText());
assertEquals("operation:injection",
- node.at("/collection/rewrites/0/operation").asText());
+ node.at(CORPUS_PATH+"/rewrites/0/operation").asText());
}
@Test
@@ -140,7 +140,7 @@
assertEquals(302, node.at("/errors/0/0").asInt());
assertEquals(302, node.at("/errors/1/0").asInt());
assertTrue(node.at("/errors/2").isMissingNode());
- assertFalse(node.at("/"+COLLECTION_NODE_NAME).isMissingNode());
+ assertFalse(node.at(CORPUS_PATH).isMissingNode());
assertEquals(13, node.at("/meta/count").asInt());
}
@@ -180,13 +180,13 @@
JsonNode node = JsonUtils.readTree(entity);
assertNotNull(node);
assertNotEquals(0, node.path("matches").size());
- assertEquals("koral:doc", node.at("/collection/@type").asText());
- assertEquals("availability", node.at("/collection/key").asText());
- assertEquals("CC.*", node.at("/collection/value").asText());
+ assertEquals("koral:doc", node.at(CORPUS_PATH+"/@type").asText());
+ assertEquals("availability", node.at(CORPUS_PATH+"/key").asText());
+ assertEquals("CC.*", node.at(CORPUS_PATH+"/value").asText());
assertEquals(freeCorpusAccess,
- node.at("/collection/rewrites/0/_comment").asText());
+ node.at(CORPUS_PATH+"/rewrites/0/_comment").asText());
assertEquals("operation:injection",
- node.at("/collection/rewrites/0/operation").asText());
+ node.at(CORPUS_PATH+"/rewrites/0/operation").asText());
}
@Test
@@ -200,13 +200,13 @@
JsonNode node = JsonUtils.readTree(entity);
assertNotNull(node);
assertNotEquals(0, node.path("matches").size());
- assertEquals("koral:doc", node.at("/collection/@type").asText());
- assertEquals("availability", node.at("/collection/key").asText());
- assertEquals("CC.*", node.at("/collection/value").asText());
+ assertEquals("koral:doc", node.at(CORPUS_PATH+"/@type").asText());
+ assertEquals("availability", node.at(CORPUS_PATH+"/key").asText());
+ assertEquals("CC.*", node.at(CORPUS_PATH+"/value").asText());
assertEquals(freeCorpusAccess,
- node.at("/collection/rewrites/0/_comment").asText());
+ node.at(CORPUS_PATH+"/rewrites/0/_comment").asText());
assertEquals("operation:injection",
- node.at("/collection/rewrites/0/operation").asText());
+ node.at(CORPUS_PATH+"/rewrites/0/operation").asText());
}
@Test
@@ -225,17 +225,17 @@
// System.out.println(entity);
assertNotNull(node);
assertNotEquals(0, node.path("matches").size());
- assertEquals("koral:docGroup", node.at("/collection/@type").asText());
- assertEquals("CC.*", node.at("/collection/operands/0/value").asText());
+ assertEquals("koral:docGroup", node.at(CORPUS_PATH+"/@type").asText());
+ assertEquals("CC.*", node.at(CORPUS_PATH+"/operands/0/value").asText());
assertEquals("ACA.*",
- node.at("/collection/operands/1/operands/0/value").asText());
+ node.at(CORPUS_PATH+"/operands/1/operands/0/value").asText());
assertEquals("QAO-NC",
- node.at("/collection/operands/1/operands/1/value").asText());
- assertEquals("operation:or", node.at("/collection/operation").asText());
+ node.at(CORPUS_PATH+"/operands/1/operands/1/value").asText());
+ assertEquals("operation:or", node.at(CORPUS_PATH+"/operation").asText());
assertEquals(publicCorpusAccess,
- node.at("/collection/rewrites/0/_comment").asText());
+ node.at(CORPUS_PATH+"/rewrites/0/_comment").asText());
assertEquals("operation:injection",
- node.at("/collection/rewrites/0/operation").asText());
+ node.at(CORPUS_PATH+"/rewrites/0/operation").asText());
}
@Test
@@ -253,22 +253,22 @@
JsonNode node = JsonUtils.readTree(entity);
assertNotNull(node);
assertNotEquals(0, node.path("matches").size());
- assertEquals("koral:docGroup", node.at("/collection/@type").asText());
+ assertEquals("koral:docGroup", node.at(CORPUS_PATH+"/@type").asText());
assertEquals(config.getFreeOnlyRegex(),
- node.at("/collection/operands/0/value").asText());
+ node.at(CORPUS_PATH+"/operands/0/value").asText());
assertEquals("ACA.*",
- node.at("/collection/operands/1/operands/0/value").asText());
+ node.at(CORPUS_PATH+"/operands/1/operands/0/value").asText());
assertEquals("QAO-NC",
- node.at("/collection/operands/1/operands/1/operands/0/value")
+ node.at(CORPUS_PATH+"/operands/1/operands/1/operands/0/value")
.asText());
assertEquals(config.getAllOnlyRegex(),
- node.at("/collection/operands/1/operands/1/operands/1/value")
+ node.at(CORPUS_PATH+"/operands/1/operands/1/operands/1/value")
.asText());
- assertEquals("operation:or", node.at("/collection/operation").asText());
+ assertEquals("operation:or", node.at(CORPUS_PATH+"/operation").asText());
assertEquals(allCorpusAccess,
- node.at("/collection/rewrites/0/_comment").asText());
+ node.at(CORPUS_PATH+"/rewrites/0/_comment").asText());
assertEquals("operation:injection",
- node.at("/collection/rewrites/0/operation").asText());
+ node.at(CORPUS_PATH+"/rewrites/0/operation").asText());
}
@Test
@@ -280,16 +280,16 @@
assertEquals(Status.OK.getStatusCode(), response.getStatus());
String ent = response.readEntity(String.class);
JsonNode node = JsonUtils.readTree(ent);
- assertEquals("koral:docGroup", node.at("/collection/@type").asText());
+ assertEquals("koral:docGroup", node.at(CORPUS_PATH+"/@type").asText());
assertEquals("operation:and",
- node.at("/collection/operation").asText());
- assertEquals(2, node.at("/collection/operands").size());
- assertEquals("CC.*", node.at("/collection/operands/0/value").asText());
+ node.at(CORPUS_PATH+"/operation").asText());
+ assertEquals(2, node.at(CORPUS_PATH+"/operands").size());
+ assertEquals("CC.*", node.at(CORPUS_PATH+"/operands/0/value").asText());
assertEquals("gingko",
- node.at("/collection/operands/1/value").asText());
+ node.at(CORPUS_PATH+"/operands/1/value").asText());
assertEquals("match:eq",
- node.at("/collection/operands/1/match").asText());
- assertTrue(node.at("/collection/operands/1/type").isMissingNode());
+ node.at(CORPUS_PATH+"/operands/1/match").asText());
+ assertTrue(node.at(CORPUS_PATH+"/operands/1/type").isMissingNode());
}
@Test
@@ -307,12 +307,12 @@
assertEquals(0, node.at("/meta/count").asInt());
assertEquals(-1, node.at("/meta/totalResults").asInt());
- assertEquals("CC.*", node.at("/collection/operands/0/value").asText());
+ assertEquals("CC.*", node.at(CORPUS_PATH+"/operands/0/value").asText());
assertEquals("corpusSigle",
- node.at("/collection/operands/1/key").asText());
- assertEquals("WPD17", node.at("/collection/operands/1/value").asText());
+ node.at(CORPUS_PATH+"/operands/1/key").asText());
+ assertEquals("WPD17", node.at(CORPUS_PATH+"/operands/1/value").asText());
assertEquals("match:eq",
- node.at("/collection/operands/1/match").asText());
+ node.at(CORPUS_PATH+"/operands/1/match").asText());
}
@Test
@@ -331,17 +331,17 @@
JsonNode node = JsonUtils.readTree(response.readEntity(String.class));
assertNotNull(node);
assertEquals("operation:override",
- node.at("/collection/rewrites/0/operation").asText());
+ node.at(CORPUS_PATH+"/rewrites/0/operation").asText());
// assertEquals("availability(FREE)",
-// node.at("/collection/rewrites/0/scope").asText());
+// node.at(CORPUS_PATH+"/rewrites/0/scope").asText());
// EM: double AND operations
assertEquals("availability",
- node.at("/collection/operands/0/key").asText());
- assertEquals("CC.*", node.at("/collection/operands/0/value").asText());
+ node.at(CORPUS_PATH+"/operands/0/key").asText());
+ assertEquals("CC.*", node.at(CORPUS_PATH+"/operands/0/value").asText());
assertEquals("textClass",
- node.at("/collection/operands/1/operands/0/key").asText());
+ node.at(CORPUS_PATH+"/operands/1/operands/0/key").asText());
assertEquals("corpusSigle",
- node.at("/collection/operands/1/operands/1/key").asText());
+ node.at(CORPUS_PATH+"/operands/1/operands/1/key").asText());
}
@Test
@@ -360,12 +360,12 @@
JsonNode node = JsonUtils.readTree(entity);
assertNotNull(node);
assertNotEquals(0, node.path("matches").size());
- assertEquals("koral:docGroup", node.at("/collection/@type").asText());
- assertEquals("CC.*", node.at("/collection/operands/0/value").asText());
- assertEquals("ACA.*", node.at("/collection/operands/1/value").asText());
- assertEquals("operation:or", node.at("/collection/operation").asText());
+ assertEquals("koral:docGroup", node.at(CORPUS_PATH+"/@type").asText());
+ assertEquals("CC.*", node.at(CORPUS_PATH+"/operands/0/value").asText());
+ assertEquals("ACA.*", node.at(CORPUS_PATH+"/operands/1/value").asText());
+ assertEquals("operation:or", node.at(CORPUS_PATH+"/operation").asText());
assertEquals(publicCorpusAccess,
- node.at("/collection/rewrites/0/scope").asText());
+ node.at(CORPUS_PATH+"/rewrites/0/scope").asText());
}
@Test
@@ -422,7 +422,7 @@
assertNotNull(node);
assertNotEquals(0, node.path("matches").size());
assertEquals(freeCorpusAccess,
- node.at("/collection/rewrites/0/scope").asText());
+ node.at(CORPUS_PATH+"/rewrites/0/scope").asText());
}
// EM: The API is disabled
@@ -442,7 +442,7 @@
assertNotNull(node);
assertNotEquals(0, node.path("matches").size());
assertEquals(allCorpusAccess,
- node.at("/collection/rewrites/0/scope").asText());
+ node.at(CORPUS_PATH+"/rewrites/0/scope").asText());
}
// EM: The API is disabled
@@ -462,6 +462,6 @@
assertNotNull(node);
assertNotEquals(0, node.path("matches").size());
assertEquals(publicCorpusAccess,
- node.at("/collection/rewrites/0/scope").asText());
+ node.at(CORPUS_PATH+"/rewrites/0/scope").asText());
}
}
diff --git a/src/test/java/de/ids_mannheim/korap/web/controller/SearchPipeTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/SearchPipeTest.java
index 03b1ded..8c938b5 100644
--- a/src/test/java/de/ids_mannheim/korap/web/controller/SearchPipeTest.java
+++ b/src/test/java/de/ids_mannheim/korap/web/controller/SearchPipeTest.java
@@ -119,11 +119,11 @@
String entity = response.readEntity(String.class);
JsonNode node = JsonUtils.readTree(entity);
assertEquals(2, node.at("/query/wrap/key").size());
- assertEquals(1, node.at("/collection/rewrites").size());
+ assertEquals(1, node.at(CORPUS_PATH+"/rewrites").size());
assertEquals("operation:injection",
- node.at("/collection/rewrites/0/operation").asText());
+ node.at(CORPUS_PATH+"/rewrites/0/operation").asText());
assertEquals(freeCorpusAccess,
- node.at("/collection/rewrites/0/_comment").asText());
+ node.at(CORPUS_PATH+"/rewrites/0/_comment").asText());
node = node.at("/query/wrap/rewrites");
assertEquals(2, node.size());
assertEquals("Glemm", node.at("/0/src").asText());
diff --git a/src/test/java/de/ids_mannheim/korap/web/controller/SearchPublicMetadataTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/SearchPublicMetadataTest.java
index db5b538..ef8ad4e 100644
--- a/src/test/java/de/ids_mannheim/korap/web/controller/SearchPublicMetadataTest.java
+++ b/src/test/java/de/ids_mannheim/korap/web/controller/SearchPublicMetadataTest.java
@@ -34,7 +34,7 @@
JsonNode node = JsonUtils.readTree(entity);
assertTrue(node.at("/meta/snippet").isMissingNode());
assertEquals(allCorpusAccess,
- node.at("/collection/rewrites/0/_comment").asText());
+ node.at(CORPUS_PATH+"/rewrites/0/_comment").asText());
assertFalse(node.at("/matches/0/snippet").asBoolean());
assertFalse(node.at("/matches/0/tokens").asBoolean());
}
@@ -49,7 +49,7 @@
String entity = response.readEntity(String.class);
JsonNode node = JsonUtils.readTree(entity);
assertEquals("All corpus access policy has been added.",
- node.at("/collection/rewrites/0/_comment").asText());
+ node.at(CORPUS_PATH+"/rewrites/0/_comment").asText());
assertTrue(node.at("/matches/0/snippet").isMissingNode());
}
@@ -64,7 +64,7 @@
String entity = response.readEntity(String.class);
JsonNode node = JsonUtils.readTree(entity);
assertEquals(allCorpusAccess,
- node.at("/collection/rewrites/0/_comment").asText());
+ node.at(CORPUS_PATH+"/rewrites/0/_comment").asText());
assertTrue(node.at("/matches/0/snippet").isMissingNode());
assertEquals("Goethe, Johann Wolfgang von",
node.at("/matches/0/author").asText());
@@ -107,7 +107,7 @@
String ent = response.readEntity(String.class);
JsonNode node = JsonUtils.readTree(ent);
assertEquals(allCorpusAccess,
- node.at("/collection/rewrites/0/_comment").asText());
+ node.at(CORPUS_PATH+"/rewrites/0/_comment").asText());
assertTrue(node.at("/matches/0/snippet").isMissingNode());
}
@@ -120,7 +120,7 @@
.queryParam("access-rewrite-disabled", "true").request().get();
assertEquals(Status.OK.getStatusCode(), response.getStatus());
String entity = response.readEntity(String.class);
- JsonNode node = JsonUtils.readTree(entity).at("/collection");
+ JsonNode node = JsonUtils.readTree(entity).at(CORPUS_PATH+"");
assertEquals("operation:and",node.at("/operation").asText());
assertEquals("operation:override", node.at("/rewrites/0/operation").asText());
diff --git a/src/test/java/de/ids_mannheim/korap/web/controller/vc/VirtualCorpusControllerTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/vc/VirtualCorpusControllerTest.java
index bc3e0c3..dd0e4b8 100644
--- a/src/test/java/de/ids_mannheim/korap/web/controller/vc/VirtualCorpusControllerTest.java
+++ b/src/test/java/de/ids_mannheim/korap/web/controller/vc/VirtualCorpusControllerTest.java
@@ -444,31 +444,31 @@
throws ProcessingException, KustvaktException {
createDoryVC();
JsonNode node = testRetrieveKoralQuery("dory", "dory-vc");
- assertEquals("koral:docGroup", node.at("/collection/@type").asText());
+ assertEquals("koral:docGroup", node.at(CORPUS_PATH+"/@type").asText());
assertEquals("operation:and",
- node.at("/collection/operation").asText());
- assertEquals(2, node.at("/collection/operands").size());
+ node.at(CORPUS_PATH+"/operation").asText());
+ assertEquals(2, node.at(CORPUS_PATH+"/operands").size());
String json = "{\"corpusQuery\": \"corpusSigle=WPD17\"}";
editVC("dory", "dory", "dory-vc", json);
node = testRetrieveKoralQuery("dory", "dory-vc");
- assertEquals("koral:doc", node.at("/collection/@type").asText());
- assertEquals("corpusSigle", node.at("/collection/key").asText());
- assertEquals("WPD17", node.at("/collection/value").asText());
+ assertEquals("koral:doc", node.at(CORPUS_PATH+"/@type").asText());
+ assertEquals("corpusSigle", node.at(CORPUS_PATH+"/key").asText());
+ assertEquals("WPD17", node.at(CORPUS_PATH+"/value").asText());
json = "{\"corpusQuery\": \"corpusSigle=GOE AND creationDate since "
+ "1820\"}";
editVC("dory", "dory", "dory-vc", json);
node = testRetrieveKoralQuery("dory", "dory-vc");
- assertEquals("koral:docGroup", node.at("/collection/@type").asText());
+ assertEquals("koral:docGroup", node.at(CORPUS_PATH+"/@type").asText());
assertEquals("operation:and",
- node.at("/collection/operation").asText());
+ node.at(CORPUS_PATH+"/operation").asText());
assertEquals("corpusSigle",
- node.at("/collection/operands/0/key").asText());
- assertEquals("GOE", node.at("/collection/operands/0/value").asText());
+ node.at(CORPUS_PATH+"/operands/0/key").asText());
+ assertEquals("GOE", node.at(CORPUS_PATH+"/operands/0/value").asText());
assertEquals("creationDate",
- node.at("/collection/operands/1/key").asText());
- assertEquals("1820", node.at("/collection/operands/1/value").asText());
+ node.at(CORPUS_PATH+"/operands/1/key").asText());
+ assertEquals("1820", node.at(CORPUS_PATH+"/operands/1/value").asText());
deleteVC("dory-vc", "dory", "dory");
}
diff --git a/src/test/java/de/ids_mannheim/korap/web/controller/vc/VirtualCorpusReferenceTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/vc/VirtualCorpusReferenceTest.java
index 2526fda..da1cb9e 100644
--- a/src/test/java/de/ids_mannheim/korap/web/controller/vc/VirtualCorpusReferenceTest.java
+++ b/src/test/java/de/ids_mannheim/korap/web/controller/vc/VirtualCorpusReferenceTest.java
@@ -195,14 +195,14 @@
JsonNode node = JsonUtils.readTree(ent);
assertTrue(node.at("/matches").size() > 0);
assertEquals("CC.*",
- node.at("/collection/operands/0/value").asText());
+ node.at(CORPUS_PATH+"/operands/0/value").asText());
assertEquals("koral:doc",
- node.at("/collection/operands/1/@type").asText());
- assertEquals("GOE", node.at("/collection/operands/1/value").asText());
+ node.at(CORPUS_PATH+"/operands/1/@type").asText());
+ assertEquals("GOE", node.at(CORPUS_PATH+"/operands/1/value").asText());
assertEquals("corpusSigle",
- node.at("/collection/operands/1/key").asText());
+ node.at(CORPUS_PATH+"/operands/1/key").asText());
- node = node.at("/collection/operands/1");
+ node = node.at(CORPUS_PATH+"/operands/1");
assertEquals("operation:override",
node.at("/rewrites/0/operation").asText());
assertEquals("koral:docGroupRef",
@@ -227,7 +227,7 @@
JsonNode node = JsonUtils.readTree(ent);
assertTrue(node.at("/matches").size() > 0);
- node = node.at("/collection/rewrites/0");
+ node = node.at(CORPUS_PATH+"/rewrites/0");
assertEquals("operation:override", node.at("/operation").asText());
assertEquals("marlin/published-vc",
node.at("/original/ref").asText());
diff --git a/src/test/java/de/ids_mannheim/korap/web/lite/LiteSearchControllerTest.java b/src/test/java/de/ids_mannheim/korap/web/lite/LiteSearchControllerTest.java
index e15f9aa..edf580d 100644
--- a/src/test/java/de/ids_mannheim/korap/web/lite/LiteSearchControllerTest.java
+++ b/src/test/java/de/ids_mannheim/korap/web/lite/LiteSearchControllerTest.java
@@ -278,8 +278,8 @@
assertNotNull(node);
assertEquals("orth", node.at("/query/wrap/layer").asText());
assertEquals("Politik",
- node.at("/collection/operands/0/value").asText());
- assertEquals("WPD", node.at("/collection/operands/1/value").asText());
+ node.at("/collection"+"/operands/0/value").asText());
+ assertEquals("WPD", node.at("/collection"+"/operands/1/value").asText());
response = target().path(API_VERSION).path("search")
.queryParam("q", "[orth=das]").queryParam("ql", "poliqarp")
.queryParam("fields", "author, docSigle")
@@ -296,8 +296,8 @@
assertNotNull(node);
assertEquals("orth", node.at("/query/wrap/layer").asText());
assertEquals("Politik",
- node.at("/collection/operands/0/value").asText());
- assertEquals("WPD", node.at("/collection/operands/1/value").asText());
+ node.at("/collection"+"/operands/0/value").asText());
+ assertEquals("WPD", node.at("/collection"+"/operands/1/value").asText());
}
@Test