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 2013/06/25 20:28:14 UTC
svn commit: r1496572 - in /jena/trunk/jena-text/src:
main/java/org/apache/jena/query/text/ test/java/org/apache/jena/query/text/
Author: andy
Date: Tue Jun 25 18:28:13 2013
New Revision: 1496572
URL: http://svn.apache.org/r1496572
Log:
Tidy up
Removed:
jena/trunk/jena-text/src/test/java/org/apache/jena/query/text/EmbeddedSolr.java
Modified:
jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/EntityDefinition.java
jena/trunk/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithTextIndex.java
jena/trunk/jena-text/src/test/java/org/apache/jena/query/text/TS_Text.java
jena/trunk/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithEmbeddedSolrTextIndex.java
jena/trunk/jena-text/src/test/java/org/apache/jena/query/text/TextSearchUtil.java
Modified: jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/EntityDefinition.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/EntityDefinition.java?rev=1496572&r1=1496571&r2=1496572&view=diff
==============================================================================
--- jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/EntityDefinition.java (original)
+++ jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/EntityDefinition.java Tue Jun 25 18:28:13 2013
@@ -116,4 +116,10 @@ public class EntityDefinition {
return null ;
return collection.iterator().next() ;
}
+
+ @Override
+ public String toString() {
+ return entityField+":"+predicateToField ;
+
+ }
}
Modified: jena/trunk/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithTextIndex.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithTextIndex.java?rev=1496572&r1=1496571&r2=1496572&view=diff
==============================================================================
--- jena/trunk/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithTextIndex.java (original)
+++ jena/trunk/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithTextIndex.java Tue Jun 25 18:28:13 2013
@@ -59,14 +59,14 @@ public abstract class AbstractTestDatase
final String turtle = StrUtils.strjoinNL(
TURTLE_PROLOG,
"<" + RESOURCE_BASE + "testOneSimpleResult>",
- " rdfs:label \"bar testOneSimpleResult barfoo foo\"",
+ " rdfs:label 'bar testOneSimpleResult barfoo foo'",
"."
);
String queryString = StrUtils.strjoinNL(
QUERY_PROLOG,
"SELECT ?s",
"WHERE {",
- " ?s text:query ( rdfs:label \"testOneSimpleResult\" 10 ) .",
+ " ?s text:query ( rdfs:label 'testOneSimpleResult' 10 ) .",
"}"
);
Set<String> expectedURIs = (new HashSet<String>());
@@ -80,17 +80,17 @@ public abstract class AbstractTestDatase
final String turtle = StrUtils.strjoinNL(
TURTLE_PROLOG,
"<" + RESOURCE_BASE + label +"1>",
- " rdfs:label \"" + label + "1\"",
+ " rdfs:label '" + label + "1'",
".",
"<" + RESOURCE_BASE + label + "2>",
- " rdfs:label \"" + label + "2\"",
+ " rdfs:label '" + label + "2'",
"."
);
String queryString = StrUtils.strjoinNL(
QUERY_PROLOG,
"SELECT ?s",
"WHERE {",
- " ?s text:query ( rdfs:label \"" + label + "?\" 10 ) .",
+ " ?s text:query ( rdfs:label '" + label + "?' 10 ) .",
"}"
);
Set<String> expectedURIs = (new HashSet<String>());
@@ -110,26 +110,26 @@ public abstract class AbstractTestDatase
final String turtle = StrUtils.strjoinNL(
TURTLE_PROLOG,
"<" + RESOURCE_BASE + label +"1>",
- " rdfs:label \"" + label + "a\" ; ",
- " rdfs:comment \"" + label2 + "a\" ;",
+ " rdfs:label '" + label + "a' ; ",
+ " rdfs:comment '" + label2 + "a' ;",
".",
"<" + RESOURCE_BASE + label + "2>",
- " rdfs:label \"" + label2 + "b\" ; ",
- " rdfs:comment \"" + label + "b\" ; ",
+ " rdfs:label '" + label2 + "b' ; ",
+ " rdfs:comment '" + label + "b' ; ",
"."
);
String queryStringLabel = StrUtils.strjoinNL(
QUERY_PROLOG,
"SELECT ?s",
"WHERE {",
- " ?s text:query ( rdfs:label \"" + label + "?\" 10 ) .",
+ " ?s text:query ( rdfs:label '" + label + "?' 10 ) .",
"}"
);
String queryStringComment = StrUtils.strjoinNL(
QUERY_PROLOG,
"SELECT ?s",
"WHERE {",
- " ?s text:query ( rdfs:comment \"" + label + "?\" 10 ) .",
+ " ?s text:query ( rdfs:comment '" + label + "?' 10 ) .",
"}"
);
Set<String> expectedURIsLabel = (new HashSet<String>());
@@ -155,19 +155,19 @@ public abstract class AbstractTestDatase
final String turtle = StrUtils.strjoinNL(
TURTLE_PROLOG,
"<" + RESOURCE_BASE + label +"1>",
- " rdfs:label \"" + label + "1\" ; ",
- " rdfs:comment \"" + label2 + "1\" ;",
+ " rdfs:label '" + label + "1' ; ",
+ " rdfs:comment '" + label2 + "1' ;",
".",
"<" + RESOURCE_BASE + label + "2>",
- " rdfs:label \"" + label2 + "2\" ; ",
- " rdfs:comment \"" + 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 ) .",
+ " ?s text:query ( rdfs:label '" + label + "?' 10 ) .",
"}"
);
Set<String> expectedURIs = (new HashSet<String>());
@@ -185,23 +185,23 @@ public abstract class AbstractTestDatase
final String turtle = StrUtils.strjoinNL(
TURTLE_PROLOG,
"<" + RESOURCE_BASE + label + "1>",
- " rdfs:label \"" + label + "\" ;",
+ " rdfs:label '" + label + "' ;",
".",
"<" + RESOURCE_BASE + label + "2>",
- " rdfs:label \"" + label + "\" ;",
+ " rdfs:label '" + label + "' ;",
".",
"<" + RESOURCE_BASE + label + "3>",
- " rdfs:label \"" + label + "\" ;",
+ " rdfs:label '" + label + "' ;",
".",
"<" + RESOURCE_BASE + label + "4>",
- " rdfs:label \"" + label + "\" ;",
+ " rdfs:label '" + label + "' ;",
"."
);
String queryString = StrUtils.strjoinNL(
QUERY_PROLOG,
"SELECT ?s",
"WHERE {",
- " ?s text:query ( \"" + label + "\" 3 ) .",
+ " ?s text:query ( '" + label + "' 3 ) .",
"}"
);
Set<String> expectedURIs = (new HashSet<String>());
@@ -240,6 +240,15 @@ public abstract class AbstractTestDatase
try {
dataset.begin(ReadWrite.READ);
ResultSet results = qexec.execSelect() ;
+
+ boolean b = ( (expectedNumResults > 0) == results.hasNext() ) ;
+ if ( !b ) {
+ System.out.println(queryString) ;
+ System.out.println(expectedNumResults) ;
+
+ }
+
+
assertEquals(label, expectedNumResults > 0, results.hasNext());
int count;
for (count=0; results.hasNext(); count++) {
Modified: jena/trunk/jena-text/src/test/java/org/apache/jena/query/text/TS_Text.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-text/src/test/java/org/apache/jena/query/text/TS_Text.java?rev=1496572&r1=1496571&r2=1496572&view=diff
==============================================================================
--- jena/trunk/jena-text/src/test/java/org/apache/jena/query/text/TS_Text.java (original)
+++ jena/trunk/jena-text/src/test/java/org/apache/jena/query/text/TS_Text.java Tue Jun 25 18:28:13 2013
@@ -30,7 +30,7 @@ import org.junit.runners.Suite.SuiteClas
@SuiteClasses({
TestBuildTextDataset.class
, TestDatasetWithLuceneTextIndex.class
- // Embedded solr only used for testing
+ // Embedded solr not supported
//, TestDatasetWithEmbeddedSolrTextIndex.class
, TestSearchBeforeWriteOnDatasetWithLuceneTextIndex.class
, TestEntityMapAssembler.class
Modified: jena/trunk/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithEmbeddedSolrTextIndex.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithEmbeddedSolrTextIndex.java?rev=1496572&r1=1496571&r2=1496572&view=diff
==============================================================================
--- jena/trunk/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithEmbeddedSolrTextIndex.java (original)
+++ jena/trunk/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithEmbeddedSolrTextIndex.java Tue Jun 25 18:28:13 2013
@@ -18,138 +18,35 @@
package org.apache.jena.query.text;
-import java.io.IOException ;
-import java.io.Reader ;
-import java.io.StringReader ;
-
-import org.apache.jena.atlas.lib.StrUtils ;
-import org.apache.jena.query.text.assembler.TextAssembler ;
-import org.apache.solr.client.solrj.SolrServer ;
-import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer ;
-import org.apache.solr.core.CoreContainer ;
+import java.io.File ;
+
import org.junit.AfterClass ;
import org.junit.BeforeClass ;
-import org.junit.Test ;
-
-import com.hp.hpl.jena.assembler.Assembler ;
-import com.hp.hpl.jena.query.Dataset ;
-import com.hp.hpl.jena.rdf.model.Model ;
-import com.hp.hpl.jena.rdf.model.ModelFactory ;
-import com.hp.hpl.jena.rdf.model.Resource ;
public class TestDatasetWithEmbeddedSolrTextIndex extends AbstractTestDatasetWithTextIndex {
-
- private static final String SPEC_BASE = "http://example.org/spec#";
- private static final String SPEC_ROOT_LOCAL = "solr_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 :indexEmbeddedSolr ;",
- " .",
- "",
- ":dataset",
- " a ja:RDFDataset ;",
- " ja:defaultGraph :graph ;",
- ".",
- ":graph",
- " a ja:MemoryModel ;",
- ".",
- "",
- ":indexEmbeddedSolr",
- // This is replaced during setup by an embedded Solr instance.
- // <embedded:...> ends up with a huge dependency.
- " a text:TextIndexLucene ;",
- " text:directory <file:" + EmbeddedSolr.INDEX_PATH + "> ;",
- " text:entityMap :entMap ;",
-
-// " a text:TextIndexSolr ;",
-// " text:server <embedded:SolrARQ> ;",
-// " text:entityMap :entMap ;",
- " .",
- "",
- ":entMap",
- " a text:EntityMap ;",
- " text:entityField \"uri\" ;",
- " text:defaultField \"label\" ;",
- " text:map (",
- " [ text:field \"label\" ; text:predicate rdfs:label ]",
- " [ text:field \"comment\" ; text:predicate rdfs:comment ]",
- " ) ."
- );
- }
-
-
-
- @BeforeClass public static void beforeClass() throws IOException {
- deleteOldFiles();
- EmbeddedSolr.INDEX_DIR.mkdirs();
- TextSearchUtil.createEmptyIndex(EmbeddedSolr.INDEX_DIR);
- Reader reader = new StringReader(SPEC);
- Model specModel = ModelFactory.createDefaultModel();
- specModel.read(reader, "", "TURTLE");
- TextAssembler.init();
- Resource root = specModel.getResource(SPEC_ROOT_URI);
- dataset = (Dataset) Assembler.general.open(root);
- // Now replace the text indexc with embedded solr
- TextIndex index = (TextIndex) dataset.getContext().get(TextQuery.textIndex) ;
- EntityDefinition docDef = index.getDocDef() ;
-
- String coreName = "SolrARQ" ;
- CoreContainer.Initializer initializer = new CoreContainer.Initializer();
- CoreContainer coreContainer = initializer.initialize();
- SolrServer server = new EmbeddedSolrServer(coreContainer, coreName);
+
+ 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" ;
- TextIndex textIndexSolrEmbedded = TextDatasetFactory.createSolrIndex(server, docDef) ;
- dataset.getContext().set(TextQuery.textIndex, textIndexSolrEmbedded) ;
+ @BeforeClass public static void beforeClass() {
+ deleteOldFiles();
+ INDEX_DIR.mkdirs();
+ TextQuery.init() ;
+ TextSearchUtil.createEmptyIndex(INDEX_DIR);
+ dataset = TextDatasetFactory.create(TEST_ASSEM) ;
}
-
+
@AfterClass public static void afterClass() {
TextIndexSolr index = (TextIndexSolr) dataset.getContext().get(TextQuery.textIndex) ;
index.getServer().shutdown();
deleteOldFiles();
}
- @Override
- @Test public void testOneSimpleResult() {
- super.testOneSimpleResult();
- }
-
- @Override
- @Test public void testMultipleResults() {
- super.testMultipleResults();
- }
-
- @Override
- @Test public void testSearchCorrectField() {
- super.testSearchCorrectField();
- }
-
- @Override
- @Test public void testSearchDefaultField() {
- super.testSearchDefaultField();
- }
-
- @Override
- @Test public void testSearchLimitsResults() {
- super.testSearchLimitsResults();
- }
-
public static void deleteOldFiles() {
- if (EmbeddedSolr.DATA_DIR.exists())
- TextSearchUtil.emptyAndDeleteDirectory(EmbeddedSolr.DATA_DIR);
+ if (DATA_DIR.exists())
+ TextSearchUtil.emptyAndDeleteDirectory(DATA_DIR);
}
}
Modified: jena/trunk/jena-text/src/test/java/org/apache/jena/query/text/TextSearchUtil.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-text/src/test/java/org/apache/jena/query/text/TextSearchUtil.java?rev=1496572&r1=1496571&r2=1496572&view=diff
==============================================================================
--- jena/trunk/jena-text/src/test/java/org/apache/jena/query/text/TextSearchUtil.java (original)
+++ jena/trunk/jena-text/src/test/java/org/apache/jena/query/text/TextSearchUtil.java Tue Jun 25 18:28:13 2013
@@ -21,6 +21,7 @@ package org.apache.jena.query.text;
import java.io.File;
import java.io.IOException;
+import org.apache.jena.atlas.io.IO ;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.index.IndexWriter;
@@ -33,25 +34,29 @@ public class TextSearchUtil {
private static Version VER = Version.LUCENE_41 ;
private static final Analyzer analyzer = new StandardAnalyzer(VER);
- public static void emptyAndDeleteDirectory(File dir) {
- File[] contents = dir.listFiles();
- if (contents != null) {
- for (File content : contents) {
- if (content.isDirectory()) {
- emptyAndDeleteDirectory(content) ;
- } else {
- content.delete();
- }
- }
- }
- dir.delete();
- }
+ public static void emptyAndDeleteDirectory(File dir) {
+ File[] contents = dir.listFiles() ;
+ if (contents != null) {
+ for (File content : contents) {
+ if (content.isDirectory()) {
+ emptyAndDeleteDirectory(content) ;
+ } else {
+ content.delete() ;
+ }
+ }
+ }
+ dir.delete() ;
+ }
- public static void createEmptyIndex(File indexDir) throws IOException {
- Directory directory = FSDirectory.open(indexDir);
- IndexWriterConfig wConfig = new IndexWriterConfig(VER, analyzer) ;
- IndexWriter indexWriter = new IndexWriter(directory, wConfig) ;
- indexWriter.close(); // force creation of the index files
+ public static void createEmptyIndex(File indexDir) {
+ try {
+ Directory directory = FSDirectory.open(indexDir) ;
+ IndexWriterConfig wConfig = new IndexWriterConfig(VER, analyzer) ;
+ IndexWriter indexWriter = new IndexWriter(directory, wConfig) ;
+ indexWriter.close() ; // force creation of the index files
+ } catch (IOException ex) {
+ IO.exception(ex) ;
+ }
}
}