This is an automated email from the ASF dual-hosted git repository.
hasan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/clerezza.git
The following commit(s) were added to refs/heads/master by this push:
new 813f5d0 CLEREZZA-1023: Use JUnit 5 in dataset
813f5d0 is described below
commit 813f5d0a79cf3538fbb20f2d340ee5bf9b0e15b7
Author: Hasan <[email protected]>
AuthorDate: Wed May 12 01:00:24 2021 +0200
CLEREZZA-1023: Use JUnit 5 in dataset
---
.../org/apache/clerezza/dataset/SecurityTest.java | 114 ++++++++++++++-------
.../org/apache/clerezza/dataset/TcManagerTest.java | 59 +++++++----
.../dataset/test/utils/TcProviderTest.java | 89 ++++++++--------
.../simple/storage/AccessViaTcManager.java | 10 +-
.../simple/storage/GenericTcProviderTest.java | 4 +-
5 files changed, 170 insertions(+), 106 deletions(-)
diff --git
a/dataset/src/test/java/org/apache/clerezza/dataset/SecurityTest.java
b/dataset/src/test/java/org/apache/clerezza/dataset/SecurityTest.java
index 1e0383d..0c93f8a 100644
--- a/dataset/src/test/java/org/apache/clerezza/dataset/SecurityTest.java
+++ b/dataset/src/test/java/org/apache/clerezza/dataset/SecurityTest.java
@@ -21,13 +21,16 @@ package org.apache.clerezza.dataset;
import org.apache.clerezza.Graph;
import org.apache.clerezza.IRI;
import org.apache.clerezza.Triple;
-import org.apache.clerezza.implementation.graph.ReadOnlyException;
-import org.apache.clerezza.implementation.literal.PlainLiteralImpl;
-import org.apache.clerezza.implementation.TripleImpl;
import org.apache.clerezza.dataset.providers.WeightedA;
import org.apache.clerezza.dataset.providers.WeightedDummy;
import org.apache.clerezza.dataset.security.TcPermission;
-import org.junit.*;
+import org.apache.clerezza.implementation.TripleImpl;
+import org.apache.clerezza.implementation.graph.ReadOnlyException;
+import org.apache.clerezza.implementation.literal.PlainLiteralImpl;
+import org.junit.jupiter.api.*;
+import org.junit.platform.runner.JUnitPlatform;
+import org.junit.runner.RunWith;
+import org.slf4j.Logger;
import java.io.FilePermission;
import java.lang.reflect.ReflectPermission;
@@ -35,16 +38,21 @@ import java.security.*;
import java.util.Collections;
import java.util.PropertyPermission;
+import static org.slf4j.LoggerFactory.getLogger;
+
/**
*
* @author reto
*/
+@RunWith(JUnitPlatform.class)
public class SecurityTest {
-
+
+ private static final Logger LOGGER = getLogger(SecurityTest.class);
+
public SecurityTest() {
}
- @BeforeClass
+ @BeforeAll
public static void setUpClass() throws Exception {
////needed to unbind because this is injected with META-INF/services -
file
TcManager.getInstance().unbindWeightedTcProvider(new WeightedA());
@@ -53,11 +61,11 @@ public class SecurityTest {
TcManager.getInstance().createGraph(new
IRI("http://example.org/read/ImmutableGraph";));
}
- @AfterClass
+ @AfterAll
public static void tearDownClass() throws Exception {
}
- @Before
+ @BeforeEach
public void setUp() {
Policy.setPolicy(new Policy() {
@@ -83,65 +91,90 @@ public class SecurityTest {
@Override
public void checkPermission(Permission perm) {
- //System.out.println("Checking "+perm);
+ LOGGER.debug("Checking {}", perm);
super.checkPermission(perm);
}
@Override
public void checkPermission(Permission perm, Object context) {
- //System.out.println("Checking "+perm);
+ LOGGER.debug("Checking {}", perm);
super.checkPermission(perm, context);
}
});
}
- @After
+ @AfterEach
public void tearDown() {
System.setSecurityManager(null);
}
- @Test(expected=NoSuchEntityException.class)
- public void testAcessGraph() {
- TcManager.getInstance().getImmutableGraph(new
IRI("http://example.org/permitted";));
+ @Test
+ public void testAcessGraph()
+ {
+ Assertions.assertThrows(
+ NoSuchEntityException.class,
+ () -> TcManager.getInstance().getImmutableGraph(new
IRI("http://example.org/permitted";))
+ );
}
-
- @Test(expected=AccessControlException.class)
+
+ @Test
public void testNoWildCard() {
- TcManager.getInstance().getImmutableGraph(new
IRI("http://example.org/permitted/subthing";));
+ Assertions.assertThrows(
+ AccessControlException.class,
+ () -> TcManager.getInstance().getImmutableGraph(
+ new IRI("http://example.org/permitted/subthing";)
+ )
+ );
}
- @Test(expected=NoSuchEntityException.class)
+ @Test
public void testAllowedArea() {
- TcManager.getInstance().getImmutableGraph(new
IRI("http://example.org/area/allowed/something";));
+ Assertions.assertThrows(
+ NoSuchEntityException.class,
+ () -> TcManager.getInstance().getImmutableGraph(
+ new IRI("http://example.org/area/allowed/something";)
+ )
+ );
}
- @Test(expected=AccessControlException.class)
+ @Test
public void testAcessForbiddenGraph() {
- TcManager.getInstance().getImmutableGraph(new
IRI("http://example.org/forbidden";));
+ Assertions.assertThrows(
+ AccessControlException.class,
+ () -> TcManager.getInstance().getImmutableGraph(new
IRI("http://example.org/forbidden";))
+ );
}
- @Test(expected=NoSuchEntityException.class)
+ @Test
public void testCustomPermissions() {
IRI graphUri = new IRI("http://example.org/custom";);
TcManager.getInstance().getTcAccessController().setRequiredReadPermissionStrings(graphUri,
Collections.singletonList("(java.io.FilePermission \"/etc\"
\"write\")"));
//new FilePermission("/etc", "write").toString()));
Graph ag = TcManager.getInstance().getGraph(new
IRI("urn:x-localinstance:/graph-access.graph"));
- System.out.print(ag.toString());
- TcManager.getInstance().getMGraph(graphUri);
+
+ LOGGER.info("Custom permissions graph: {}", ag);
+ Assertions.assertThrows(
+ NoSuchEntityException.class,
+ () -> TcManager.getInstance().getMGraph(graphUri)
+ );
}
- @Test(expected=AccessControlException.class)
+ @Test
public void testCustomPermissionsIncorrect() {
IRI graphUri = new IRI("http://example.org/custom";);
TcManager.getInstance().getTcAccessController().setRequiredReadPermissionStrings(graphUri,
Collections.singletonList("(java.io.FilePermission \"/etc\"
\"write\")"));
//new FilePermission("/etc", "write").toString()));
Graph ag = TcManager.getInstance().getGraph(new
IRI("urn:x-localinstance:/graph-access.graph"));
- System.out.print(ag.toString());
- TcManager.getInstance().createGraph(graphUri);
+
+ LOGGER.info("Incorrect custom permissions graph: {}", ag);
+ Assertions.assertThrows(
+ AccessControlException.class,
+ () -> TcManager.getInstance().createGraph(graphUri)
+ );
}
@Test
@@ -151,25 +184,36 @@ public class SecurityTest {
Collections.singletonList("(java.io.FilePermission \"/etc\"
\"write\")"));
//new FilePermission("/etc", "write").toString()));
Graph ag = TcManager.getInstance().getGraph(new
IRI("urn:x-localinstance:/graph-access.graph"));
- System.out.print(ag.toString());
+ LOGGER.info("Custom read/write permissions graph: {}", ag);
TcManager.getInstance().createGraph(graphUri);
}
- @Test(expected=EntityAlreadyExistsException.class)
+ @Test
public void testCreateMGraph() {
- TcManager.getInstance().createGraph(new
IRI("http://example.org/ImmutableGraph/alreadyexists";));
+ Assertions.assertThrows(
+ EntityAlreadyExistsException.class,
+ () -> TcManager.getInstance().createGraph(
+ new
IRI("http://example.org/ImmutableGraph/alreadyexists";)
+ )
+ );
}
- @Test(expected=AccessControlException.class)
+
+ @Test
public void testCreateMGraphWithoutWritePermission() {
- TcManager.getInstance().createGraph(new
IRI("http://example.org/read/ImmutableGraph";));
+ Assertions.assertThrows(
+ AccessControlException.class,
+ () -> TcManager.getInstance().createGraph(new
IRI("http://example.org/read/ImmutableGraph";))
+ );
}
- @Test(expected=ReadOnlyException.class)
+
+ @Test
public void testAddTripleToMGraph() {
Graph graph = TcManager.getInstance().getMGraph(new
IRI("http://example.org/read/ImmutableGraph";));
Triple triple = new TripleImpl(
new IRI("http://example.org/definition/isNonLiteral";),
new IRI("http://example.org/definition/isTest";),
new PlainLiteralImpl("test"));
- graph.add(triple);
+
+ Assertions.assertThrows(ReadOnlyException.class, () ->
graph.add(triple));
}
-}
\ No newline at end of file
+}
diff --git
a/dataset/src/test/java/org/apache/clerezza/dataset/TcManagerTest.java
b/dataset/src/test/java/org/apache/clerezza/dataset/TcManagerTest.java
index 99017aa..915041a 100644
--- a/dataset/src/test/java/org/apache/clerezza/dataset/TcManagerTest.java
+++ b/dataset/src/test/java/org/apache/clerezza/dataset/TcManagerTest.java
@@ -31,21 +31,23 @@ import
org.apache.clerezza.implementation.in_memory.SimpleGraph;
import org.apache.clerezza.sparql.NoQueryEngineException;
import org.apache.clerezza.sparql.QueryEngine;
import org.apache.clerezza.sparql.query.*;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.platform.runner.JUnitPlatform;
+import org.junit.runner.RunWith;
import org.mockito.Mockito;
import java.lang.reflect.Field;
import java.util.Iterator;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import static org.junit.jupiter.api.Assertions.*;
/**
*
* @author reto
*/
+@RunWith(JUnitPlatform.class)
public class TcManagerTest {
public static IRI uriRefAHeavy = new IRI("http://example.org/aHeavy";);
@@ -58,7 +60,7 @@ public class TcManagerTest {
private final WeightedA1 weightedA1 = new WeightedA1();
private WeightedTcProvider weightedBlight = new WeightedBlight();
- @Before
+ @BeforeEach
public void setUp() {
graphAccess = TcManager.getInstance();
graphAccess.bindWeightedTcProvider(weightedA);
@@ -68,7 +70,7 @@ public class TcManagerTest {
queryEngine = Mockito.mock(QueryEngine.class);
}
- @After
+ @AfterEach
public void tearDown() {
graphAccess = TcManager.getInstance();
graphAccess.unbindWeightedTcProvider(weightedA);
@@ -134,60 +136,73 @@ public class TcManagerTest {
graphAccess.unbindWeightedTcProvider(weightedAHeavy);
}
- @Test(expected = NoQueryEngineException.class)
+ @Test
public void executeSparqlQueryNoEngineWithString() throws Exception {
// Prepare
injectQueryEngine(null);
// Execute
- graphAccess.executeSparqlQuery("", new SimpleGraph());
+ assertThrows(NoQueryEngineException.class, () ->
graphAccess.executeSparqlQuery("", new SimpleGraph()));
}
- @Test(expected = NoQueryEngineException.class)
+ @Test
public void executeSparqlQueryNoEngineWithQuery() throws Exception {
// Prepare
injectQueryEngine(null);
// Execute
- graphAccess.executeSparqlQuery((Query) null, new SimpleGraph());
+ assertThrows(
+ NoQueryEngineException.class,
+ () -> graphAccess.executeSparqlQuery((Query)
null, new SimpleGraph())
+ );
}
- @Test(expected = NoQueryEngineException.class)
+ @Test
public void executeSparqlQueryNoEngineWithSelectQuery() throws
Exception {
// Prepare
injectQueryEngine(null);
// Execute
- graphAccess.executeSparqlQuery((SelectQuery) null, new
SimpleGraph());
+ assertThrows(
+ NoQueryEngineException.class,
+ () ->
graphAccess.executeSparqlQuery((SelectQuery) null, new SimpleGraph())
+ );
}
- @Test(expected = NoQueryEngineException.class)
+ @Test
public void executeSparqlQueryNoEngineWithAskQuery() throws Exception {
// Prepare
injectQueryEngine(null);
// Execute
- graphAccess.executeSparqlQuery((AskQuery) null, new
SimpleGraph());
+ assertThrows(
+ NoQueryEngineException.class,
+ () -> graphAccess.executeSparqlQuery((AskQuery)
null, new SimpleGraph())
+ );
}
- @Test(expected = NoQueryEngineException.class)
+ @Test
public void executeSparqlQueryNoEngineWithDescribeQuery() throws
Exception {
// Prepare
injectQueryEngine(null);
// Execute
- graphAccess
- .executeSparqlQuery((DescribeQuery) null, new
SimpleGraph());
+ assertThrows(
+ NoQueryEngineException.class,
+ () ->
graphAccess.executeSparqlQuery((DescribeQuery) null, new SimpleGraph())
+ );
}
- @Test(expected = NoQueryEngineException.class)
+ @Test
public void executeSparqlQueryNoEngineWithConstructQuery() throws
Exception {
// Prepare
injectQueryEngine(null);
// Execute
- graphAccess.executeSparqlQuery((ConstructQuery) null,
- new SimpleGraph());
+ assertThrows(
+ NoQueryEngineException.class,
+ () ->
graphAccess.executeSparqlQuery((ConstructQuery) null, new SimpleGraph())
+ );
}
@Test
@@ -297,4 +312,4 @@ public class TcManagerTest {
queryEngineField.setAccessible(true);
queryEngineField.set(graphAccess, engine);
}
-}
\ No newline at end of file
+}
diff --git
a/dataset/src/test/java/org/apache/clerezza/dataset/test/utils/TcProviderTest.java
b/dataset/src/test/java/org/apache/clerezza/dataset/test/utils/TcProviderTest.java
index 52f445e..9168037 100644
---
a/dataset/src/test/java/org/apache/clerezza/dataset/test/utils/TcProviderTest.java
+++
b/dataset/src/test/java/org/apache/clerezza/dataset/test/utils/TcProviderTest.java
@@ -19,13 +19,15 @@
package org.apache.clerezza.dataset.test.utils;
import org.apache.clerezza.*;
-import org.apache.clerezza.implementation.TripleImpl;
-import org.apache.clerezza.implementation.in_memory.SimpleGraph;
import org.apache.clerezza.dataset.EntityAlreadyExistsException;
import org.apache.clerezza.dataset.NoSuchEntityException;
import org.apache.clerezza.dataset.TcProvider;
-import org.junit.Assert;
-import org.junit.Test;
+import org.apache.clerezza.implementation.TripleImpl;
+import org.apache.clerezza.implementation.in_memory.SimpleGraph;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.platform.runner.JUnitPlatform;
+import org.junit.runner.RunWith;
import java.util.HashSet;
import java.util.Iterator;
@@ -35,6 +37,7 @@ import java.util.Set;
*
* @author mir,rbn
*/
+@RunWith(JUnitPlatform.class)
public abstract class TcProviderTest {
protected final IRI uriRefA = generateUri("a");
@@ -56,14 +59,14 @@ public abstract class TcProviderTest {
Iterator<Triple> iteratorInput = mGraph.iterator();
Iterator<Triple> iteratorCreated = createdGraph.iterator();
- Assert.assertEquals(iteratorInput.next(), iteratorCreated.next());
- Assert.assertFalse(iteratorCreated.hasNext());
+ Assertions.assertEquals(iteratorInput.next(), iteratorCreated.next());
+ Assertions.assertFalse(iteratorCreated.hasNext());
try {
simpleTcmProvider.createImmutableGraph(uriRefA, mGraph);
- Assert.assertTrue(false);
+ Assertions.assertTrue(false);
} catch (EntityAlreadyExistsException e) {
- Assert.assertTrue(true);
+ Assertions.assertTrue(true);
}
simpleTcmProvider.deleteGraph(uriRefA);
}
@@ -72,13 +75,13 @@ public abstract class TcProviderTest {
public void testCreateGraph() {
TcProvider simpleTcmProvider = getInstance();
Graph mGraph = simpleTcmProvider.createGraph(uriRefA);
- Assert.assertTrue(mGraph.isEmpty());
+ Assertions.assertTrue(mGraph.isEmpty());
try {
simpleTcmProvider.createGraph(uriRefA);
- Assert.assertTrue(false);
+ Assertions.assertTrue(false);
} catch (EntityAlreadyExistsException e) {
- Assert.assertTrue(true);
+ Assertions.assertTrue(true);
}
simpleTcmProvider.deleteGraph(uriRefA);
}
@@ -102,8 +105,8 @@ public abstract class TcProviderTest {
ImmutableGraph bGraph = simpleTcmProvider.getImmutableGraph(uriRefB);
Iterator<Triple> iterator = bGraph.iterator();
- Assert.assertEquals(new TripleImpl(uriRefB, uriRefB, uriRefB),
iterator.next());
- Assert.assertFalse(iterator.hasNext());
+ Assertions.assertEquals(new TripleImpl(uriRefB, uriRefB, uriRefB),
iterator.next());
+ Assertions.assertFalse(iterator.hasNext());
simpleTcmProvider.deleteGraph(uriRefA);
simpleTcmProvider.deleteGraph(uriRefA1);
simpleTcmProvider.deleteGraph(uriRefB);
@@ -122,14 +125,14 @@ public abstract class TcProviderTest {
mGraph.add(new TripleImpl(uriRefB, uriRefB, uriRefA));
mGraph.add(new TripleImpl(uriRefB, uriRefB, uriRefB));
mGraph.remove(new TripleImpl(uriRefB, uriRefB, uriRefA));
- Assert.assertEquals(1, mGraph.size());
+ Assertions.assertEquals(1, mGraph.size());
mGraph = simpleTcmProvider.createGraph(uriRefB1);
mGraph.add(new TripleImpl(uriRefB1, uriRefB1, uriRefB1));
Graph bGraph = simpleTcmProvider.getGraph(uriRefB);
Iterator<Triple> iterator = bGraph.iterator();
- Assert.assertEquals(new TripleImpl(uriRefB, uriRefB, uriRefB),
iterator.next());
- Assert.assertFalse(iterator.hasNext());
+ Assertions.assertEquals(new TripleImpl(uriRefB, uriRefB, uriRefB),
iterator.next());
+ Assertions.assertFalse(iterator.hasNext());
simpleTcmProvider.deleteGraph(uriRefA);
simpleTcmProvider.deleteGraph(uriRefA1);
simpleTcmProvider.deleteGraph(uriRefB);
@@ -159,12 +162,12 @@ public abstract class TcProviderTest {
Graph tripleCollection2 = simpleTcmProvider.getGraph(uriRefB1);
Iterator<Triple> iterator = tripleCollection.iterator();
- Assert.assertEquals(new TripleImpl(uriRefA, uriRefA, uriRefA),
iterator.next());
- Assert.assertFalse(iterator.hasNext());
+ Assertions.assertEquals(new TripleImpl(uriRefA, uriRefA, uriRefA),
iterator.next());
+ Assertions.assertFalse(iterator.hasNext());
iterator = tripleCollection2.iterator();
- Assert.assertEquals(new TripleImpl(uriRefB1, uriRefB1, uriRefB1),
iterator.next());
- Assert.assertFalse(iterator.hasNext());
+ Assertions.assertEquals(new TripleImpl(uriRefB1, uriRefB1, uriRefB1),
iterator.next());
+ Assertions.assertFalse(iterator.hasNext());
simpleTcmProvider.deleteGraph(uriRefA);
simpleTcmProvider.deleteGraph(uriRefA1);
simpleTcmProvider.deleteGraph(uriRefB);
@@ -183,14 +186,14 @@ public abstract class TcProviderTest {
simpleTcmProvider.deleteGraph(uriRefA);
try {
simpleTcmProvider.getGraph(uriRefA);
- Assert.assertTrue(false);
+ Assertions.assertTrue(false);
} catch (NoSuchEntityException e) {
- Assert.assertTrue(true);
+ Assertions.assertTrue(true);
}
// Check that graph is still available under uriRefC
ImmutableGraph cGraph = simpleTcmProvider.getImmutableGraph(uriRefC);
- Assert.assertNotNull(cGraph);
+ Assertions.assertNotNull(cGraph);
simpleTcmProvider.deleteGraph(uriRefC);
}
@@ -231,11 +234,11 @@ public abstract class TcProviderTest {
TcProvider provider = getInstance();
Graph graph = provider.createGraph(graphIRI);
- Assert.assertNotNull(graph);
+ Assertions.assertNotNull(graph);
//get a new provider and check that graph is there
provider = getInstance();
graph = provider.getGraph(graphIRI);
- Assert.assertNotNull(graph);
+ Assertions.assertNotNull(graph);
//check that there is no such graph, but only the mgraph
boolean expThrown = false;
try {
@@ -244,7 +247,7 @@ public abstract class TcProviderTest {
expThrown = true;
}
- Assert.assertTrue(expThrown);
+ Assertions.assertTrue(expThrown);
provider.deleteGraph(graphIRI);
}
@@ -254,12 +257,12 @@ public abstract class TcProviderTest {
TcProvider provider = getInstance();
ImmutableGraph graph = provider.createImmutableGraph(graphIRI, null);
- Assert.assertNotNull(graph);
+ Assertions.assertNotNull(graph);
//get a new provider and check that graph is there
provider = getInstance();
graph = provider.getImmutableGraph(graphIRI);
- Assert.assertNotNull(graph);
+ Assertions.assertNotNull(graph);
//check that there is no such mgraph, but only the graph
boolean expThrown = false;
@@ -270,7 +273,7 @@ public abstract class TcProviderTest {
expThrown = true;
}
- Assert.assertTrue(expThrown);
+ Assertions.assertTrue(expThrown);
provider.deleteGraph(graphIRI);
}
@@ -279,14 +282,14 @@ public abstract class TcProviderTest {
TcProvider provider = getInstance();
ImmutableGraph graph = provider.createImmutableGraph(graphIRI, null);
- Assert.assertNotNull(graph);
+ Assertions.assertNotNull(graph);
boolean expThrown = false;
try {
ImmutableGraph other =
provider.createImmutableGraph(otherGraphIRI, null);
} catch(EntityAlreadyExistsException eaee) {
expThrown = true;
}
- Assert.assertTrue(expThrown);
+ Assertions.assertTrue(expThrown);
provider.deleteGraph(graphIRI);
}
@@ -295,14 +298,14 @@ public abstract class TcProviderTest {
TcProvider provider = getInstance();
Graph graph = provider.createGraph(graphIRI);
- Assert.assertNotNull(graph);
+ Assertions.assertNotNull(graph);
boolean expThrown = false;
try {
Graph other = provider.createGraph(otherGraphIRI);
} catch(EntityAlreadyExistsException eaee) {
expThrown = true;
}
- Assert.assertTrue(expThrown);
+ Assertions.assertTrue(expThrown);
provider.deleteGraph(graphIRI);
}
@@ -315,8 +318,8 @@ public abstract class TcProviderTest {
ImmutableGraph graph = provider.createImmutableGraph(graphIRI,
createTestTripleCollection(t1));
- Assert.assertEquals(1, graph.size());
- Assert.assertTrue(graph.contains(t1));
+ Assertions.assertEquals(1, graph.size());
+ Assertions.assertTrue(graph.contains(t1));
provider.deleteGraph(graphIRI);
}
@@ -339,7 +342,7 @@ public abstract class TcProviderTest {
expThrown = true;
}
- Assert.assertTrue(expThrown);
+ Assertions.assertTrue(expThrown);
expThrown = false;
try {
@@ -348,7 +351,7 @@ public abstract class TcProviderTest {
expThrown = true;
}
- Assert.assertTrue(expThrown);
+ Assertions.assertTrue(expThrown);
expThrown = false;
try {
@@ -357,7 +360,7 @@ public abstract class TcProviderTest {
expThrown = true;
}
- Assert.assertTrue(expThrown);
+ Assertions.assertTrue(expThrown);
expThrown = false;
@@ -367,7 +370,7 @@ public abstract class TcProviderTest {
expThrown = true;
}
- Assert.assertTrue(expThrown);
+ Assertions.assertTrue(expThrown);
expThrown = false;
@@ -377,7 +380,7 @@ public abstract class TcProviderTest {
expThrown = true;
}
- Assert.assertTrue(expThrown);
+ Assertions.assertTrue(expThrown);
provider.deleteGraph(graphIRI);
}
@@ -430,7 +433,7 @@ public abstract class TcProviderTest {
provider = getInstance();
ImmutableGraph firstGraph = provider.getImmutableGraph(name2);
- Assert.assertNotNull(firstGraph);
+ Assertions.assertNotNull(firstGraph);
//check second name is not there
boolean expThrown = false;
@@ -441,7 +444,7 @@ public abstract class TcProviderTest {
expThrown = true;
}
- Assert.assertTrue(expThrown);
+ Assertions.assertTrue(expThrown);
provider.deleteGraph(name2);
}
@@ -454,7 +457,7 @@ public abstract class TcProviderTest {
Graph graph = provider.createGraph(graphIRI);
Graph tc = provider.getGraph(graphIRI);
- Assert.assertNotNull(tc);
+ Assertions.assertNotNull(tc);
provider.deleteGraph(graphIRI);
}
diff --git
a/dataset/src/test/java/org/apache/clerezza/simple/storage/AccessViaTcManager.java
b/dataset/src/test/java/org/apache/clerezza/simple/storage/AccessViaTcManager.java
index 1989797..54d8d58 100644
---
a/dataset/src/test/java/org/apache/clerezza/simple/storage/AccessViaTcManager.java
+++
b/dataset/src/test/java/org/apache/clerezza/simple/storage/AccessViaTcManager.java
@@ -22,19 +22,21 @@ import org.apache.clerezza.Graph;
import org.apache.clerezza.IRI;
import org.apache.clerezza.implementation.in_memory.SimpleGraph;
import org.apache.clerezza.dataset.TcManager;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.platform.runner.JUnitPlatform;
+import org.junit.runner.RunWith;
/**
*
* @author developer
*/
+@RunWith(JUnitPlatform.class)
public class AccessViaTcManager {
@Test
public void simple() {
Graph g = TcManager.getInstance().createGraph(new
IRI("http://example.org/foo";));
- Assert.assertTrue(g instanceof SimpleGraph);
+ Assertions.assertTrue(g instanceof SimpleGraph);
}
-
}
diff --git
a/dataset/src/test/java/org/apache/clerezza/simple/storage/GenericTcProviderTest.java
b/dataset/src/test/java/org/apache/clerezza/simple/storage/GenericTcProviderTest.java
index c46a835..c5e955d 100644
---
a/dataset/src/test/java/org/apache/clerezza/simple/storage/GenericTcProviderTest.java
+++
b/dataset/src/test/java/org/apache/clerezza/simple/storage/GenericTcProviderTest.java
@@ -20,7 +20,7 @@ package org.apache.clerezza.simple.storage;
import org.apache.clerezza.dataset.TcProvider;
import org.apache.clerezza.dataset.test.utils.TcProviderTest;
-import org.junit.After;
+import org.junit.jupiter.api.AfterEach;
/**
*
@@ -30,7 +30,7 @@ public class GenericTcProviderTest extends TcProviderTest {
SimpleTcProvider provider = new SimpleTcProvider();
- @After
+ @AfterEach
public void cleanUp() {
provider = new SimpleTcProvider();
}
