You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2015/03/17 16:56:06 UTC
[7/8] jena git commit: Replace mixed tabs/spaces with spaces.
Replace mixed tabs/spaces with spaces.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/807dc362
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/807dc362
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/807dc362
Branch: refs/heads/master
Commit: 807dc362455650c6b3a034fc3298e0d9fdeb6dbb
Parents: 7547bf9
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Mar 17 15:51:55 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Mar 17 15:51:55 2015 +0000
----------------------------------------------------------------------
.../AbstractTestDatasetWithGraphTextIndex.java | 240 ++++-----
...ractTestDatasetWithLuceneGraphTextIndex.java | 6 +-
.../text/AbstractTestDatasetWithTextIndex.java | 302 +++++------
.../AbstractTestDatasetWithTextIndexBase.java | 100 ++--
.../TestDatasetWithEmbeddedSolrTextIndex.java | 44 +-
.../text/TestDatasetWithKeywordAnalyzer.java | 198 ++++----
...TestDatasetWithLowerCaseKeywordAnalyzer.java | 50 +-
.../TestDatasetWithLuceneGraphTextIndex.java | 12 +-
.../text/TestDatasetWithLuceneTextIndex.java | 2 +-
.../text/TestDatasetWithSimpleAnalyzer.java | 176 +++----
.../text/TestDatasetWithStandardAnalyzer.java | 216 ++++----
.../apache/jena/query/text/TextSearchUtil.java | 4 +-
.../assembler/AbstractTestTextAssembler.java | 158 +++---
.../text/assembler/TestEntityMapAssembler.java | 502 +++++++++----------
.../assembler/TestTextDatasetAssembler.java | 236 ++++-----
.../assembler/TestTextIndexSolrAssembler.java | 72 +--
16 files changed, 1159 insertions(+), 1159 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/807dc362/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithGraphTextIndex.java
----------------------------------------------------------------------
diff --git a/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithGraphTextIndex.java b/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithGraphTextIndex.java
index b6d7ae0..638a25e 100644
--- a/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithGraphTextIndex.java
+++ b/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithGraphTextIndex.java
@@ -50,126 +50,126 @@ public abstract class AbstractTestDatasetWithGraphTextIndex extends AbstractTest
}
}
- @Test
- public void testOneSimpleResultInGraph() {
- final String turtle = StrUtils.strjoinNL(
- TURTLE_PROLOG,
- "<" + RESOURCE_BASE + "testOneSimpleResult>",
- " rdfs:label 'bar testOneSimpleResult barfoo foo'",
- "."
- );
+ @Test
+ public void testOneSimpleResultInGraph() {
+ final String turtle = StrUtils.strjoinNL(
+ TURTLE_PROLOG,
+ "<" + RESOURCE_BASE + "testOneSimpleResult>",
+ " rdfs:label 'bar testOneSimpleResult barfoo foo'",
+ "."
+ );
putTurtleInModel(turtle, "http://example.org/modelA") ;
- String queryString = StrUtils.strjoinNL(
- QUERY_PROLOG,
- "SELECT ?s",
- "WHERE {",
- " GRAPH ?g { ?s text:query ( rdfs:label 'testOneSimpleResult' 10 ) . }",
- "}"
- );
- Set<String> expectedURIs = new HashSet<>() ;
- expectedURIs.addAll( Arrays.asList(RESOURCE_BASE + "testOneSimpleResult")) ;
- doTestQuery(dataset, "", queryString, expectedURIs, expectedURIs.size()) ;
- }
+ String queryString = StrUtils.strjoinNL(
+ QUERY_PROLOG,
+ "SELECT ?s",
+ "WHERE {",
+ " GRAPH ?g { ?s text:query ( rdfs:label 'testOneSimpleResult' 10 ) . }",
+ "}"
+ );
+ Set<String> expectedURIs = new HashSet<>() ;
+ expectedURIs.addAll( Arrays.asList(RESOURCE_BASE + "testOneSimpleResult")) ;
+ doTestQuery(dataset, "", queryString, expectedURIs, expectedURIs.size()) ;
+ }
- @Test
- public void testOneResultTwoGraphs() {
- final String turtleA = StrUtils.strjoinNL(
- TURTLE_PROLOG,
- "<" + RESOURCE_BASE + "testResultInModelA>",
- " rdfs:label 'bar testOneResult barfoo foo'",
- "."
- );
+ @Test
+ public void testOneResultTwoGraphs() {
+ final String turtleA = StrUtils.strjoinNL(
+ TURTLE_PROLOG,
+ "<" + RESOURCE_BASE + "testResultInModelA>",
+ " rdfs:label 'bar testOneResult barfoo foo'",
+ "."
+ );
putTurtleInModel(turtleA, "http://example.org/modelA") ;
- final String turtleB = StrUtils.strjoinNL(
- TURTLE_PROLOG,
- "<" + RESOURCE_BASE + "testResultInModelB>",
- " rdfs:label 'bar testOneResult barfoo foo'",
- "."
- );
+ final String turtleB = StrUtils.strjoinNL(
+ TURTLE_PROLOG,
+ "<" + RESOURCE_BASE + "testResultInModelB>",
+ " rdfs:label 'bar testOneResult barfoo foo'",
+ "."
+ );
putTurtleInModel(turtleB, "http://example.org/modelB") ;
- String queryString = StrUtils.strjoinNL(
- QUERY_PROLOG,
- "SELECT ?s",
- "WHERE {",
- " GRAPH <http://example.org/modelA> { ?s text:query ( rdfs:label 'testOneResult' 10 ) . }",
- "}"
- );
- Set<String> expectedURIs = new HashSet<>() ;
- expectedURIs.addAll( Arrays.asList(RESOURCE_BASE + "testResultInModelA")) ;
- doTestQuery(dataset, "", queryString, expectedURIs, expectedURIs.size()) ;
- }
+ String queryString = StrUtils.strjoinNL(
+ QUERY_PROLOG,
+ "SELECT ?s",
+ "WHERE {",
+ " GRAPH <http://example.org/modelA> { ?s text:query ( rdfs:label 'testOneResult' 10 ) . }",
+ "}"
+ );
+ Set<String> expectedURIs = new HashSet<>() ;
+ expectedURIs.addAll( Arrays.asList(RESOURCE_BASE + "testResultInModelA")) ;
+ doTestQuery(dataset, "", queryString, expectedURIs, expectedURIs.size()) ;
+ }
- @Test
- public void testORFromGraphs() {
- final String turtleA = StrUtils.strjoinNL(
- TURTLE_PROLOG,
- "<" + RESOURCE_BASE + "testResultOneInModelA>",
- " rdfs:label 'bar testResultOne barfoo foo'",
- ".",
- "<" + RESOURCE_BASE + "testResultTwoInModelA>",
- " rdfs:label 'bar testResultTwo barfoo foo'",
- ".",
- "<" + RESOURCE_BASE + "testResultThreeInModelA>",
- " rdfs:label 'bar testResultThree barfoo foo'",
- "."
- );
+ @Test
+ public void testORFromGraphs() {
+ final String turtleA = StrUtils.strjoinNL(
+ TURTLE_PROLOG,
+ "<" + RESOURCE_BASE + "testResultOneInModelA>",
+ " rdfs:label 'bar testResultOne barfoo foo'",
+ ".",
+ "<" + RESOURCE_BASE + "testResultTwoInModelA>",
+ " rdfs:label 'bar testResultTwo barfoo foo'",
+ ".",
+ "<" + RESOURCE_BASE + "testResultThreeInModelA>",
+ " rdfs:label 'bar testResultThree barfoo foo'",
+ "."
+ );
putTurtleInModel(turtleA, "http://example.org/modelA") ;
- final String turtleB = StrUtils.strjoinNL(
- TURTLE_PROLOG,
- "<" + RESOURCE_BASE + "testResultOneInModelB>",
- " rdfs:label 'bar testResultOne barfoo foo'",
- "."
- );
+ final String turtleB = StrUtils.strjoinNL(
+ TURTLE_PROLOG,
+ "<" + RESOURCE_BASE + "testResultOneInModelB>",
+ " rdfs:label 'bar testResultOne barfoo foo'",
+ "."
+ );
putTurtleInModel(turtleB, "http://example.org/modelB") ;
- String queryString = StrUtils.strjoinNL(
- QUERY_PROLOG,
- "SELECT ?s",
- "WHERE {",
- " GRAPH <http://example.org/modelA> { ?s text:query ( rdfs:label 'testResultOne OR testResultTwo' 10 ) . }",
- "}"
- );
- Set<String> expectedURIs = new HashSet<>() ;
- expectedURIs.addAll( Arrays.asList(RESOURCE_BASE + "testResultOneInModelA", RESOURCE_BASE + "testResultTwoInModelA")) ;
- doTestQuery(dataset, "", queryString, expectedURIs, expectedURIs.size()) ;
- }
+ String queryString = StrUtils.strjoinNL(
+ QUERY_PROLOG,
+ "SELECT ?s",
+ "WHERE {",
+ " GRAPH <http://example.org/modelA> { ?s text:query ( rdfs:label 'testResultOne OR testResultTwo' 10 ) . }",
+ "}"
+ );
+ Set<String> expectedURIs = new HashSet<>() ;
+ expectedURIs.addAll( Arrays.asList(RESOURCE_BASE + "testResultOneInModelA", RESOURCE_BASE + "testResultTwoInModelA")) ;
+ doTestQuery(dataset, "", queryString, expectedURIs, expectedURIs.size()) ;
+ }
- @Test
- public void testQueryFromDefaultGraph() {
- final String turtleA = StrUtils.strjoinNL(
- TURTLE_PROLOG,
- "<" + RESOURCE_BASE + "testResultInModelA>",
- " rdfs:label 'bar testOneResult barfoo foo'",
- "."
- );
+ @Test
+ public void testQueryFromDefaultGraph() {
+ final String turtleA = StrUtils.strjoinNL(
+ TURTLE_PROLOG,
+ "<" + RESOURCE_BASE + "testResultInModelA>",
+ " rdfs:label 'bar testOneResult barfoo foo'",
+ "."
+ );
putTurtleInModel(turtleA, null) ; // put in default graph
- final String turtleB = StrUtils.strjoinNL(
- TURTLE_PROLOG,
- "<" + RESOURCE_BASE + "testResultInModelB>",
- " rdfs:label 'bar testOneResult barfoo foo'",
- "."
- );
+ final String turtleB = StrUtils.strjoinNL(
+ TURTLE_PROLOG,
+ "<" + RESOURCE_BASE + "testResultInModelB>",
+ " rdfs:label 'bar testOneResult barfoo foo'",
+ "."
+ );
putTurtleInModel(turtleB, "http://example.org/modelB") ;
- String queryString = StrUtils.strjoinNL(
- QUERY_PROLOG,
- "SELECT ?s",
- "WHERE {",
- " ?s text:query ( rdfs:label 'testOneResult' 10 ) .",
- "}"
- );
- Set<String> expectedURIs = new HashSet<>() ;
- expectedURIs.addAll( Arrays.asList(RESOURCE_BASE + "testResultInModelA")) ;
- doTestQuery(dataset, "", queryString, expectedURIs, expectedURIs.size()) ;
- }
+ String queryString = StrUtils.strjoinNL(
+ QUERY_PROLOG,
+ "SELECT ?s",
+ "WHERE {",
+ " ?s text:query ( rdfs:label 'testOneResult' 10 ) .",
+ "}"
+ );
+ Set<String> expectedURIs = new HashSet<>() ;
+ expectedURIs.addAll( Arrays.asList(RESOURCE_BASE + "testResultInModelA")) ;
+ doTestQuery(dataset, "", queryString, expectedURIs, expectedURIs.size()) ;
+ }
- @Test
- public void testBnodeIdentifiedGraph() {
- final String trig = StrUtils.strjoinNL(
- TURTLE_PROLOG,
- "_:graphA {",
- " <" + RESOURCE_BASE + "testResultInGraphA>",
- " rdfs:label 'bar testResult barfoo foo' .",
- "}"
- );
+ @Test
+ public void testBnodeIdentifiedGraph() {
+ final String trig = StrUtils.strjoinNL(
+ TURTLE_PROLOG,
+ "_:graphA {",
+ " <" + RESOURCE_BASE + "testResultInGraphA>",
+ " rdfs:label 'bar testResult barfoo foo' .",
+ "}"
+ );
StringReader reader = new StringReader(trig);
dataset.begin(ReadWrite.WRITE) ;
try {
@@ -180,15 +180,15 @@ public abstract class AbstractTestDatasetWithGraphTextIndex extends AbstractTest
dataset.end();
}
- String queryString = StrUtils.strjoinNL(
- QUERY_PROLOG,
- "SELECT ?s",
- "WHERE {",
- " GRAPH ?g { ?s text:query ( rdfs:label 'testResult' 10 ) . }",
- "}"
- );
- Set<String> expectedURIs = new HashSet<>() ;
- expectedURIs.addAll( Arrays.asList(RESOURCE_BASE + "testResultInGraphA")) ;
- doTestQuery(dataset, "", queryString, expectedURIs, expectedURIs.size()) ;
- }
+ String queryString = StrUtils.strjoinNL(
+ QUERY_PROLOG,
+ "SELECT ?s",
+ "WHERE {",
+ " GRAPH ?g { ?s text:query ( rdfs:label 'testResult' 10 ) . }",
+ "}"
+ );
+ Set<String> expectedURIs = new HashSet<>() ;
+ expectedURIs.addAll( Arrays.asList(RESOURCE_BASE + "testResultInGraphA")) ;
+ doTestQuery(dataset, "", queryString, expectedURIs, expectedURIs.size()) ;
+ }
}
http://git-wip-us.apache.org/repos/asf/jena/blob/807dc362/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithLuceneGraphTextIndex.java
----------------------------------------------------------------------
diff --git a/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithLuceneGraphTextIndex.java b/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithLuceneGraphTextIndex.java
index 7f83b90..1011ba4 100644
--- a/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithLuceneGraphTextIndex.java
+++ b/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithLuceneGraphTextIndex.java
@@ -34,15 +34,15 @@ import com.hp.hpl.jena.vocabulary.RDFS ;
public class AbstractTestDatasetWithLuceneGraphTextIndex extends AbstractTestDatasetWithGraphTextIndex {
@Before
- public void init() {
+ public void init() {
Dataset ds1 = TDBFactory.createDataset() ;
Directory dir = new RAMDirectory() ;
EntityDefinition eDef = new EntityDefinition("iri", "text", "graph", RDFS.label.asNode()) ;
eDef.set("comment", RDFS.comment.asNode()) ; // some tests require indexing rdfs:comment
TextIndex tidx = new TextIndexLucene(dir, eDef, null) ;
dataset = TextDatasetFactory.create(ds1, tidx) ;
- }
-
+ }
+
@After
public void teardown() {
dataset.close();
http://git-wip-us.apache.org/repos/asf/jena/blob/807dc362/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithTextIndex.java
----------------------------------------------------------------------
diff --git a/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithTextIndex.java b/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithTextIndex.java
index 3bcd5ff..75b3682 100644
--- a/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithTextIndex.java
+++ b/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithTextIndex.java
@@ -32,35 +32,35 @@ import org.junit.Test ;
* the actual tests.
*/
public abstract class AbstractTestDatasetWithTextIndex extends AbstractTestDatasetWithTextIndexBase {
-
- @Test
- public void testOneSimpleResult() {
- final String turtle = StrUtils.strjoinNL(
- TURTLE_PROLOG,
- "<" + RESOURCE_BASE + "testOneSimpleResult>",
- " rdfs:label 'bar testOneSimpleResult barfoo foo'",
- "."
- );
- String queryString = StrUtils.strjoinNL(
- QUERY_PROLOG,
- "SELECT ?s",
- "WHERE {",
- " ?s text:query ( rdfs:label 'testOneSimpleResult' 10 ) .",
- "}"
- );
- Set<String> expectedURIs = new HashSet<>() ;
- expectedURIs.addAll( Arrays.asList("http://example.org/data/resource/testOneSimpleResult")) ;
- doTestSearch(turtle, queryString, expectedURIs);
- }
+
+ @Test
+ public void testOneSimpleResult() {
+ final String turtle = StrUtils.strjoinNL(
+ TURTLE_PROLOG,
+ "<" + RESOURCE_BASE + "testOneSimpleResult>",
+ " rdfs:label 'bar testOneSimpleResult barfoo foo'",
+ "."
+ );
+ String queryString = StrUtils.strjoinNL(
+ QUERY_PROLOG,
+ "SELECT ?s",
+ "WHERE {",
+ " ?s text:query ( rdfs:label 'testOneSimpleResult' 10 ) .",
+ "}"
+ );
+ Set<String> expectedURIs = new HashSet<>() ;
+ expectedURIs.addAll( Arrays.asList("http://example.org/data/resource/testOneSimpleResult")) ;
+ doTestSearch(turtle, queryString, expectedURIs);
+ }
- static final String R_S1 = RESOURCE_BASE + "s1" ;
+ static final String R_S1 = RESOURCE_BASE + "s1" ;
static final String R_S2 = RESOURCE_BASE + "s2" ;
- static final String PF_DATA = StrUtils.strjoinNL(
- TURTLE_PROLOG,
- "<" + R_S1 + "> rdfs:label 'text' .",
- "<" + R_S2 + "> rdfs:label 'fuzz' ."
- );
-
+ static final String PF_DATA = StrUtils.strjoinNL(
+ TURTLE_PROLOG,
+ "<" + R_S1 + "> rdfs:label 'text' .",
+ "<" + R_S2 + "> rdfs:label 'fuzz' ."
+ );
+
@Test
public void propertyFunctionText_1() {
final String turtle = PF_DATA ;
@@ -222,31 +222,31 @@ public abstract class AbstractTestDatasetWithTextIndex extends AbstractTestDatas
@Test
- public void testMultipleResults() {
- String label = "testMultipleResults";
- final String turtle = StrUtils.strjoinNL(
- TURTLE_PROLOG,
- "<" + RESOURCE_BASE + label +"1>",
- " rdfs:label '" + label + "1'",
- ".",
- "<" + RESOURCE_BASE + label + "2>",
- " rdfs:label '" + label + "2'",
- "."
- );
- String queryString = StrUtils.strjoinNL(
- QUERY_PROLOG,
- "SELECT ?s",
- "WHERE {",
- " ?s text:query ( rdfs:label '" + label + "?' 10 ) .",
- "}"
- );
- Set<String> expectedURIs = new HashSet<>() ;
- expectedURIs.addAll( Arrays.asList(
- "http://example.org/data/resource/" + label + "1",
- "http://example.org/data/resource/" + label + "2"
- ));
- doTestSearch(turtle, queryString, expectedURIs);
- }
+ public void testMultipleResults() {
+ String label = "testMultipleResults";
+ final String turtle = StrUtils.strjoinNL(
+ TURTLE_PROLOG,
+ "<" + RESOURCE_BASE + label +"1>",
+ " rdfs:label '" + label + "1'",
+ ".",
+ "<" + RESOURCE_BASE + label + "2>",
+ " rdfs:label '" + label + "2'",
+ "."
+ );
+ String queryString = StrUtils.strjoinNL(
+ QUERY_PROLOG,
+ "SELECT ?s",
+ "WHERE {",
+ " ?s text:query ( rdfs:label '" + label + "?' 10 ) .",
+ "}"
+ );
+ Set<String> expectedURIs = new HashSet<>() ;
+ expectedURIs.addAll( Arrays.asList(
+ "http://example.org/data/resource/" + label + "1",
+ "http://example.org/data/resource/" + label + "2"
+ ));
+ doTestSearch(turtle, queryString, expectedURIs);
+ }
@Test
public void testMultipleResults_dft() {
@@ -276,74 +276,74 @@ public abstract class AbstractTestDatasetWithTextIndex extends AbstractTestDatas
}
@Test
- public void testSearchCorrectField() {
- String label = "tscf";
- String label2 = "tscfo";
- final String turtle = StrUtils.strjoinNL(
- TURTLE_PROLOG,
- "<" + RESOURCE_BASE + label +"1>",
- " rdfs:label '" + label + "a' ; ",
- " rdfs:comment '" + label2 + "a' ;",
- ".",
- "<" + RESOURCE_BASE + label + "2>",
- " rdfs:label '" + label2 + "b' ; ",
- " rdfs:comment '" + label + "b' ; ",
- "."
- );
- String queryStringLabel = StrUtils.strjoinNL(
- QUERY_PROLOG,
- "SELECT ?s",
- "WHERE {",
- " ?s text:query ( rdfs:label '" + label + "?' 10 ) .",
- "}"
- );
- String queryStringComment = StrUtils.strjoinNL(
- QUERY_PROLOG,
- "SELECT ?s",
- "WHERE {",
- " ?s text:query ( rdfs:comment '" + label + "?' 10 ) .",
- "}"
- );
- Set<String> expectedURIsLabel = new HashSet<>() ;
- expectedURIsLabel.addAll( Arrays.asList(
- "http://example.org/data/resource/" + label + "1"
- ));
- Set<String> expectedURIsComment = new HashSet<>() ;
- expectedURIsComment.addAll( Arrays.asList(
- "http://example.org/data/resource/" + label + "2"
- ));
- doTestSearch("label:", turtle, queryStringLabel, expectedURIsLabel);
- doTestSearch("comment:", turtle, queryStringComment, expectedURIsComment);
- }
+ public void testSearchCorrectField() {
+ String label = "tscf";
+ String label2 = "tscfo";
+ final String turtle = StrUtils.strjoinNL(
+ TURTLE_PROLOG,
+ "<" + RESOURCE_BASE + label +"1>",
+ " rdfs:label '" + label + "a' ; ",
+ " rdfs:comment '" + label2 + "a' ;",
+ ".",
+ "<" + RESOURCE_BASE + label + "2>",
+ " rdfs:label '" + label2 + "b' ; ",
+ " rdfs:comment '" + label + "b' ; ",
+ "."
+ );
+ String queryStringLabel = StrUtils.strjoinNL(
+ QUERY_PROLOG,
+ "SELECT ?s",
+ "WHERE {",
+ " ?s text:query ( rdfs:label '" + label + "?' 10 ) .",
+ "}"
+ );
+ String queryStringComment = StrUtils.strjoinNL(
+ QUERY_PROLOG,
+ "SELECT ?s",
+ "WHERE {",
+ " ?s text:query ( rdfs:comment '" + label + "?' 10 ) .",
+ "}"
+ );
+ Set<String> expectedURIsLabel = new HashSet<>() ;
+ expectedURIsLabel.addAll( Arrays.asList(
+ "http://example.org/data/resource/" + label + "1"
+ ));
+ Set<String> expectedURIsComment = new HashSet<>() ;
+ expectedURIsComment.addAll( Arrays.asList(
+ "http://example.org/data/resource/" + label + "2"
+ ));
+ doTestSearch("label:", turtle, queryStringLabel, expectedURIsLabel);
+ doTestSearch("comment:", turtle, queryStringComment, expectedURIsComment);
+ }
@Test
- public void testSearchDefaultField() {
- String label = "testSearchDefaultField";
- String label2 = "testSearchDefaultFieldOther";
- final String turtle = StrUtils.strjoinNL(
- TURTLE_PROLOG,
- "<" + RESOURCE_BASE + label +"1>",
- " rdfs:label '" + label + "1' ; ",
- " rdfs:comment '" + label2 + "1' ;",
- ".",
- "<" + RESOURCE_BASE + label + "2>",
- " rdfs:label '" + label2 + "2' ; ",
- " rdfs:comment '" + label + "2' ; ",
- "."
- );
- String queryString = StrUtils.strjoinNL(
- QUERY_PROLOG,
- "SELECT ?s",
- "WHERE {",
- " ?s text:query ( rdfs:label '" + label + "?' 10 ) .",
- "}"
- );
- Set<String> expectedURIs = new HashSet<>() ;
- expectedURIs.addAll( Arrays.asList(
- "http://example.org/data/resource/" + label + "1"
- ));
- doTestSearch("default field:", turtle, queryString, expectedURIs);
- }
+ public void testSearchDefaultField() {
+ String label = "testSearchDefaultField";
+ String label2 = "testSearchDefaultFieldOther";
+ final String turtle = StrUtils.strjoinNL(
+ TURTLE_PROLOG,
+ "<" + RESOURCE_BASE + label +"1>",
+ " rdfs:label '" + label + "1' ; ",
+ " rdfs:comment '" + label2 + "1' ;",
+ ".",
+ "<" + RESOURCE_BASE + label + "2>",
+ " rdfs:label '" + label2 + "2' ; ",
+ " rdfs:comment '" + label + "2' ; ",
+ "."
+ );
+ String queryString = StrUtils.strjoinNL(
+ QUERY_PROLOG,
+ "SELECT ?s",
+ "WHERE {",
+ " ?s text:query ( rdfs:label '" + label + "?' 10 ) .",
+ "}"
+ );
+ Set<String> expectedURIs = new HashSet<>() ;
+ expectedURIs.addAll( Arrays.asList(
+ "http://example.org/data/resource/" + label + "1"
+ ));
+ doTestSearch("default field:", turtle, queryString, expectedURIs);
+ }
@Test
public void testSearchDefaultField_dft() {
@@ -375,37 +375,37 @@ public abstract class AbstractTestDatasetWithTextIndex extends AbstractTestDatas
}
@Test
- public void testSearchLimitsResults() {
- String label = "testSearchLimitsResults";
- final String turtle = StrUtils.strjoinNL(
- TURTLE_PROLOG,
- "<" + RESOURCE_BASE + label + "1>",
- " rdfs:label '" + label + "' ;",
- ".",
- "<" + RESOURCE_BASE + label + "2>",
- " rdfs:label '" + label + "' ;",
- ".",
- "<" + RESOURCE_BASE + label + "3>",
- " rdfs:label '" + label + "' ;",
- ".",
- "<" + RESOURCE_BASE + label + "4>",
- " rdfs:label '" + label + "' ;",
- "."
- );
- String queryString = StrUtils.strjoinNL(
- QUERY_PROLOG,
- "SELECT ?s",
- "WHERE {",
- " ?s text:query ( '" + label + "' 3 ) .",
- "}"
- );
- Set<String> expectedURIs = new HashSet<>() ;
- expectedURIs.addAll( Arrays.asList(
- "http://example.org/data/resource/" + label + "1",
- "http://example.org/data/resource/" + label + "2",
- "http://example.org/data/resource/" + label + "3",
- "http://example.org/data/resource/" + label + "4"
- ));
- doTestSearch("default field:", turtle, queryString, expectedURIs, 3 );
- }
+ public void testSearchLimitsResults() {
+ String label = "testSearchLimitsResults";
+ final String turtle = StrUtils.strjoinNL(
+ TURTLE_PROLOG,
+ "<" + RESOURCE_BASE + label + "1>",
+ " rdfs:label '" + label + "' ;",
+ ".",
+ "<" + RESOURCE_BASE + label + "2>",
+ " rdfs:label '" + label + "' ;",
+ ".",
+ "<" + RESOURCE_BASE + label + "3>",
+ " rdfs:label '" + label + "' ;",
+ ".",
+ "<" + RESOURCE_BASE + label + "4>",
+ " rdfs:label '" + label + "' ;",
+ "."
+ );
+ String queryString = StrUtils.strjoinNL(
+ QUERY_PROLOG,
+ "SELECT ?s",
+ "WHERE {",
+ " ?s text:query ( '" + label + "' 3 ) .",
+ "}"
+ );
+ Set<String> expectedURIs = new HashSet<>() ;
+ expectedURIs.addAll( Arrays.asList(
+ "http://example.org/data/resource/" + label + "1",
+ "http://example.org/data/resource/" + label + "2",
+ "http://example.org/data/resource/" + label + "3",
+ "http://example.org/data/resource/" + label + "4"
+ ));
+ doTestSearch("default field:", turtle, queryString, expectedURIs, 3 );
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jena/blob/807dc362/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithTextIndexBase.java
----------------------------------------------------------------------
diff --git a/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithTextIndexBase.java b/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithTextIndexBase.java
index e0c7a06..ef37970 100644
--- a/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithTextIndexBase.java
+++ b/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithTextIndexBase.java
@@ -43,54 +43,54 @@ import com.hp.hpl.jena.rdf.model.Model;
* the actual tests.
*/
public abstract class AbstractTestDatasetWithTextIndexBase {
- protected static final String RESOURCE_BASE = "http://example.org/data/resource/";
- protected static final String QUERY_PROLOG =
- StrUtils.strjoinNL(
- "PREFIX text: <http://jena.apache.org/text#>",
- "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>"
- );
-
- protected static final String TURTLE_PROLOG =
- StrUtils.strjoinNL(
- "@prefix text: <http://jena.apache.org/text#> .",
- "@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> ."
- );
-
- protected Dataset dataset;
-
- protected void doTestSearch(String turtle, String queryString, Set<String> expectedEntityURIs) {
- doTestSearch("", turtle, queryString, expectedEntityURIs);
- }
-
- protected void doTestSearch(String label, String turtle, String queryString, Set<String> expectedEntityURIs) {
- doTestSearch(label, turtle, queryString, expectedEntityURIs, expectedEntityURIs.size());
- }
-
- protected void doTestSearch(String label, String turtle, String queryString, Set<String> expectedEntityURIs, int expectedNumResults) {
- Model model = dataset.getDefaultModel();
- Reader reader = new StringReader(turtle);
- dataset.begin(ReadWrite.WRITE);
- model.read(reader, "", "TURTLE");
- dataset.commit();
- doTestQuery(dataset, label, queryString, expectedEntityURIs, expectedNumResults);
- }
-
- public static void doTestQuery(Dataset dataset, String label, String queryString, Set<String> expectedEntityURIs, int expectedNumResults) {
- Query query = QueryFactory.create(queryString) ;
- dataset.begin(ReadWrite.READ);
- try(QueryExecution qexec = QueryExecutionFactory.create(query, dataset)) {
- ResultSet results = qexec.execSelect() ;
-
- assertEquals(label, expectedNumResults > 0, results.hasNext());
- int count;
- for (count=0; results.hasNext(); count++) {
- String entityURI = results.next().getResource("s").getURI();
- assertTrue(label + ": unexpected result: " + entityURI, expectedEntityURIs.contains(entityURI));
- }
- assertEquals(label, expectedNumResults, count);
- }
- finally {
- dataset.end() ;
- }
- }
+ protected static final String RESOURCE_BASE = "http://example.org/data/resource/";
+ protected static final String QUERY_PROLOG =
+ StrUtils.strjoinNL(
+ "PREFIX text: <http://jena.apache.org/text#>",
+ "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>"
+ );
+
+ protected static final String TURTLE_PROLOG =
+ StrUtils.strjoinNL(
+ "@prefix text: <http://jena.apache.org/text#> .",
+ "@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> ."
+ );
+
+ protected Dataset dataset;
+
+ protected void doTestSearch(String turtle, String queryString, Set<String> expectedEntityURIs) {
+ doTestSearch("", turtle, queryString, expectedEntityURIs);
+ }
+
+ protected void doTestSearch(String label, String turtle, String queryString, Set<String> expectedEntityURIs) {
+ doTestSearch(label, turtle, queryString, expectedEntityURIs, expectedEntityURIs.size());
+ }
+
+ protected void doTestSearch(String label, String turtle, String queryString, Set<String> expectedEntityURIs, int expectedNumResults) {
+ Model model = dataset.getDefaultModel();
+ Reader reader = new StringReader(turtle);
+ dataset.begin(ReadWrite.WRITE);
+ model.read(reader, "", "TURTLE");
+ dataset.commit();
+ doTestQuery(dataset, label, queryString, expectedEntityURIs, expectedNumResults);
+ }
+
+ public static void doTestQuery(Dataset dataset, String label, String queryString, Set<String> expectedEntityURIs, int expectedNumResults) {
+ Query query = QueryFactory.create(queryString) ;
+ dataset.begin(ReadWrite.READ);
+ try(QueryExecution qexec = QueryExecutionFactory.create(query, dataset)) {
+ ResultSet results = qexec.execSelect() ;
+
+ assertEquals(label, expectedNumResults > 0, results.hasNext());
+ int count;
+ for (count=0; results.hasNext(); count++) {
+ String entityURI = results.next().getResource("s").getURI();
+ assertTrue(label + ": unexpected result: " + entityURI, expectedEntityURIs.contains(entityURI));
+ }
+ assertEquals(label, expectedNumResults, count);
+ }
+ finally {
+ dataset.end() ;
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/jena/blob/807dc362/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithEmbeddedSolrTextIndex.java
----------------------------------------------------------------------
diff --git a/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithEmbeddedSolrTextIndex.java b/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithEmbeddedSolrTextIndex.java
index 3e9502a..a462e0a 100644
--- a/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithEmbeddedSolrTextIndex.java
+++ b/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithEmbeddedSolrTextIndex.java
@@ -24,32 +24,32 @@ import org.junit.After ;
import org.junit.Before ;
public class TestDatasetWithEmbeddedSolrTextIndex extends AbstractTestDatasetWithTextIndex {
-
+
private static final String DATA_PATH = "target/test/SolrARQ/data";
private static final File DATA_DIR = new File(DATA_PATH);
private static final String INDEX_PATH = DATA_PATH + "/index";
private static final File INDEX_DIR = new File(INDEX_PATH);
private static final String TEST_ASSEM = "testing/TextQuery/text-solr-config.ttl" ;
- @Before
- public void before() {
-// deleteOldFiles();
- INDEX_DIR.mkdirs();
- TextQuery.init() ;
- TextSearchUtil.createEmptyIndex(INDEX_DIR);
- dataset = TextDatasetFactory.create(TEST_ASSEM) ;
- }
-
- @After
- public void after() {
- TextIndexSolr index = (TextIndexSolr) dataset.getContext().get(TextQuery.textIndex) ;
- index.getServer().shutdown();
- deleteOldFiles();
- }
-
- public void deleteOldFiles() {
- dataset.close();
- if (DATA_DIR.exists())
- TextSearchUtil.emptyAndDeleteDirectory(DATA_DIR);
- }
+ @Before
+ public void before() {
+ //deleteOldFiles();
+ INDEX_DIR.mkdirs();
+ TextQuery.init() ;
+ TextSearchUtil.createEmptyIndex(INDEX_DIR);
+ dataset = TextDatasetFactory.create(TEST_ASSEM) ;
+ }
+
+ @After
+ public void after() {
+ TextIndexSolr index = (TextIndexSolr) dataset.getContext().get(TextQuery.textIndex) ;
+ index.getServer().shutdown();
+ deleteOldFiles();
+ }
+
+ public void deleteOldFiles() {
+ dataset.close();
+ if (DATA_DIR.exists())
+ TextSearchUtil.emptyAndDeleteDirectory(DATA_DIR);
+ }
}
http://git-wip-us.apache.org/repos/asf/jena/blob/807dc362/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithKeywordAnalyzer.java
----------------------------------------------------------------------
diff --git a/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithKeywordAnalyzer.java b/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithKeywordAnalyzer.java
index bfb7fb6..0d75144 100644
--- a/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithKeywordAnalyzer.java
+++ b/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithKeywordAnalyzer.java
@@ -40,29 +40,29 @@ import com.hp.hpl.jena.rdf.model.Resource ;
* This class defines a setup configuration for a dataset that uses a keyword analyzer with a Lucene index.
*/
public class TestDatasetWithKeywordAnalyzer extends AbstractTestDatasetWithTextIndexBase {
-
- private static final String SPEC_BASE = "http://example.org/spec#";
- private static final String SPEC_ROOT_LOCAL = "lucene_text_dataset";
- private static final String SPEC_ROOT_URI = SPEC_BASE + SPEC_ROOT_LOCAL;
+
+ private static final String SPEC_BASE = "http://example.org/spec#";
+ private static final String SPEC_ROOT_LOCAL = "lucene_text_dataset";
+ private static final String SPEC_ROOT_URI = SPEC_BASE + SPEC_ROOT_LOCAL;
- private static String makeSpec(String analyzer) {
- return StrUtils.strjoinNL(
- "prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> ",
- "prefix ja: <http://jena.hpl.hp.com/2005/11/Assembler#> ",
- "prefix tdb: <http://jena.hpl.hp.com/2008/tdb#>",
- "prefix text: <http://jena.apache.org/text#>",
- "prefix : <" + SPEC_BASE + ">",
- "",
- "[] ja:loadClass \"org.apache.jena.query.text.TextQuery\" .",
- "text:TextDataset rdfs:subClassOf ja:RDFDataset .",
- "text:TextIndexLucene rdfs:subClassOf text:TextIndex .",
-
- ":" + SPEC_ROOT_LOCAL,
- " a text:TextDataset ;",
- " text:dataset :dataset ;",
- " text:index :indexLucene ;",
- " .",
- "",
+ private static String makeSpec(String analyzer) {
+ return StrUtils.strjoinNL(
+ "prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> ",
+ "prefix ja: <http://jena.hpl.hp.com/2005/11/Assembler#> ",
+ "prefix tdb: <http://jena.hpl.hp.com/2008/tdb#>",
+ "prefix text: <http://jena.apache.org/text#>",
+ "prefix : <" + SPEC_BASE + ">",
+ "",
+ "[] ja:loadClass \"org.apache.jena.query.text.TextQuery\" .",
+ "text:TextDataset rdfs:subClassOf ja:RDFDataset .",
+ "text:TextIndexLucene rdfs:subClassOf text:TextIndex .",
+
+ ":" + SPEC_ROOT_LOCAL,
+ " a text:TextDataset ;",
+ " text:dataset :dataset ;",
+ " text:index :indexLucene ;",
+ " .",
+ "",
":dataset",
" a ja:RDFDataset ;",
" ja:defaultGraph :graph ;",
@@ -71,84 +71,84 @@ public class TestDatasetWithKeywordAnalyzer extends AbstractTestDatasetWithTextI
" a ja:MemoryModel ;",
".",
"",
- ":indexLucene",
+ ":indexLucene",
" a text:TextIndexLucene ;",
- " text:directory \"mem\" ;",
- " text:entityMap :entMap ;",
- " .",
+ " text:directory \"mem\" ;",
+ " text:entityMap :entMap ;",
+ " .",
"",
- ":entMap",
+ ":entMap",
" a text:EntityMap ;",
- " text:entityField \"uri\" ;",
- " text:defaultField \"label\" ;",
- " text:map (",
- " [ text:field \"label\" ; ",
- " text:predicate rdfs:label ;",
- " text:analyzer [ a " + analyzer + " ]",
- " ]",
- " [ text:field \"comment\" ; text:predicate rdfs:comment ]",
- " ) ."
- );
- }
-
- public void init(String analyzer) {
- Reader reader = new StringReader(makeSpec(analyzer));
- Model specModel = ModelFactory.createDefaultModel();
- specModel.read(reader, "", "TURTLE");
- TextAssembler.init();
- Resource root = specModel.getResource(SPEC_ROOT_URI);
- dataset = (Dataset) Assembler.general.open(root);
- }
-
-
- @Before
- public void before() {
- init("text:KeywordAnalyzer");
- }
-
- @After
- public void after() {
- dataset.close();
- }
-
- @Test
- public void testKeywordAnalyzerDoesNotSplitTokensAtSpace() {
- final String testName = "testKeywordAnalyzerDoesNotSplitTokensAtSpace";
- final String turtle = StrUtils.strjoinNL(
- TURTLE_PROLOG,
- "<" + RESOURCE_BASE + testName + ">",
- " rdfs:label 'EC1V 9BE'",
- "."
- );
- String queryString = StrUtils.strjoinNL(
- QUERY_PROLOG,
- "SELECT ?s",
- "WHERE {",
- " ?s text:query ( rdfs:label 'EC1V' 10 ) .",
- "}"
- );
- Set<String> expectedURIs = new HashSet<>() ;
- doTestSearch(turtle, queryString, expectedURIs);
- }
-
- @Test
- public void testKeywordAnalyzerMatchesWholeField() {
- final String testName = "testKeywordAnalyzerMatchesWholeField";
- final String turtle = StrUtils.strjoinNL(
- TURTLE_PROLOG,
- "<" + RESOURCE_BASE + testName + ">",
- " rdfs:label 'EC2V 9BE'",
- "."
- );
- String queryString = StrUtils.strjoinNL(
- QUERY_PROLOG,
- "SELECT ?s",
- "WHERE {",
- " ?s text:query ( rdfs:label '\"EC2V 9BE\"' 10 ) .",
- "}"
- );
- Set<String> expectedURIs = new HashSet<>() ;
- expectedURIs.addAll( Arrays.asList(RESOURCE_BASE + testName)) ;
- doTestSearch(turtle, queryString, expectedURIs);
- }
+ " text:entityField \"uri\" ;",
+ " text:defaultField \"label\" ;",
+ " text:map (",
+ " [ text:field \"label\" ; ",
+ " text:predicate rdfs:label ;",
+ " text:analyzer [ a " + analyzer + " ]",
+ " ]",
+ " [ text:field \"comment\" ; text:predicate rdfs:comment ]",
+ " ) ."
+ );
+ }
+
+ public void init(String analyzer) {
+ Reader reader = new StringReader(makeSpec(analyzer));
+ Model specModel = ModelFactory.createDefaultModel();
+ specModel.read(reader, "", "TURTLE");
+ TextAssembler.init();
+ Resource root = specModel.getResource(SPEC_ROOT_URI);
+ dataset = (Dataset) Assembler.general.open(root);
+ }
+
+
+ @Before
+ public void before() {
+ init("text:KeywordAnalyzer");
+ }
+
+ @After
+ public void after() {
+ dataset.close();
+ }
+
+ @Test
+ public void testKeywordAnalyzerDoesNotSplitTokensAtSpace() {
+ final String testName = "testKeywordAnalyzerDoesNotSplitTokensAtSpace";
+ final String turtle = StrUtils.strjoinNL(
+ TURTLE_PROLOG,
+ "<" + RESOURCE_BASE + testName + ">",
+ " rdfs:label 'EC1V 9BE'",
+ "."
+ );
+ String queryString = StrUtils.strjoinNL(
+ QUERY_PROLOG,
+ "SELECT ?s",
+ "WHERE {",
+ " ?s text:query ( rdfs:label 'EC1V' 10 ) .",
+ "}"
+ );
+ Set<String> expectedURIs = new HashSet<>() ;
+ doTestSearch(turtle, queryString, expectedURIs);
+ }
+
+ @Test
+ public void testKeywordAnalyzerMatchesWholeField() {
+ final String testName = "testKeywordAnalyzerMatchesWholeField";
+ final String turtle = StrUtils.strjoinNL(
+ TURTLE_PROLOG,
+ "<" + RESOURCE_BASE + testName + ">",
+ " rdfs:label 'EC2V 9BE'",
+ "."
+ );
+ String queryString = StrUtils.strjoinNL(
+ QUERY_PROLOG,
+ "SELECT ?s",
+ "WHERE {",
+ " ?s text:query ( rdfs:label '\"EC2V 9BE\"' 10 ) .",
+ "}"
+ );
+ Set<String> expectedURIs = new HashSet<>() ;
+ expectedURIs.addAll( Arrays.asList(RESOURCE_BASE + testName)) ;
+ doTestSearch(turtle, queryString, expectedURIs);
+ }
}
http://git-wip-us.apache.org/repos/asf/jena/blob/807dc362/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithLowerCaseKeywordAnalyzer.java
----------------------------------------------------------------------
diff --git a/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithLowerCaseKeywordAnalyzer.java b/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithLowerCaseKeywordAnalyzer.java
index b8934f4..b3fd22e 100644
--- a/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithLowerCaseKeywordAnalyzer.java
+++ b/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithLowerCaseKeywordAnalyzer.java
@@ -30,30 +30,30 @@ import org.junit.Test ;
* This class defines a setup configuration for a dataset that uses a lowercase keyword analyzer with a Lucene index.
*/
public class TestDatasetWithLowerCaseKeywordAnalyzer extends TestDatasetWithKeywordAnalyzer {
- @Override
+ @Override
@Before
- public void before() {
- init("text:LowerCaseKeywordAnalyzer");
- }
-
- @Test
- public void testLowerCaseKeywordAnalyzerIsCaseInsensitive() {
- final String testName = "testLowerCaseKeywordAnalyzerIsCaseInsensitive";
- final String turtle = StrUtils.strjoinNL(
- TURTLE_PROLOG,
- "<" + RESOURCE_BASE + testName + ">",
- " rdfs:label 'F;riM at&/ped9'",
- "."
- );
- String queryString = StrUtils.strjoinNL(
- QUERY_PROLOG,
- "SELECT ?s",
- "WHERE {",
- " ?s text:query ( rdfs:label 'f;ri*' 10 ) .",
- "}"
- );
- Set<String> expectedURIs = new HashSet<>() ;
- expectedURIs.addAll( Arrays.asList(RESOURCE_BASE + testName)) ;
- doTestSearch(turtle, queryString, expectedURIs);
- }
+ public void before() {
+ init("text:LowerCaseKeywordAnalyzer");
+ }
+
+ @Test
+ public void testLowerCaseKeywordAnalyzerIsCaseInsensitive() {
+ final String testName = "testLowerCaseKeywordAnalyzerIsCaseInsensitive";
+ final String turtle = StrUtils.strjoinNL(
+ TURTLE_PROLOG,
+ "<" + RESOURCE_BASE + testName + ">",
+ " rdfs:label 'F;riM at&/ped9'",
+ "."
+ );
+ String queryString = StrUtils.strjoinNL(
+ QUERY_PROLOG,
+ "SELECT ?s",
+ "WHERE {",
+ " ?s text:query ( rdfs:label 'f;ri*' 10 ) .",
+ "}"
+ );
+ Set<String> expectedURIs = new HashSet<>() ;
+ expectedURIs.addAll( Arrays.asList(RESOURCE_BASE + testName)) ;
+ doTestSearch(turtle, queryString, expectedURIs);
+ }
}
http://git-wip-us.apache.org/repos/asf/jena/blob/807dc362/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithLuceneGraphTextIndex.java
----------------------------------------------------------------------
diff --git a/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithLuceneGraphTextIndex.java b/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithLuceneGraphTextIndex.java
index 47e0eec..09356e8 100644
--- a/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithLuceneGraphTextIndex.java
+++ b/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithLuceneGraphTextIndex.java
@@ -21,10 +21,10 @@ package org.apache.jena.query.text;
import org.junit.Before ;
public class TestDatasetWithLuceneGraphTextIndex extends AbstractTestDatasetWithLuceneGraphTextIndex {
-
- @Before
- public void before() {
- init();
- }
-
+
+ @Before
+ public void before() {
+ init();
+ }
+
}
http://git-wip-us.apache.org/repos/asf/jena/blob/807dc362/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithLuceneTextIndex.java
----------------------------------------------------------------------
diff --git a/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithLuceneTextIndex.java b/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithLuceneTextIndex.java
index cc55550..1048e6f 100644
--- a/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithLuceneTextIndex.java
+++ b/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithLuceneTextIndex.java
@@ -35,7 +35,7 @@ import com.hp.hpl.jena.rdf.model.ModelFactory ;
import com.hp.hpl.jena.rdf.model.Resource ;
public class TestDatasetWithLuceneTextIndex extends AbstractTestDatasetWithTextIndex {
-
+
private static final String SPEC_BASE = "http://example.org/spec#";
private static final String SPEC_ROOT_LOCAL = "lucene_text_dataset";
private static final String SPEC_ROOT_URI = SPEC_BASE + SPEC_ROOT_LOCAL;
http://git-wip-us.apache.org/repos/asf/jena/blob/807dc362/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithSimpleAnalyzer.java
----------------------------------------------------------------------
diff --git a/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithSimpleAnalyzer.java b/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithSimpleAnalyzer.java
index 7701713..0cf8aa3 100644
--- a/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithSimpleAnalyzer.java
+++ b/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithSimpleAnalyzer.java
@@ -41,31 +41,31 @@ import com.hp.hpl.jena.rdf.model.Resource ;
* This class defines a setup configuration for a dataset that uses a simple analyzer with a Lucene index.
*/
public class TestDatasetWithSimpleAnalyzer extends AbstractTestDatasetWithTextIndexBase {
- private static final String INDEX_PATH = "target/test/TestDatasetWithLuceneIndex";
- private static final File indexDir = new File(INDEX_PATH);
-
- private static final String SPEC_BASE = "http://example.org/spec#";
- private static final String SPEC_ROOT_LOCAL = "lucene_text_dataset";
- private static final String SPEC_ROOT_URI = SPEC_BASE + SPEC_ROOT_LOCAL;
- private static final String SPEC;
- static {
- SPEC = StrUtils.strjoinNL(
- "prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> ",
- "prefix ja: <http://jena.hpl.hp.com/2005/11/Assembler#> ",
- "prefix tdb: <http://jena.hpl.hp.com/2008/tdb#>",
- "prefix text: <http://jena.apache.org/text#>",
- "prefix : <" + SPEC_BASE + ">",
- "",
- "[] ja:loadClass \"org.apache.jena.query.text.TextQuery\" .",
- "text:TextDataset rdfs:subClassOf ja:RDFDataset .",
- "text:TextIndexLucene rdfs:subClassOf text:TextIndex .",
-
- ":" + SPEC_ROOT_LOCAL,
- " a text:TextDataset ;",
- " text:dataset :dataset ;",
- " text:index :indexLucene ;",
- " .",
- "",
+ private static final String INDEX_PATH = "target/test/TestDatasetWithLuceneIndex";
+ private static final File indexDir = new File(INDEX_PATH);
+
+ private static final String SPEC_BASE = "http://example.org/spec#";
+ private static final String SPEC_ROOT_LOCAL = "lucene_text_dataset";
+ private static final String SPEC_ROOT_URI = SPEC_BASE + SPEC_ROOT_LOCAL;
+ private static final String SPEC;
+ static {
+ SPEC = StrUtils.strjoinNL(
+ "prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> ",
+ "prefix ja: <http://jena.hpl.hp.com/2005/11/Assembler#> ",
+ "prefix tdb: <http://jena.hpl.hp.com/2008/tdb#>",
+ "prefix text: <http://jena.apache.org/text#>",
+ "prefix : <" + SPEC_BASE + ">",
+ "",
+ "[] ja:loadClass \"org.apache.jena.query.text.TextQuery\" .",
+ "text:TextDataset rdfs:subClassOf ja:RDFDataset .",
+ "text:TextIndexLucene rdfs:subClassOf text:TextIndex .",
+
+ ":" + SPEC_ROOT_LOCAL,
+ " a text:TextDataset ;",
+ " text:dataset :dataset ;",
+ " text:index :indexLucene ;",
+ " .",
+ "",
":dataset",
" a ja:RDFDataset ;",
" ja:defaultGraph :graph ;",
@@ -74,71 +74,71 @@ public class TestDatasetWithSimpleAnalyzer extends AbstractTestDatasetWithTextIn
" a ja:MemoryModel ;",
".",
"",
- ":indexLucene",
+ ":indexLucene",
" a text:TextIndexLucene ;",
- " text:directory <file:" + INDEX_PATH + "> ;",
- " text:entityMap :entMap ;",
- " .",
+ " text:directory <file:" + INDEX_PATH + "> ;",
+ " text:entityMap :entMap ;",
+ " .",
"",
- ":entMap",
+ ":entMap",
" a text:EntityMap ;",
- " text:entityField \"uri\" ;",
- " text:defaultField \"label\" ;",
- " text:map (",
- " [ text:field \"label\" ; ",
- " text:predicate rdfs:label ;",
- " text:analyzer [ a text:SimpleAnalyzer ]",
- " ]",
- " [ text:field \"comment\" ; text:predicate rdfs:comment ]",
- " ) ."
- );
- }
-
- public void init() {
- Reader reader = new StringReader(SPEC);
- Model specModel = ModelFactory.createDefaultModel();
- specModel.read(reader, "", "TURTLE");
- TextAssembler.init();
-// deleteOldFiles();
- indexDir.mkdirs();
- Resource root = specModel.getResource(SPEC_ROOT_URI);
- dataset = (Dataset) Assembler.general.open(root);
- }
-
-
- public void deleteOldFiles() {
- dataset.close();
- if (indexDir.exists()) TextSearchUtil.emptyAndDeleteDirectory(indexDir);
- }
+ " text:entityField \"uri\" ;",
+ " text:defaultField \"label\" ;",
+ " text:map (",
+ " [ text:field \"label\" ; ",
+ " text:predicate rdfs:label ;",
+ " text:analyzer [ a text:SimpleAnalyzer ]",
+ " ]",
+ " [ text:field \"comment\" ; text:predicate rdfs:comment ]",
+ " ) ."
+ );
+ }
+
+ public void init() {
+ Reader reader = new StringReader(SPEC);
+ Model specModel = ModelFactory.createDefaultModel();
+ specModel.read(reader, "", "TURTLE");
+ TextAssembler.init();
+// deleteOldFiles();
+ indexDir.mkdirs();
+ Resource root = specModel.getResource(SPEC_ROOT_URI);
+ dataset = (Dataset) Assembler.general.open(root);
+ }
+
+
+ public void deleteOldFiles() {
+ dataset.close();
+ if (indexDir.exists()) TextSearchUtil.emptyAndDeleteDirectory(indexDir);
+ }
- @Before
- public void beforeClass() {
- init();
- }
-
- @After
- public void afterClass() {
- deleteOldFiles();
- }
-
- @Test
- public void testSimpleAnalyzer() {
- final String turtle = StrUtils.strjoinNL(
- TURTLE_PROLOG,
- "<" + RESOURCE_BASE + "testSimpleAnalyzer>",
- " rdfs:label 'bar the barfoo foo'",
- "."
- );
- // the simple analyzer should not filter out the 'the' word
- String queryString = StrUtils.strjoinNL(
- QUERY_PROLOG,
- "SELECT ?s",
- "WHERE {",
- " ?s text:query ( rdfs:label 'the' 10 ) .",
- "}"
- );
- Set<String> expectedURIs = new HashSet<>() ;
- expectedURIs.addAll( Arrays.asList("http://example.org/data/resource/testSimpleAnalyzer")) ;
- doTestSearch(turtle, queryString, expectedURIs);
- }
+ @Before
+ public void beforeClass() {
+ init();
+ }
+
+ @After
+ public void afterClass() {
+ deleteOldFiles();
+ }
+
+ @Test
+ public void testSimpleAnalyzer() {
+ final String turtle = StrUtils.strjoinNL(
+ TURTLE_PROLOG,
+ "<" + RESOURCE_BASE + "testSimpleAnalyzer>",
+ " rdfs:label 'bar the barfoo foo'",
+ "."
+ );
+ // the simple analyzer should not filter out the 'the' word
+ String queryString = StrUtils.strjoinNL(
+ QUERY_PROLOG,
+ "SELECT ?s",
+ "WHERE {",
+ " ?s text:query ( rdfs:label 'the' 10 ) .",
+ "}"
+ );
+ Set<String> expectedURIs = new HashSet<>() ;
+ expectedURIs.addAll( Arrays.asList("http://example.org/data/resource/testSimpleAnalyzer")) ;
+ doTestSearch(turtle, queryString, expectedURIs);
+ }
}
http://git-wip-us.apache.org/repos/asf/jena/blob/807dc362/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithStandardAnalyzer.java
----------------------------------------------------------------------
diff --git a/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithStandardAnalyzer.java b/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithStandardAnalyzer.java
index d873171..2bb4168 100644
--- a/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithStandardAnalyzer.java
+++ b/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithStandardAnalyzer.java
@@ -41,31 +41,31 @@ import com.hp.hpl.jena.rdf.model.Resource ;
* This class defines a setup configuration for a dataset that uses a standard analyzer with a Lucene index.
*/
public class TestDatasetWithStandardAnalyzer extends AbstractTestDatasetWithTextIndexBase {
- private static final String INDEX_PATH = "target/test/TestDatasetWithLuceneIndex";
- private static final File indexDir = new File(INDEX_PATH);
-
- private static final String SPEC_BASE = "http://example.org/spec#";
- private static final String SPEC_ROOT_LOCAL = "lucene_text_dataset";
- private static final String SPEC_ROOT_URI = SPEC_BASE + SPEC_ROOT_LOCAL;
- private static final String SPEC;
- static {
- SPEC = StrUtils.strjoinNL(
- "prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> ",
- "prefix ja: <http://jena.hpl.hp.com/2005/11/Assembler#> ",
- "prefix tdb: <http://jena.hpl.hp.com/2008/tdb#>",
- "prefix text: <http://jena.apache.org/text#>",
- "prefix : <" + SPEC_BASE + ">",
- "",
- "[] ja:loadClass \"org.apache.jena.query.text.TextQuery\" .",
- "text:TextDataset rdfs:subClassOf ja:RDFDataset .",
- "text:TextIndexLucene rdfs:subClassOf text:TextIndex .",
-
- ":" + SPEC_ROOT_LOCAL,
- " a text:TextDataset ;",
- " text:dataset :dataset ;",
- " text:index :indexLucene ;",
- " .",
- "",
+ private static final String INDEX_PATH = "target/test/TestDatasetWithLuceneIndex";
+ private static final File indexDir = new File(INDEX_PATH);
+
+ private static final String SPEC_BASE = "http://example.org/spec#";
+ private static final String SPEC_ROOT_LOCAL = "lucene_text_dataset";
+ private static final String SPEC_ROOT_URI = SPEC_BASE + SPEC_ROOT_LOCAL;
+ private static final String SPEC;
+ static {
+ SPEC = StrUtils.strjoinNL(
+ "prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> ",
+ "prefix ja: <http://jena.hpl.hp.com/2005/11/Assembler#> ",
+ "prefix tdb: <http://jena.hpl.hp.com/2008/tdb#>",
+ "prefix text: <http://jena.apache.org/text#>",
+ "prefix : <" + SPEC_BASE + ">",
+ "",
+ "[] ja:loadClass \"org.apache.jena.query.text.TextQuery\" .",
+ "text:TextDataset rdfs:subClassOf ja:RDFDataset .",
+ "text:TextIndexLucene rdfs:subClassOf text:TextIndex .",
+
+ ":" + SPEC_ROOT_LOCAL,
+ " a text:TextDataset ;",
+ " text:dataset :dataset ;",
+ " text:index :indexLucene ;",
+ " .",
+ "",
":dataset",
" a ja:RDFDataset ;",
" ja:defaultGraph :graph ;",
@@ -74,91 +74,91 @@ public class TestDatasetWithStandardAnalyzer extends AbstractTestDatasetWithText
" a ja:MemoryModel ;",
".",
"",
- ":indexLucene",
+ ":indexLucene",
" a text:TextIndexLucene ;",
- " text:directory <file:" + INDEX_PATH + "> ;",
- " text:entityMap :entMap ;",
- " .",
+ " text:directory <file:" + INDEX_PATH + "> ;",
+ " text:entityMap :entMap ;",
+ " .",
"",
- ":entMap",
+ ":entMap",
" a text:EntityMap ;",
- " text:entityField \"uri\" ;",
- " text:defaultField \"label\" ;",
- " text:map (",
- " [ text:field \"label\" ; ",
- " text:predicate rdfs:label ;",
- " text:analyzer [ a text:StandardAnalyzer ; text:stopWords ( 'foo' 'bar' ) ]",
- " ]",
- " [ text:field \"comment\" ; text:predicate rdfs:comment ]",
- " ) ."
- );
- }
-
- public void init() {
- Reader reader = new StringReader(SPEC);
- Model specModel = ModelFactory.createDefaultModel();
- specModel.read(reader, "", "TURTLE");
- TextAssembler.init();
-// deleteOldFiles();
- indexDir.mkdirs();
- Resource root = specModel.getResource(SPEC_ROOT_URI);
- dataset = (Dataset) Assembler.general.open(root);
- }
-
-
- public void deleteOldFiles() {
- dataset.close();
- if (indexDir.exists()) TextSearchUtil.emptyAndDeleteDirectory(indexDir);
- }
+ " text:entityField \"uri\" ;",
+ " text:defaultField \"label\" ;",
+ " text:map (",
+ " [ text:field \"label\" ; ",
+ " text:predicate rdfs:label ;",
+ " text:analyzer [ a text:StandardAnalyzer ; text:stopWords ( 'foo' 'bar' ) ]",
+ " ]",
+ " [ text:field \"comment\" ; text:predicate rdfs:comment ]",
+ " ) ."
+ );
+ }
+
+ public void init() {
+ Reader reader = new StringReader(SPEC);
+ Model specModel = ModelFactory.createDefaultModel();
+ specModel.read(reader, "", "TURTLE");
+ TextAssembler.init();
+// deleteOldFiles();
+ indexDir.mkdirs();
+ Resource root = specModel.getResource(SPEC_ROOT_URI);
+ dataset = (Dataset) Assembler.general.open(root);
+ }
+
+
+ public void deleteOldFiles() {
+ dataset.close();
+ if (indexDir.exists()) TextSearchUtil.emptyAndDeleteDirectory(indexDir);
+ }
- @Before
- public void beforeClass() {
- init();
- }
-
- @After
- public void afterClass() {
- deleteOldFiles();
- }
-
- @Test
- public void testStandardAnalyzerWithSpecifiedStopWords() {
- final String turtle = StrUtils.strjoinNL(
- TURTLE_PROLOG,
- "<" + RESOURCE_BASE + "testOneSimpleResult>",
- " rdfs:label 'bar the barfoo foo'",
- "."
- );
- // the standard analyzer not to have 'the' as a stop word
- String queryString = StrUtils.strjoinNL(
- QUERY_PROLOG,
- "SELECT ?s",
- "WHERE {",
- " ?s text:query ( rdfs:label 'the' 10 ) .",
- "}"
- );
- Set<String> expectedURIs = new HashSet<>() ;
- expectedURIs.addAll( Arrays.asList("http://example.org/data/resource/testOneSimpleResult")) ;
- doTestSearch(turtle, queryString, expectedURIs);
- }
-
- @Test
- public void testStandardAnalyzerIgnoresSpecifiedStopWords() {
- final String turtle = StrUtils.strjoinNL(
- TURTLE_PROLOG,
- "<" + RESOURCE_BASE + "testOneSimpleResult>",
- " rdfs:label 'bar the barfoo foo'",
- "."
- );
- // the standard analyzer not to have 'the' as a stop word
- String queryString = StrUtils.strjoinNL(
- QUERY_PROLOG,
- "SELECT ?s",
- "WHERE {",
- " ?s text:query ( rdfs:label 'foo' 10 ) .",
- "}"
- );
- Set<String> expectedURIs = new HashSet<>() ;
- doTestSearch(turtle, queryString, expectedURIs);
- }
+ @Before
+ public void beforeClass() {
+ init();
+ }
+
+ @After
+ public void afterClass() {
+ deleteOldFiles();
+ }
+
+ @Test
+ public void testStandardAnalyzerWithSpecifiedStopWords() {
+ final String turtle = StrUtils.strjoinNL(
+ TURTLE_PROLOG,
+ "<" + RESOURCE_BASE + "testOneSimpleResult>",
+ " rdfs:label 'bar the barfoo foo'",
+ "."
+ );
+ // the standard analyzer not to have 'the' as a stop word
+ String queryString = StrUtils.strjoinNL(
+ QUERY_PROLOG,
+ "SELECT ?s",
+ "WHERE {",
+ " ?s text:query ( rdfs:label 'the' 10 ) .",
+ "}"
+ );
+ Set<String> expectedURIs = new HashSet<>() ;
+ expectedURIs.addAll( Arrays.asList("http://example.org/data/resource/testOneSimpleResult")) ;
+ doTestSearch(turtle, queryString, expectedURIs);
+ }
+
+ @Test
+ public void testStandardAnalyzerIgnoresSpecifiedStopWords() {
+ final String turtle = StrUtils.strjoinNL(
+ TURTLE_PROLOG,
+ "<" + RESOURCE_BASE + "testOneSimpleResult>",
+ " rdfs:label 'bar the barfoo foo'",
+ "."
+ );
+ // the standard analyzer not to have 'the' as a stop word
+ String queryString = StrUtils.strjoinNL(
+ QUERY_PROLOG,
+ "SELECT ?s",
+ "WHERE {",
+ " ?s text:query ( rdfs:label 'foo' 10 ) .",
+ "}"
+ );
+ Set<String> expectedURIs = new HashSet<>() ;
+ doTestSearch(turtle, queryString, expectedURIs);
+ }
}
http://git-wip-us.apache.org/repos/asf/jena/blob/807dc362/jena-text/src/test/java/org/apache/jena/query/text/TextSearchUtil.java
----------------------------------------------------------------------
diff --git a/jena-text/src/test/java/org/apache/jena/query/text/TextSearchUtil.java b/jena-text/src/test/java/org/apache/jena/query/text/TextSearchUtil.java
index 71d9cd0..8f132f7 100644
--- a/jena-text/src/test/java/org/apache/jena/query/text/TextSearchUtil.java
+++ b/jena-text/src/test/java/org/apache/jena/query/text/TextSearchUtil.java
@@ -33,7 +33,7 @@ import org.apache.lucene.util.Version;
public class TextSearchUtil {
private static Version VER = TextIndexLucene.VER ;
private static final Analyzer analyzer = new StandardAnalyzer(VER);
-
+
public static void emptyAndDeleteDirectory(File dir) {
File[] contents = dir.listFiles() ;
if (contents != null) {
@@ -58,6 +58,6 @@ public class TextSearchUtil {
} catch (IOException ex) {
IO.exception(ex) ;
}
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/jena/blob/807dc362/jena-text/src/test/java/org/apache/jena/query/text/assembler/AbstractTestTextAssembler.java
----------------------------------------------------------------------
diff --git a/jena-text/src/test/java/org/apache/jena/query/text/assembler/AbstractTestTextAssembler.java b/jena-text/src/test/java/org/apache/jena/query/text/assembler/AbstractTestTextAssembler.java
index 2fde909..636e9cd 100644
--- a/jena-text/src/test/java/org/apache/jena/query/text/assembler/AbstractTestTextAssembler.java
+++ b/jena-text/src/test/java/org/apache/jena/query/text/assembler/AbstractTestTextAssembler.java
@@ -34,69 +34,69 @@ import com.hp.hpl.jena.vocabulary.RDFS ;
public abstract class AbstractTestTextAssembler {
- protected static final Model model = ModelFactory.createDefaultModel();
- private static final String TESTBASE = "http://example.org/abstractTestTextAssembler/";
- protected static final Resource SIMPLE_DATASET_SPEC;
- protected static final Resource SIMPLE_INDEX_SPEC;
- protected static final Resource SIMPLE_INDEX_SPEC2;
- protected static final Resource SIMPLE_INDEX_SPEC3;
- protected static final Resource SIMPLE_INDEX_SPEC4;
- protected static final Resource SIMPLE_INDEX_SPEC5;
- protected static final Resource SIMPLE_INDEX_SPEC_QUERY_ANALYZER;
- protected static final Resource SIMPLE_ENTITY_MAP_SPEC;
- protected static final Resource SIMPLE_INDEX_SPEC_LITERAL_DIR;
- protected static final Resource SIMPLE_INDEX_SPEC_MEM_DIR;
-
- static {
- SIMPLE_ENTITY_MAP_SPEC =
- model.createResource(TESTBASE + "simpleEntityMapSpec")
- .addProperty(RDF.type, TextVocab.entityMap)
- .addProperty(TextVocab.pEntityField, "entityField")
- .addProperty(TextVocab.pDefaultField, "defaultField")
- .addProperty(TextVocab.pMap,
- model.createList(
- new RDFNode[] {
- model.createResource()
- .addProperty(TextVocab.pField, "defaultField")
- .addProperty(TextVocab.pPredicate, RDFS.label)
- }))
- ;
- SIMPLE_DATASET_SPEC =
- model.createResource(TESTBASE + "simpleDatasetSpec")
- .addProperty(RDF.type, VocabTDB.tDatasetTDB)
- .addProperty(VocabTDB.pLocation, "target/test/testasm/DB");
-
- SIMPLE_INDEX_SPEC =
- model.createResource(TESTBASE + "simpleIndexSpec")
- .addProperty(RDF.type, TextVocab.textIndexLucene)
- .addProperty(TextVocab.pDirectory, model.createResource("file:target/test/testasm/simpleIndexSpec"))
- .addProperty(TextVocab.pEntityMap, SIMPLE_ENTITY_MAP_SPEC);
-
- SIMPLE_INDEX_SPEC2 =
+ protected static final Model model = ModelFactory.createDefaultModel();
+ private static final String TESTBASE = "http://example.org/abstractTestTextAssembler/";
+ protected static final Resource SIMPLE_DATASET_SPEC;
+ protected static final Resource SIMPLE_INDEX_SPEC;
+ protected static final Resource SIMPLE_INDEX_SPEC2;
+ protected static final Resource SIMPLE_INDEX_SPEC3;
+ protected static final Resource SIMPLE_INDEX_SPEC4;
+ protected static final Resource SIMPLE_INDEX_SPEC5;
+ protected static final Resource SIMPLE_INDEX_SPEC_QUERY_ANALYZER;
+ protected static final Resource SIMPLE_ENTITY_MAP_SPEC;
+ protected static final Resource SIMPLE_INDEX_SPEC_LITERAL_DIR;
+ protected static final Resource SIMPLE_INDEX_SPEC_MEM_DIR;
+
+ static {
+ SIMPLE_ENTITY_MAP_SPEC =
+ model.createResource(TESTBASE + "simpleEntityMapSpec")
+ .addProperty(RDF.type, TextVocab.entityMap)
+ .addProperty(TextVocab.pEntityField, "entityField")
+ .addProperty(TextVocab.pDefaultField, "defaultField")
+ .addProperty(TextVocab.pMap,
+ model.createList(
+ new RDFNode[] {
+ model.createResource()
+ .addProperty(TextVocab.pField, "defaultField")
+ .addProperty(TextVocab.pPredicate, RDFS.label)
+ }))
+ ;
+ SIMPLE_DATASET_SPEC =
+ model.createResource(TESTBASE + "simpleDatasetSpec")
+ .addProperty(RDF.type, VocabTDB.tDatasetTDB)
+ .addProperty(VocabTDB.pLocation, "target/test/testasm/DB");
+
+ SIMPLE_INDEX_SPEC =
+ model.createResource(TESTBASE + "simpleIndexSpec")
+ .addProperty(RDF.type, TextVocab.textIndexLucene)
+ .addProperty(TextVocab.pDirectory, model.createResource("file:target/test/testasm/simpleIndexSpec"))
+ .addProperty(TextVocab.pEntityMap, SIMPLE_ENTITY_MAP_SPEC);
+
+ SIMPLE_INDEX_SPEC2 =
model.createResource(TESTBASE + "simpleIndexSpec2")
.addProperty(RDF.type, TextVocab.textIndexLucene)
.addProperty(TextVocab.pDirectory, model.createResource("file:target/test/testasm/simpleIndexSpec2"))
.addProperty(TextVocab.pEntityMap, SIMPLE_ENTITY_MAP_SPEC);
-
- SIMPLE_INDEX_SPEC3 =
+
+ SIMPLE_INDEX_SPEC3 =
model.createResource(TESTBASE + "simpleIndexSpec3")
.addProperty(RDF.type, TextVocab.textIndexLucene)
.addProperty(TextVocab.pDirectory, model.createResource("file:target/test/testasm/simpleIndexSpec3"))
.addProperty(TextVocab.pEntityMap, SIMPLE_ENTITY_MAP_SPEC);
-
- SIMPLE_INDEX_SPEC4 =
+
+ SIMPLE_INDEX_SPEC4 =
model.createResource(TESTBASE + "simpleIndexSpec4")
.addProperty(RDF.type, TextVocab.textIndexLucene)
.addProperty(TextVocab.pDirectory, model.createResource("file:target/test/testasm/simpleIndexSpec4"))
.addProperty(TextVocab.pEntityMap, SIMPLE_ENTITY_MAP_SPEC);
-
- SIMPLE_INDEX_SPEC5 =
- model.createResource(TESTBASE + "simpleIndexSpec5")
- .addProperty(RDF.type, TextVocab.textIndexLucene)
- .addProperty(TextVocab.pDirectory, model.createResource("file:target/test/testasm/simpleIndexSpec5"))
- .addProperty(TextVocab.pEntityMap, SIMPLE_ENTITY_MAP_SPEC);
-
- SIMPLE_INDEX_SPEC_QUERY_ANALYZER =
+
+ SIMPLE_INDEX_SPEC5 =
+ model.createResource(TESTBASE + "simpleIndexSpec5")
+ .addProperty(RDF.type, TextVocab.textIndexLucene)
+ .addProperty(TextVocab.pDirectory, model.createResource("file:target/test/testasm/simpleIndexSpec5"))
+ .addProperty(TextVocab.pEntityMap, SIMPLE_ENTITY_MAP_SPEC);
+
+ SIMPLE_INDEX_SPEC_QUERY_ANALYZER =
model.createResource(TESTBASE + "simpleIndexSpecQueryAnalyzer")
.addProperty(RDF.type, TextVocab.textIndexLucene)
.addProperty(TextVocab.pDirectory, model.createResource("file:target/test/testasm/simpleIndexSpecQueryAnalyzer"))
@@ -105,41 +105,41 @@ public abstract class AbstractTestTextAssembler {
)
.addProperty(TextVocab.pEntityMap, SIMPLE_ENTITY_MAP_SPEC);
- SIMPLE_INDEX_SPEC_LITERAL_DIR =
- model.createResource(TESTBASE + "simpleIndexLiteralDirSpec")
- .addProperty(RDF.type, TextVocab.textIndexLucene)
- .addProperty(TextVocab.pDirectory, model.createLiteral("target/test/testasm/simpleIndexLiteralDir"))
- .addProperty(TextVocab.pEntityMap, SIMPLE_ENTITY_MAP_SPEC);
+ SIMPLE_INDEX_SPEC_LITERAL_DIR =
+ model.createResource(TESTBASE + "simpleIndexLiteralDirSpec")
+ .addProperty(RDF.type, TextVocab.textIndexLucene)
+ .addProperty(TextVocab.pDirectory, model.createLiteral("target/test/testasm/simpleIndexLiteralDir"))
+ .addProperty(TextVocab.pEntityMap, SIMPLE_ENTITY_MAP_SPEC);
- SIMPLE_INDEX_SPEC_MEM_DIR =
- model.createResource(TESTBASE + "simpleIndexMemDirSpec")
- .addProperty(RDF.type, TextVocab.textIndexLucene)
- .addProperty(TextVocab.pDirectory, model.createLiteral("mem"))
- .addProperty(TextVocab.pEntityMap, SIMPLE_ENTITY_MAP_SPEC);
- }
-
- protected void deleteFiles() {
- File indexDir;
- indexDir = new File("target/test/testasm/DB"); if (indexDir.exists()) TextSearchUtil.emptyAndDeleteDirectory(indexDir);
- indexDir = new File("target/test/testasm/simpleIndexSpec"); if (indexDir.exists()) TextSearchUtil.emptyAndDeleteDirectory(indexDir);
- indexDir = new File("target/test/testasm/simpleIndexSpec2"); if (indexDir.exists()) TextSearchUtil.emptyAndDeleteDirectory(indexDir);
- indexDir = new File("target/test/testasm/simpleIndexSpec3"); if (indexDir.exists()) TextSearchUtil.emptyAndDeleteDirectory(indexDir);
- indexDir = new File("target/test/testasm/simpleIndexSpec4"); if (indexDir.exists()) TextSearchUtil.emptyAndDeleteDirectory(indexDir);
- indexDir = new File("target/test/testasm/simpleIndexSpec5"); if (indexDir.exists()) TextSearchUtil.emptyAndDeleteDirectory(indexDir);
- indexDir = new File("target/test/testasm/simpleIndexSpecQueryAnalyzer"); if (indexDir.exists()) TextSearchUtil.emptyAndDeleteDirectory(indexDir);
- indexDir = new File("target/test/testasm/simpleIndexLiteralDir"); if (indexDir.exists()) TextSearchUtil.emptyAndDeleteDirectory(indexDir);
- }
-
- @Before
+ SIMPLE_INDEX_SPEC_MEM_DIR =
+ model.createResource(TESTBASE + "simpleIndexMemDirSpec")
+ .addProperty(RDF.type, TextVocab.textIndexLucene)
+ .addProperty(TextVocab.pDirectory, model.createLiteral("mem"))
+ .addProperty(TextVocab.pEntityMap, SIMPLE_ENTITY_MAP_SPEC);
+ }
+
+ protected void deleteFiles() {
+ File indexDir;
+ indexDir = new File("target/test/testasm/DB"); if (indexDir.exists()) TextSearchUtil.emptyAndDeleteDirectory(indexDir);
+ indexDir = new File("target/test/testasm/simpleIndexSpec"); if (indexDir.exists()) TextSearchUtil.emptyAndDeleteDirectory(indexDir);
+ indexDir = new File("target/test/testasm/simpleIndexSpec2"); if (indexDir.exists()) TextSearchUtil.emptyAndDeleteDirectory(indexDir);
+ indexDir = new File("target/test/testasm/simpleIndexSpec3"); if (indexDir.exists()) TextSearchUtil.emptyAndDeleteDirectory(indexDir);
+ indexDir = new File("target/test/testasm/simpleIndexSpec4"); if (indexDir.exists()) TextSearchUtil.emptyAndDeleteDirectory(indexDir);
+ indexDir = new File("target/test/testasm/simpleIndexSpec5"); if (indexDir.exists()) TextSearchUtil.emptyAndDeleteDirectory(indexDir);
+ indexDir = new File("target/test/testasm/simpleIndexSpecQueryAnalyzer"); if (indexDir.exists()) TextSearchUtil.emptyAndDeleteDirectory(indexDir);
+ indexDir = new File("target/test/testasm/simpleIndexLiteralDir"); if (indexDir.exists()) TextSearchUtil.emptyAndDeleteDirectory(indexDir);
+ }
+
+ @Before
public void before() {
deleteFiles();
TextSearchUtil.createEmptyIndex(new File("target/test/testasm/DB"));
}
-
- @After
+
+ @After
public void after() {
- deleteFiles();
+ deleteFiles();
}
}