http://git-wip-us.apache.org/repos/asf/jena/blob/2c0454c6/jena-permissions/src/test/java/org/apache/jena/permissions/graph/TDBGraphTest.java ---------------------------------------------------------------------- diff --git a/jena-permissions/src/test/java/org/apache/jena/permissions/graph/TDBGraphTest.java b/jena-permissions/src/test/java/org/apache/jena/permissions/graph/TDBGraphTest.java index 857784a..09488b9 100644 --- a/jena-permissions/src/test/java/org/apache/jena/permissions/graph/TDBGraphTest.java +++ b/jena-permissions/src/test/java/org/apache/jena/permissions/graph/TDBGraphTest.java @@ -17,7 +17,6 @@ */ package org.apache.jena.permissions.graph; -import java.io.File; import java.io.IOException; import org.apache.jena.graph.Graph; @@ -31,8 +30,6 @@ public class TDBGraphTest extends MemGraphTest { private DatasetGraph dsGraph; - private File f; - public TDBGraphTest(final MockSecurityEvaluator securityEvaluator) { super(securityEvaluator); }
http://git-wip-us.apache.org/repos/asf/jena/blob/2c0454c6/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredModelTest.java ---------------------------------------------------------------------- diff --git a/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredModelTest.java b/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredModelTest.java index d336038..b0e6be3 100644 --- a/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredModelTest.java +++ b/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredModelTest.java @@ -412,11 +412,11 @@ public class SecuredModelTest { final List<RDFNode> nodeList = new ArrayList<RDFNode>(); try { securedModel.createList(); - if (!securityEvaluator.evaluate(Action.Update)) { + if ( ! securityEvaluator.evaluate(CU)) { Assert.fail("Should have thrown UpdateDeniedException Exception"); } - } catch (final UpdateDeniedException e) { - if (securityEvaluator.evaluate(Action.Update)) { + } catch (final AccessDeniedException e) { + if (securityEvaluator.evaluate(CU)) { Assert.fail(String .format("Should not have thrown UpdateDeniedException Exception: %s - %s", e, e.getTriple())); http://git-wip-us.apache.org/repos/asf/jena/blob/2c0454c6/jena-permissions/src/test/java/org/apache/jena/permissions/query/DataSetTest.java ---------------------------------------------------------------------- diff --git a/jena-permissions/src/test/java/org/apache/jena/permissions/query/DataSetTest.java b/jena-permissions/src/test/java/org/apache/jena/permissions/query/DataSetTest.java index 12ed85b..1284365 100644 --- a/jena-permissions/src/test/java/org/apache/jena/permissions/query/DataSetTest.java +++ b/jena-permissions/src/test/java/org/apache/jena/permissions/query/DataSetTest.java @@ -56,11 +56,7 @@ public class DataSetTest { dsg.getContext().set(TDB.symUnionDefaultGraph, true); Dataset myDataset = DatasetFactory.create(dsg); - // DatasetGraph dsg = DatasetGraphFactory.createMem() ; - // - // Dataset myDataset = TDBFactory.createDataset(); baseModel = myDataset.getNamedModel("http://example.com/baseModel";); - // baseModel = myDataset.getDefaultModel(); baseModel = QueryEngineTest.populateModel(baseModel); dftModel = Factory.getInstance(eval, "http://example.com/securedModel";, @@ -68,9 +64,6 @@ public class DataSetTest { dataset = DatasetFactory.createMem(); dataset.setDefaultModel(dftModel); - - // // dataset.addNamedModel( dftModel.getModelIRI(), dftModel); - } @Test @@ -92,7 +85,7 @@ public class DataSetTest { int count = 0; for (; results.hasNext();) { count++; - final QuerySolution soln = results.nextSolution(); + results.nextSolution(); } Assert.assertEquals(8, count); } finally { @@ -170,8 +163,7 @@ public class DataSetTest { int count = 0; for (; results.hasNext();) { count++; - final QuerySolution soln = results.nextSolution(); - // System.out.println( soln ); + results.nextSolution(); } // 2x 3 values + type triple Assert.assertEquals(8, count); @@ -186,8 +178,7 @@ public class DataSetTest { int count = 0; for (; results.hasNext();) { count++; - final QuerySolution soln = results.nextSolution(); - // System.out.println( soln ); + results.nextSolution(); } // 2x 3 values + type triple // all are in the base graph so no named graphs http://git-wip-us.apache.org/repos/asf/jena/blob/2c0454c6/jena-permissions/src/test/java/org/apache/jena/permissions/query/QueryEngineTest.java ---------------------------------------------------------------------- diff --git a/jena-permissions/src/test/java/org/apache/jena/permissions/query/QueryEngineTest.java b/jena-permissions/src/test/java/org/apache/jena/permissions/query/QueryEngineTest.java index daeff21..12e13f3 100644 --- a/jena-permissions/src/test/java/org/apache/jena/permissions/query/QueryEngineTest.java +++ b/jena-permissions/src/test/java/org/apache/jena/permissions/query/QueryEngineTest.java @@ -26,7 +26,6 @@ import org.apache.jena.graph.Node; import org.apache.jena.graph.Triple; import org.apache.jena.query.QueryExecution; import org.apache.jena.query.QueryExecutionFactory; -import org.apache.jena.query.QuerySolution; import org.apache.jena.query.ResultSet; import org.apache.jena.rdf.model.Model; import org.apache.jena.rdf.model.ModelFactory; @@ -130,7 +129,7 @@ public class QueryEngineTest { int count = 0; for (; results.hasNext();) { count++; - final QuerySolution soln = results.nextSolution(); + results.nextSolution(); } Assert.assertEquals(8, count); } finally { @@ -208,8 +207,7 @@ public class QueryEngineTest { int count = 0; for (; results.hasNext();) { count++; - final QuerySolution soln = results.nextSolution(); - // System.out.println( soln ); + results.nextSolution(); } // 2x 3 values + type triple Assert.assertEquals(8, count); @@ -224,8 +222,7 @@ public class QueryEngineTest { int count = 0; for (; results.hasNext();) { count++; - final QuerySolution soln = results.nextSolution(); - // System.out.println( soln ); + results.nextSolution(); } // 2x 3 values + type triple // no named graphs so no results.
