Skip to content

Commit 4fc9451

Browse files
jbarrasajbarrasa
authored
Merge pull request #280 from lqst/test_speedup
Let's make unit tests run faster
2 parents 7bdd301 + 720623a commit 4fc9451

File tree

14 files changed

+908
-1367
lines changed

14 files changed

+908
-1367
lines changed

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# neosemantics (n10s)
22
![n10s Logo](https://guides.neo4j.com/rdf/n10s.png) neosemantics is a plugin that enables the **use of RDF in Neo4j**. [RDF is a W3C standard model](https://www.w3.org/RDF/) for data interchange. Some key features of n10s are:
33

4+
45
* **Store RDF data in Neo4j** in a
56
lossless manner (imported RDF can subsequently be exported without losing a single triple in the process).
67
* On-demand **export property graph data** from Neo4j *as RDF*.

‎src/test/java/n10s/ModelTestUtils.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ public static boolean compareModels(String expected, RDFFormat formatExpected, S
1818

1919
Model expectedModel = createModel(expected, formatExpected);
2020
Model actualModel = createModel(actual, formatActual);
21-
2221
return Models.isomorphic(expectedModel, actualModel);
2322
}
2423

‎src/test/java/n10s/RDFExportTest.java‎

Lines changed: 147 additions & 233 deletions
Large diffs are not rendered by default.

‎src/test/java/n10s/RDFProceduresTest.java‎

Lines changed: 147 additions & 260 deletions
Large diffs are not rendered by default.

‎src/test/java/n10s/aggregate/CollectTriplesTest.java‎

Lines changed: 68 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
import n10s.rdf.load.RDFLoadProcedures;
1111
import n10s.rdf.stream.RDFStreamProcedures;
1212
import org.eclipse.rdf4j.rio.RDFFormat;
13-
import org.junit.Rule;
14-
import org.junit.Test;
13+
import org.junit.*;
1514
import org.neo4j.driver.*;
15+
import org.neo4j.driver.exceptions.DatabaseException;
1616
import org.neo4j.graphdb.GraphDatabaseService;
1717
import org.neo4j.harness.junit.rule.Neo4jRule;
1818

@@ -63,106 +63,99 @@ public class CollectTriplesTest {
6363
" skos:prefLabel \"Business Administration and Finance Theory\" ;\n" +
6464
" a <http://permid.org/ontology/person/Major> .";
6565

66-
@Rule
67-
public Neo4jRule neo4j = new Neo4jRule()
66+
public static Driver driver;
67+
68+
@ClassRule
69+
public static Neo4jRule neo4j = new Neo4jRule()
6870
.withProcedure(RDFStreamProcedures.class)
6971
.withProcedure(RDFLoadProcedures.class)
7072
.withProcedure(GraphConfigProcedures.class)
7173
.withProcedure(RDFExportProcedures.class)
7274
.withProcedure(NsPrefixDefProcedures.class)
7375
.withAggregationFunction(CollectTriples.class);
7476

75-
@Test
76-
public void testCollectTriplesBasic() throws Exception {
77-
try (Driver driver = GraphDatabase.driver(neo4j.boltURI(),
78-
Config.builder().withoutEncryption().build())) {
79-
80-
Session session = driver.session();
81-
Result results = session.run("CALL n10s.rdf.stream.inline('"+ TURTLE_FRAGMENT +"', 'Turtle') " +
82-
" yield subject, predicate, object, isLiteral, literalType, literalLang "
83-
+ " return n10s.rdf.collect(subject, predicate, object, isLiteral, literalType, literalLang) as rdf");
84-
assertEquals(true, results.hasNext());
85-
assertTrue(ModelTestUtils
86-
.compareModels(results.next().get("rdf").asString(),
87-
RDFFormat.NTRIPLES,TURTLE_FRAGMENT,RDFFormat.TURTLE));
88-
77+
@BeforeClass
78+
public static void init() {
79+
driver = GraphDatabase.driver(neo4j.boltURI(),
80+
Config.builder().withoutEncryption().build());
81+
}
8982

83+
@Before
84+
public void cleanDatabase() {
85+
driver.session().run("match (n) detach delete n").consume();
86+
driver.session().run("drop constraint n10s_unique_uri if exists").consume();
87+
}
9088

91-
}
89+
@Test
90+
public void testCollectTriplesBasic() throws Exception {
91+
Session session = driver.session();
92+
Result results = session.run("CALL n10s.rdf.stream.inline('"+ TURTLE_FRAGMENT +"', 'Turtle') " +
93+
" yield subject, predicate, object, isLiteral, literalType, literalLang "
94+
+ " return n10s.rdf.collect(subject, predicate, object, isLiteral, literalType, literalLang) as rdf");
95+
assertEquals(true, results.hasNext());
96+
assertTrue(ModelTestUtils
97+
.compareModels(results.next().get("rdf").asString(),
98+
RDFFormat.NTRIPLES,TURTLE_FRAGMENT,RDFFormat.TURTLE));
9299
}
93100

94101
@Test
95102
public void testCollectTriplesPostFilter() throws Exception {
96-
try (Driver driver = GraphDatabase.driver(neo4j.boltURI(),
97-
Config.builder().withoutEncryption().build())) {
98-
99-
Session session = driver.session();
100-
Result results = session.run(
101-
"call n10s.rdf.stream.fetch('" + CollectTriplesTest.class.getClassLoader()
102-
.getResource("100k.nt")
103-
.toURI() + "',\"N-Triples\" ,{ limit: 999999}) yield subject, predicate, object\n" +
104-
"where predicate = \"http://www.w3.org/2004/02/skos/core#prefLabel\" and " +
105-
"object contains \"Business Administration and Finance\"\n" +
106-
"with collect(subject) as indivList \n" +
107-
"call n10s.rdf.stream.fetch('"+ CollectTriplesTest.class.getClassLoader()
108-
.getResource("100k.nt")
109-
.toURI() + "',\"N-Triples\" ,{ limit: 999999}) yield subject, predicate, object, isLiteral, literalType, literalLang\n" +
110-
"where subject in indivList\n" +
111-
"return n10s.rdf.collect(subject, predicate, object, isLiteral, literalType, literalLang) as rdf");
112-
assertEquals(true, results.hasNext());
113-
assertTrue(ModelTestUtils
114-
.compareModels(results.next().get("rdf").asString(),
115-
RDFFormat.NTRIPLES,TURTLE_FRAGMENT_2,RDFFormat.TURTLE));
116-
117-
118-
119-
}
103+
Session session = driver.session();
104+
Result results = session.run(
105+
"call n10s.rdf.stream.fetch('" + CollectTriplesTest.class.getClassLoader()
106+
.getResource("100k.nt")
107+
.toURI() + "',\"N-Triples\" ,{ limit: 999999}) yield subject, predicate, object\n" +
108+
"where predicate = \"http://www.w3.org/2004/02/skos/core#prefLabel\" and " +
109+
"object contains \"Business Administration and Finance\"\n" +
110+
"with collect(subject) as indivList \n" +
111+
"call n10s.rdf.stream.fetch('"+ CollectTriplesTest.class.getClassLoader()
112+
.getResource("100k.nt")
113+
.toURI() + "',\"N-Triples\" ,{ limit: 999999}) yield subject, predicate, object, isLiteral, literalType, literalLang\n" +
114+
"where subject in indivList\n" +
115+
"return n10s.rdf.collect(subject, predicate, object, isLiteral, literalType, literalLang) as rdf");
116+
assertEquals(true, results.hasNext());
117+
assertTrue(ModelTestUtils
118+
.compareModels(results.next().get("rdf").asString(),
119+
RDFFormat.NTRIPLES,TURTLE_FRAGMENT_2,RDFFormat.TURTLE));
120120
}
121121

122122
@Test
123123
public void testCollectTriplesDataTypes() throws Exception {
124-
try (Driver driver = GraphDatabase.driver(neo4j.boltURI(),
125-
Config.builder().withoutEncryption().build())) {
124+
Session session = driver.session();
125+
Result results = session.run("CALL n10s.rdf.stream.fetch('"+ CollectTriplesTest.class.getClassLoader()
126+
.getResource("datetime/datetime-and-other.ttl")
127+
.toURI() +"', 'Turtle') " +
128+
" yield subject, predicate, object, isLiteral, literalType, literalLang "
129+
+ " return n10s.rdf.collect(subject, predicate, object, isLiteral, literalType, literalLang) as rdf");
130+
assertEquals(true, results.hasNext());
126131

127-
Session session = driver.session();
128-
Result results = session.run("CALL n10s.rdf.stream.fetch('"+ CollectTriplesTest.class.getClassLoader()
129-
.getResource("datetime/datetime-and-other.ttl")
130-
.toURI() +"', 'Turtle') " +
131-
" yield subject, predicate, object, isLiteral, literalType, literalLang "
132-
+ " return n10s.rdf.collect(subject, predicate, object, isLiteral, literalType, literalLang) as rdf");
133-
assertEquals(true, results.hasNext());
134132

133+
String fileAsString = new String ( Files.readAllBytes( Paths.get(CollectTriplesTest.class.getClassLoader()
134+
.getResource("datetime/datetime-and-other.ttl").toURI()) ) );
135135

136-
String fileAsString = new String ( Files.readAllBytes( Paths.get(CollectTriplesTest.class.getClassLoader()
137-
.getResource("datetime/datetime-and-other.ttl").toURI()) ) );
138-
139-
assertTrue(ModelTestUtils
140-
.compareModels(results.next().get("rdf").asString(),
141-
RDFFormat.NTRIPLES, fileAsString,RDFFormat.TURTLE));
142-
}
143-
}
136+
assertTrue(ModelTestUtils
137+
.compareModels(results.next().get("rdf").asString(),
138+
RDFFormat.NTRIPLES, fileAsString,RDFFormat.TURTLE));
139+
}
144140

145141
@Test
146142
public void testCollectTriplesDataTypesTurtle() throws Exception {
147-
try (Driver driver = GraphDatabase.driver(neo4j.boltURI(),
148-
Config.builder().withoutEncryption().build())) {
143+
Session session = driver.session();
144+
Result results = session.run("CALL n10s.rdf.stream.fetch('"+ CollectTriplesTest.class.getClassLoader()
145+
.getResource("datetime/datetime-and-other.ttl")
146+
.toURI() +"', 'Turtle') " +
147+
" yield subject, predicate, object, isLiteral, literalType, literalLang "
148+
+ " return n10s.rdf.collect.ttl(subject, predicate, object, isLiteral, literalType, literalLang) as rdf");
149+
assertEquals(true, results.hasNext());
149150

150-
Session session = driver.session();
151-
Result results = session.run("CALL n10s.rdf.stream.fetch('"+ CollectTriplesTest.class.getClassLoader()
152-
.getResource("datetime/datetime-and-other.ttl")
153-
.toURI() +"', 'Turtle') " +
154-
" yield subject, predicate, object, isLiteral, literalType, literalLang "
155-
+ " return n10s.rdf.collect.ttl(subject, predicate, object, isLiteral, literalType, literalLang) as rdf");
156-
assertEquals(true, results.hasNext());
157151

152+
String fileAsString = new String ( Files.readAllBytes( Paths.get(CollectTriplesTest.class.getClassLoader()
153+
.getResource("datetime/datetime-and-other.ttl").toURI()) ) );
158154

159-
String fileAsString = new String ( Files.readAllBytes( Paths.get(CollectTriplesTest.class.getClassLoader()
160-
.getResource("datetime/datetime-and-other.ttl").toURI()) ) );
155+
assertTrue(ModelTestUtils
156+
.compareModels(results.next().get("rdf").asString(),
157+
RDFFormat.TURTLE, fileAsString,RDFFormat.TURTLE));
161158

162-
assertTrue(ModelTestUtils
163-
.compareModels(results.next().get("rdf").asString(),
164-
RDFFormat.TURTLE, fileAsString,RDFFormat.TURTLE));
165-
}
166159
}
167160

168161
@Test

0 commit comments

Comments
 (0)