Improved testing

Author: barthanssens

src/org/linkeddatafragments/datasource/JenaTDBDataSource.java

@@ -1,5 +1,6 @@
 package org.linkeddatafragments.datasource;
 
+import com.hp.hpl.jena.graph.Graph;
 import com.hp.hpl.jena.graph.GraphStatisticsHandler;
 import com.hp.hpl.jena.graph.Node;
 import com.hp.hpl.jena.query.Dataset;
@@ -8,7 +9,6 @@
 import com.hp.hpl.jena.query.QueryExecutionFactory;
 import com.hp.hpl.jena.query.QueryFactory;
 import com.hp.hpl.jena.query.QuerySolutionMap;
-import com.hp.hpl.jena.query.ReadWrite;
 import com.hp.hpl.jena.query.Syntax;
 import com.hp.hpl.jena.rdf.model.Model;
 import com.hp.hpl.jena.rdf.model.ModelFactory;
@@ -49,7 +49,6 @@ public TriplePatternFragment getFragment(Resource subject, Property predicate, R
 
         query.setOffset(offset);
         query.setLimit(limit);
-
 
         Model triples = ModelFactory.createDefaultModel();
 
@@ -65,6 +64,7 @@ public TriplePatternFragment getFragment(Resource subject, Property predicate, R
         long size = triples.size();
         long estimate = -1;
 
+       
         GraphStatisticsHandler stats = model.getGraph().getStatisticsHandler();
         if (stats != null) {
             Node s = (subject != null) ? subject.asNode() : null;

src/test/java/org/linkeddatafragments/datasource/JenaTDBDataSourceTest.java

@@ -8,7 +8,6 @@
 import com.google.gson.JsonObject;
 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.Property;
 import com.hp.hpl.jena.rdf.model.Resource;
 import com.hp.hpl.jena.tdb.TDBFactory;
@@ -32,6 +31,8 @@ public class JenaTDBDataSourceTest {
     private static Dataset dataset;
     private static File jena;
 
+    private final static String PREFIX = "http://test.ldf.org/";
+            
     @BeforeClass
     public static void setUpClass() throws Exception {
         String tmpdir = System.getProperty("java.io.tmpdir");
@@ -54,8 +55,13 @@ public static void setUpClass() throws Exception {
 
     @AfterClass
     public static void tearDownClass() throws Exception {
-        dataset.end();
         TDBFactory.release(dataset);
+        File[] files = jena.listFiles();
+        for (File f : files) {
+            f.delete();
+        }
+        jena.delete();
+ 
     }
 
     @Before
@@ -68,16 +74,16 @@ public void setUp() throws Exception {
         int objs = 17;
 
         for (int s = 0; s < subjs; s++) {
-            Resource subj = model.createResource("http://test.ldf.org/s/" + s);
+            Resource subj = model.createResource(PREFIX + "s/" + s);
             for (int p = 0; p < preds ; p++) {
-                Property pred = model.createProperty("http://test.ldf.org/p/" + p);
+                Property pred = model.createProperty(PREFIX + "p/" + p);
                 for (int o = 0; o < objs ; o++) {
-                    Resource obj = model.createResource("http://test.ldf.org/o/" + o);
+                    Resource obj = model.createResource(PREFIX + "o/" + o);
                     model.add(subj, pred, obj);
                 }
             }
         }
-        model.commit();
+        model.close();
     }
 
     /**
@@ -88,21 +94,21 @@ public void setUp() throws Exception {
     public void testEstimate() {
         Model model = dataset.getDefaultModel();
 
-        Resource subj = model.createResource("http://test.ldf.org/s/1");
+        Resource subj = model.createResource(PREFIX + "s/1");
         Property pred = null;
         Resource obj = null;
 
         long offset = 0;
         long limit = 50;
+        
         TriplePatternFragment fragment = 
                 tdb.getFragment(subj, pred, obj, offset, limit);
         long totalSize = fragment.getTotalSize();
-
-        Assert.assertTrue("Estimate is fake", totalSize != 51);        
+        
+        Assert.assertTrue("Estimate is fake: " + totalSize, totalSize != 51);        
     }
 
     @After
     public void tearDown() throws Exception {
     }
-    
 }