You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by fc...@apache.org on 2011/12/09 15:15:34 UTC
svn commit: r1212434 - in /incubator/stanbol/trunk:
factstore/factstore/src/main/java/org/apache/stanbol/factstore/model/FactResultSet.java
integration-tests/src/test/java/org/apache/stanbol/factstore/FactStoreTest.java
Author: fchrist
Date: Fri Dec 9 14:15:34 2011
New Revision: 1212434
URL: http://svn.apache.org/viewvc?rev=1212434&view=rev
Log:
STANBOL-237 Added new test for queries with multiple results. Fixed multiple results.
Modified:
incubator/stanbol/trunk/factstore/factstore/src/main/java/org/apache/stanbol/factstore/model/FactResultSet.java
incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/factstore/FactStoreTest.java
Modified: incubator/stanbol/trunk/factstore/factstore/src/main/java/org/apache/stanbol/factstore/model/FactResultSet.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/factstore/factstore/src/main/java/org/apache/stanbol/factstore/model/FactResultSet.java?rev=1212434&r1=1212433&r2=1212434&view=diff
==============================================================================
--- incubator/stanbol/trunk/factstore/factstore/src/main/java/org/apache/stanbol/factstore/model/FactResultSet.java (original)
+++ incubator/stanbol/trunk/factstore/factstore/src/main/java/org/apache/stanbol/factstore/model/FactResultSet.java Fri Dec 9 14:15:34 2011
@@ -56,7 +56,7 @@ public class FactResultSet {
for (FactResult result : rows) {
rowCount++;
JsonLdResource subject = new JsonLdResource();
- subject.setSubject(String.valueOf(rowCount));
+ subject.setSubject("R" + rowCount);
for (int i = 0; i < header.size(); i++) {
subject.putProperty(header.get(i), result.getValues().get(i));
}
Modified: incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/factstore/FactStoreTest.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/factstore/FactStoreTest.java?rev=1212434&r1=1212433&r2=1212434&view=diff
==============================================================================
--- incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/factstore/FactStoreTest.java (original)
+++ incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/factstore/FactStoreTest.java Fri Dec 9 14:15:34 2011
@@ -300,7 +300,51 @@ public class FactStoreTest extends Stanb
.withHeader("Content-Type", "application/json")
.withHeader("Accept", "application/json");
- String expected = "{\"@subject\":\"1\",\"person\":\"http://upb.de/persons/bnagel\"}";
+ String expected = "{\"@subject\":\"R1\",\"person\":\"http://upb.de/persons/bnagel\"}";
+ String actual = executor.execute(q).assertStatus(200).getContent();
+ Assert.assertEquals(expected, actual);
+ }
+
+ @Test
+ public void querySingleFactMultiResults() throws Exception {
+ Request r1 = builder
+ .buildOtherRequest(
+ new HttpPut(builder.buildUrl("/factstore/facts/"
+ + encodeURI("http://iks-project.eu/ont/emplOf"))))
+ .withContent(
+ "{\"@context\":{\"iks\":\"http://iks-project.eu/ont/\",\"@types\":{\"person\":\"iks:person\",\"organization\":\"iks:organization\"}}}")
+ .withHeader("Content-Type", "application/json");
+ executor.execute(r1).assertStatus(201);
+
+ Request r2 = builder
+ .buildOtherRequest(new HttpPost(builder.buildUrl("/factstore/facts/")))
+ .withContent(
+ "{\"@context\":{\"iks\":\"http://iks-project.eu/ont/\",\"upb\":\"http://upb.de/persons/\"},\"@profile\":\"iks:emplOf\",\"person\":{\"@iri\":\"upb:jim\"},\"organization\":{\"@iri\":\"http://upb.de\"}}")
+ .withHeader("Content-Type", "application/json");
+ executor.execute(r2).assertStatus(200);
+
+ Request r3 = builder
+ .buildOtherRequest(new HttpPost(builder.buildUrl("/factstore/facts/")))
+ .withContent(
+ "{\"@context\":{\"iks\":\"http://iks-project.eu/ont/\",\"upb\":\"http://upb.de/persons/\"},\"@profile\":\"iks:emplOf\",\"person\":{\"@iri\":\"upb:john\"},\"organization\":{\"@iri\":\"http://upb.de\"}}")
+ .withHeader("Content-Type", "application/json");
+ executor.execute(r3).assertStatus(200);
+
+ Request r4 = builder
+ .buildOtherRequest(new HttpPost(builder.buildUrl("/factstore/facts/")))
+ .withContent(
+ "{\"@context\":{\"iks\":\"http://iks-project.eu/ont/\",\"upb\":\"http://upb.de/persons/\"},\"@profile\":\"iks:emplOf\",\"person\":{\"@iri\":\"upb:james\"},\"organization\":{\"@iri\":\"http://upb.de\"}}")
+ .withHeader("Content-Type", "application/json");
+ executor.execute(r4).assertStatus(200);
+
+ String queryString = "{\"@context\":{\"iks\":\"http://iks-project.eu/ont/\"},\"select\":[\"person\"],\"from\":\"iks:emplOf\",\"where\":[{\"=\":{\"organization\":{\"@iri\":\"http://upb.de\"}}}]}";
+ Request q = builder
+ .buildOtherRequest(new HttpPost(builder.buildUrl("/factstore/query/")))
+ .withContent(queryString)
+ .withHeader("Content-Type", "application/json")
+ .withHeader("Accept", "application/json");
+
+ String expected = "{\"@subject\":[{\"@subject\":\"R1\",\"person\":\"http://upb.de/persons/jim\"},{\"@subject\":\"R2\",\"person\":\"http://upb.de/persons/john\"},{\"@subject\":\"R3\",\"person\":\"http://upb.de/persons/james\"}]}";
String actual = executor.execute(q).assertStatus(200).getContent();
Assert.assertEquals(expected, actual);
}