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 2018/06/30 15:20:37 UTC
[1/3] jena git commit: Tidy syntax tests - don't use TestCase or
BaseTest
Repository: jena
Updated Branches:
refs/heads/master 792351dfd -> 5d12d84c5
Tidy syntax tests - don't use TestCase or BaseTest
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/5cc39ea6
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/5cc39ea6
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/5cc39ea6
Branch: refs/heads/master
Commit: 5cc39ea62299ca1f3ab8c20e7ca27139cc319b0a
Parents: 2dbfdd2
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Jun 28 10:06:36 2018 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Jun 28 10:06:36 2018 +0100
----------------------------------------------------------------------
.../java/org/apache/jena/sparql/syntax/TestSSE_Basic.java | 5 +++--
.../java/org/apache/jena/sparql/syntax/TestSSE_Builder.java | 7 ++-----
.../java/org/apache/jena/sparql/syntax/TestSSE_Forms.java | 6 ++++--
.../java/org/apache/jena/sparql/syntax/TestSerialization.java | 6 +++---
.../jena/sparql/syntax/syntaxtransform/TestFlattenSyntax.java | 7 +++----
.../jena/sparql/syntax/syntaxtransform/TestQueryOps.java | 5 +++--
.../sparql/syntax/syntaxtransform/TestSyntaxTransform.java | 5 +++--
7 files changed, 21 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/5cc39ea6/jena-arq/src/test/java/org/apache/jena/sparql/syntax/TestSSE_Basic.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/syntax/TestSSE_Basic.java b/jena-arq/src/test/java/org/apache/jena/sparql/syntax/TestSSE_Basic.java
index 3bb6bb0..bfdb935 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/syntax/TestSSE_Basic.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/syntax/TestSSE_Basic.java
@@ -18,7 +18,8 @@
package org.apache.jena.sparql.syntax;
-import junit.framework.TestCase ;
+import static org.junit.Assert.*;
+
import org.apache.jena.datatypes.xsd.XSDDatatype ;
import org.apache.jena.graph.Node ;
import org.apache.jena.sparql.ARQConstants ;
@@ -30,7 +31,7 @@ import org.apache.jena.sparql.sse.SSE ;
import org.apache.jena.sparql.util.NodeFactoryExtra ;
import org.junit.Test ;
-public class TestSSE_Basic extends TestCase
+public class TestSSE_Basic
{
// Tests not requiring URI resolution or prefix name handling.
http://git-wip-us.apache.org/repos/asf/jena/blob/5cc39ea6/jena-arq/src/test/java/org/apache/jena/sparql/syntax/TestSSE_Builder.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/syntax/TestSSE_Builder.java b/jena-arq/src/test/java/org/apache/jena/sparql/syntax/TestSSE_Builder.java
index c203445..e4653ee 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/syntax/TestSSE_Builder.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/syntax/TestSSE_Builder.java
@@ -19,7 +19,7 @@
package org.apache.jena.sparql.syntax;
-import junit.framework.TestCase ;
+import static org.junit.Assert.*;
import org.apache.jena.graph.Node;
import org.apache.jena.sparql.algebra.Op ;
import org.apache.jena.sparql.algebra.TableFactory;
@@ -37,11 +37,8 @@ import org.apache.jena.sparql.sse.builders.BuilderNode ;
import org.apache.jena.sparql.sse.builders.ExprBuildException;
import org.apache.jena.vocabulary.XSD;
import org.junit.Test ;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-@RunWith(JUnit4.class)
-public class TestSSE_Builder extends TestCase
+public class TestSSE_Builder
{
@Test public void test_01() { SSE.parseTriple("[triple ?s ?p ?o]") ; }
@Test public void test_02() { SSE.parseTriple("[?s ?p ?o]") ; }
http://git-wip-us.apache.org/repos/asf/jena/blob/5cc39ea6/jena-arq/src/test/java/org/apache/jena/sparql/syntax/TestSSE_Forms.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/syntax/TestSSE_Forms.java b/jena-arq/src/test/java/org/apache/jena/sparql/syntax/TestSSE_Forms.java
index da67c97..29cbdd9 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/syntax/TestSSE_Forms.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/syntax/TestSSE_Forms.java
@@ -18,7 +18,9 @@
package org.apache.jena.sparql.syntax;
-import junit.framework.TestCase ;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
import org.apache.jena.datatypes.xsd.XSDDatatype ;
import org.apache.jena.graph.Node ;
import org.apache.jena.graph.NodeFactory ;
@@ -31,7 +33,7 @@ import org.junit.AfterClass ;
import org.junit.BeforeClass ;
import org.junit.Test ;
-public class TestSSE_Forms extends TestCase
+public class TestSSE_Forms
{
static PrefixMapping pmap = new PrefixMappingImpl() ;
static {
http://git-wip-us.apache.org/repos/asf/jena/blob/5cc39ea6/jena-arq/src/test/java/org/apache/jena/sparql/syntax/TestSerialization.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/syntax/TestSerialization.java b/jena-arq/src/test/java/org/apache/jena/sparql/syntax/TestSerialization.java
index 7f754b2..efde2e1 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/syntax/TestSerialization.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/syntax/TestSerialization.java
@@ -18,7 +18,8 @@
package org.apache.jena.sparql.syntax;
-import org.apache.jena.atlas.junit.BaseTest ;
+import static org.junit.Assert.*;
+
import org.apache.jena.query.Query ;
import org.apache.jena.query.QueryFactory ;
import org.apache.jena.query.Syntax ;
@@ -30,8 +31,7 @@ import org.apache.jena.sparql.sse.SSE ;
import org.apache.jena.sparql.util.FmtUtils ;
import org.junit.Test ;
-
-public class TestSerialization extends BaseTest
+public class TestSerialization
{
static PrefixMapping pmap1 = new PrefixMappingImpl() ;
{
http://git-wip-us.apache.org/repos/asf/jena/blob/5cc39ea6/jena-arq/src/test/java/org/apache/jena/sparql/syntax/syntaxtransform/TestFlattenSyntax.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/syntax/syntaxtransform/TestFlattenSyntax.java b/jena-arq/src/test/java/org/apache/jena/sparql/syntax/syntaxtransform/TestFlattenSyntax.java
index 62465cc..744d431 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/syntax/syntaxtransform/TestFlattenSyntax.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/syntax/syntaxtransform/TestFlattenSyntax.java
@@ -18,17 +18,16 @@
package org.apache.jena.sparql.syntax.syntaxtransform;
-import org.apache.jena.atlas.junit.BaseTest ;
+import static org.junit.Assert.assertEquals;
+
import org.apache.jena.query.Query ;
import org.apache.jena.query.QueryFactory ;
import org.apache.jena.query.Syntax ;
import org.apache.jena.sparql.algebra.Algebra ;
import org.apache.jena.sparql.algebra.Op ;
-import org.apache.jena.sparql.syntax.syntaxtransform.ElementTransformCleanGroupsOfOne ;
-import org.apache.jena.sparql.syntax.syntaxtransform.QueryTransformOps ;
import org.junit.Test ;
-public class TestFlattenSyntax extends BaseTest {
+public class TestFlattenSyntax {
static String PRE = "PREFIX : <http://example/>\n" ;
@Test public void test_flatten_basic_01()
http://git-wip-us.apache.org/repos/asf/jena/blob/5cc39ea6/jena-arq/src/test/java/org/apache/jena/sparql/syntax/syntaxtransform/TestQueryOps.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/syntax/syntaxtransform/TestQueryOps.java b/jena-arq/src/test/java/org/apache/jena/sparql/syntax/syntaxtransform/TestQueryOps.java
index 4cb4cfa..212a2b2 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/syntax/syntaxtransform/TestQueryOps.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/syntax/syntaxtransform/TestQueryOps.java
@@ -18,13 +18,14 @@
package org.apache.jena.sparql.syntax.syntaxtransform;
-import org.apache.jena.atlas.junit.BaseTest ;
+import static org.junit.Assert.assertEquals;
+
import org.junit.Test ;
import org.apache.jena.query.Query ;
import org.apache.jena.query.QueryFactory ;
import org.apache.jena.sparql.syntax.syntaxtransform.QueryTransformOps ;
-public class TestQueryOps extends BaseTest
+public class TestQueryOps
{
@Test public void queryOp_01() { testShallowCopy("SELECT * { }") ; }
http://git-wip-us.apache.org/repos/asf/jena/blob/5cc39ea6/jena-arq/src/test/java/org/apache/jena/sparql/syntax/syntaxtransform/TestSyntaxTransform.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/syntax/syntaxtransform/TestSyntaxTransform.java b/jena-arq/src/test/java/org/apache/jena/sparql/syntax/syntaxtransform/TestSyntaxTransform.java
index 574c79b..eea2199 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/syntax/syntaxtransform/TestSyntaxTransform.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/syntax/syntaxtransform/TestSyntaxTransform.java
@@ -18,10 +18,11 @@
package org.apache.jena.sparql.syntax.syntaxtransform;
+import static org.junit.Assert.assertEquals;
+
import java.util.HashMap ;
import java.util.Map ;
-import org.apache.jena.atlas.junit.BaseTest ;
import org.apache.jena.graph.Node ;
import org.apache.jena.query.Query ;
import org.apache.jena.query.QueryFactory ;
@@ -34,7 +35,7 @@ import org.apache.jena.update.UpdateRequest ;
import org.junit.Test ;
/** Test of variable replaced by value */
-public class TestSyntaxTransform extends BaseTest
+public class TestSyntaxTransform
{
@Test public void subst_query_01() {
testQuery("SELECT * { }",
[3/3] jena git commit: JENA-1568: Merge commit 'refs/pull/442/head'
of https://github.com/apache/jena
Posted by an...@apache.org.
JENA-1568: Merge commit 'refs/pull/442/head' of https://github.com/apache/jena
This closes #442.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/5d12d84c
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/5d12d84c
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/5d12d84c
Branch: refs/heads/master
Commit: 5d12d84c5d0b4ccd6bf650616ec7b7dd0ae3ef32
Parents: 792351d fdeea27
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Jun 30 15:55:31 2018 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Jun 30 15:55:31 2018 +0100
----------------------------------------------------------------------
.../jena/atlas/data/TestDistinctDataBag.java | 4 +-
.../jena/atlas/data/TestDistinctDataNet.java | 16 +++-----
.../jena/atlas/data/TestSortedDataBag.java | 16 +++-----
.../jena/riot/adapters/TestFileManager.java | 2 +-
.../jena/riot/stream/TestLocationMapper.java | 43 +++++++++-----------
.../iterator/TestSortedDataBagCancellation.java | 9 ++--
.../jena/sparql/syntax/TestSSE_Basic.java | 5 ++-
.../jena/sparql/syntax/TestSSE_Builder.java | 7 +---
.../jena/sparql/syntax/TestSSE_Forms.java | 6 ++-
.../jena/sparql/syntax/TestSerialization.java | 6 +--
.../syntaxtransform/TestFlattenSyntax.java | 7 ++--
.../syntax/syntaxtransform/TestQueryOps.java | 5 ++-
.../syntaxtransform/TestSyntaxTransform.java | 5 ++-
.../jena/sparql/util/TestDateTimeParsing.java | 5 +--
14 files changed, 63 insertions(+), 73 deletions(-)
----------------------------------------------------------------------
[2/3] jena git commit: Update uses of JUnit3 TestCase to JUnit4.
Posted by an...@apache.org.
Update uses of JUnit3 TestCase to JUnit4.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/fdeea273
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/fdeea273
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/fdeea273
Branch: refs/heads/master
Commit: fdeea273f25e6cf49640d7d5c02cc3f5ab6e895e
Parents: 5cc39ea
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Jun 29 19:01:11 2018 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Jun 29 19:01:11 2018 +0100
----------------------------------------------------------------------
.../jena/atlas/data/TestDistinctDataBag.java | 4 +-
.../jena/atlas/data/TestDistinctDataNet.java | 16 +++-----
.../jena/atlas/data/TestSortedDataBag.java | 16 +++-----
.../jena/riot/adapters/TestFileManager.java | 2 +-
.../jena/riot/stream/TestLocationMapper.java | 43 +++++++++-----------
.../iterator/TestSortedDataBagCancellation.java | 9 ++--
.../jena/sparql/util/TestDateTimeParsing.java | 5 +--
7 files changed, 42 insertions(+), 53 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/fdeea273/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataBag.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataBag.java b/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataBag.java
index cd38359..6a237d9 100644
--- a/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataBag.java
+++ b/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataBag.java
@@ -24,7 +24,6 @@ import java.util.Iterator ;
import java.util.List ;
import java.util.Random ;
-import junit.framework.TestCase ;
import org.apache.jena.atlas.data.DistinctDataBag ;
import org.apache.jena.atlas.data.ThresholdPolicyCount ;
import org.apache.jena.atlas.iterator.Iter ;
@@ -43,8 +42,9 @@ import org.apache.jena.sparql.sse.Item ;
import org.apache.jena.sparql.sse.SSE ;
import org.apache.jena.sparql.sse.builders.BuilderBinding ;
import org.apache.jena.sparql.util.NodeUtils ;
+import static org.junit.Assert.*;
-public class TestDistinctDataBag extends TestCase
+public class TestDistinctDataBag
{
private static final String LETTERS = "qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDFGHJKLZXCVBNM";
Random random = new Random();
http://git-wip-us.apache.org/repos/asf/jena/blob/fdeea273/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataNet.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataNet.java b/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataNet.java
index 9b95560..93e876e 100644
--- a/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataNet.java
+++ b/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataNet.java
@@ -18,20 +18,15 @@
package org.apache.jena.atlas.data;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
import java.io.File ;
-import java.util.ArrayList ;
-import java.util.Arrays ;
-import java.util.Iterator ;
-import java.util.List ;
-import java.util.Random ;
+import java.util.*;
-import junit.framework.TestCase ;
-import org.apache.jena.atlas.data.DistinctDataNet ;
-import org.apache.jena.atlas.data.ThresholdPolicyCount ;
import org.apache.jena.atlas.iterator.Iter ;
import org.apache.jena.datatypes.xsd.XSDDatatype ;
import org.apache.jena.graph.NodeFactory ;
-import org.junit.Test ;
import org.apache.jena.query.SortCondition ;
import org.apache.jena.riot.system.SerializationFactoryFinder ;
import org.apache.jena.sparql.core.Var ;
@@ -44,8 +39,9 @@ import org.apache.jena.sparql.sse.Item ;
import org.apache.jena.sparql.sse.SSE ;
import org.apache.jena.sparql.sse.builders.BuilderBinding ;
import org.apache.jena.sparql.util.NodeUtils ;
+import org.junit.Test ;
-public class TestDistinctDataNet extends TestCase
+public class TestDistinctDataNet
{
private static final String LETTERS = "qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDFGHJKLZXCVBNM";
Random random = new Random();
http://git-wip-us.apache.org/repos/asf/jena/blob/fdeea273/jena-arq/src/test/java/org/apache/jena/atlas/data/TestSortedDataBag.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/atlas/data/TestSortedDataBag.java b/jena-arq/src/test/java/org/apache/jena/atlas/data/TestSortedDataBag.java
index 5c1d879..683c6fe 100644
--- a/jena-arq/src/test/java/org/apache/jena/atlas/data/TestSortedDataBag.java
+++ b/jena-arq/src/test/java/org/apache/jena/atlas/data/TestSortedDataBag.java
@@ -18,20 +18,15 @@
package org.apache.jena.atlas.data;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
import java.io.File ;
-import java.util.ArrayList ;
-import java.util.Collections ;
-import java.util.Iterator ;
-import java.util.List ;
-import java.util.Random ;
+import java.util.*;
-import junit.framework.TestCase ;
-import org.apache.jena.atlas.data.SortedDataBag ;
-import org.apache.jena.atlas.data.ThresholdPolicyCount ;
import org.apache.jena.atlas.iterator.Iter ;
import org.apache.jena.datatypes.xsd.XSDDatatype ;
import org.apache.jena.graph.NodeFactory ;
-import org.junit.Test ;
import org.apache.jena.query.Query ;
import org.apache.jena.query.QueryCancelledException ;
import org.apache.jena.query.SortCondition ;
@@ -43,8 +38,9 @@ import org.apache.jena.sparql.engine.binding.BindingComparator ;
import org.apache.jena.sparql.engine.binding.BindingFactory ;
import org.apache.jena.sparql.engine.binding.BindingMap ;
import org.apache.jena.sparql.expr.ExprVar ;
+import org.junit.Test ;
-public class TestSortedDataBag extends TestCase
+public class TestSortedDataBag
{
private static final String LETTERS = "qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDFGHJKLZXCVBNM";
private Random random;
http://git-wip-us.apache.org/repos/asf/jena/blob/fdeea273/jena-arq/src/test/java/org/apache/jena/riot/adapters/TestFileManager.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/adapters/TestFileManager.java b/jena-arq/src/test/java/org/apache/jena/riot/adapters/TestFileManager.java
index c141fc2..041dc3c 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/adapters/TestFileManager.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/adapters/TestFileManager.java
@@ -26,7 +26,7 @@ import org.apache.jena.ontology.OntModel ;
import org.apache.jena.ontology.OntModelSpec ;
import org.apache.jena.rdf.model.Model ;
import org.apache.jena.rdf.model.ModelFactory ;
-import org.apache.jena.riot.stream.TestLocationMapper ;
+import org.apache.jena.riot.stream.TestLocationMapper;
import org.apache.jena.riot.system.stream.StreamManager;
import org.apache.jena.shared.NotFoundException ;
import org.apache.jena.util.FileManager ;
http://git-wip-us.apache.org/repos/asf/jena/blob/fdeea273/jena-arq/src/test/java/org/apache/jena/riot/stream/TestLocationMapper.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/stream/TestLocationMapper.java b/jena-arq/src/test/java/org/apache/jena/riot/stream/TestLocationMapper.java
index dee0128..40a1a4b 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/stream/TestLocationMapper.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/stream/TestLocationMapper.java
@@ -18,18 +18,21 @@
package org.apache.jena.riot.stream;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+
import java.util.Iterator ;
-import junit.framework.TestCase ;
-import junit.framework.TestSuite ;
import org.apache.jena.rdf.model.Model ;
+import org.apache.jena.riot.RDFDataMgr;
import org.apache.jena.riot.adapters.TestFileManager ;
-import org.apache.jena.util.FileManager ;
import org.apache.jena.util.LocationMapper ;
+import org.junit.Test;
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
-public class TestLocationMapper extends TestCase
+public class TestLocationMapper
{
static Logger log = LoggerFactory.getLogger(TestLocationMapper.class) ;
static final String testingDir = TestFileManager.testingDir ;
@@ -40,17 +43,9 @@ public class TestLocationMapper extends TestCase
testingDir+"/location-mapping-test.ttl" ;
- public TestLocationMapper( String name )
- {
- super(name);
- }
+ public TestLocationMapper() { }
- public static TestSuite suite()
- {
- return new TestSuite( TestLocationMapper.class );
- }
-
- public void testLocationMapper()
+ @Test public void testLocationMapper()
{
LocationMapper locMap = new LocationMapper(mapping) ;
String alt = locMap.altMapping(filename1) ;
@@ -58,7 +53,7 @@ public class TestLocationMapper extends TestCase
assertEquals(filename2, alt) ;
}
- public void testLocationMapperMiss()
+ @Test public void testLocationMapperMiss()
{
LocationMapper locMap = new LocationMapper(mapping) ;
String alt = locMap.altMapping(notFilename) ;
@@ -66,7 +61,7 @@ public class TestLocationMapper extends TestCase
assertEquals(notFilename, alt) ;
}
- public void testLocationMapperURLtoFile()
+ @Test public void testLocationMapperURLtoFile()
{
LocationMapper locMap = new LocationMapper(mapping) ;
String alt = locMap.altMapping("http://example.org/file") ;
@@ -74,9 +69,9 @@ public class TestLocationMapper extends TestCase
assertEquals("file:"+testingDir+"/location-mapping-test-file", alt) ;
}
- public void testLocationMapperFromModel()
+ @Test public void testLocationMapperFromModel()
{
- Model model = FileManager.get().loadModel(testingDir+"/location-mapping-test.ttl") ;
+ Model model = RDFDataMgr.loadModel(testingDir+"/location-mapping-test.ttl") ;
LocationMapper loc = new LocationMapper(model) ;
// Light test that the two location mappers are "the same"
@@ -97,7 +92,7 @@ public class TestLocationMapper extends TestCase
}
}
- public void testLocationMapperClone1()
+ @Test public void testLocationMapperClone1()
{
LocationMapper locMap1 = new LocationMapper(mapping) ;
// See testLocationMapperURLtoFile
@@ -113,7 +108,7 @@ public class TestLocationMapper extends TestCase
assertEquals("file:"+testingDir+"/location-mapping-test-file", alt) ;
}
- public void testLocationMapperClone2()
+ @Test public void testLocationMapperClone2()
{
LocationMapper locMap1 = new LocationMapper(mapping) ;
// See testLocationMapperURLtoFile
@@ -139,7 +134,7 @@ public class TestLocationMapper extends TestCase
}
}
- public void testLocationMapperEquals1()
+ @Test public void testLocationMapperEquals1()
{
LocationMapper locMap1 = new LocationMapper(mapping) ;
LocationMapper locMap2 = new LocationMapper(mapping) ;
@@ -147,7 +142,7 @@ public class TestLocationMapper extends TestCase
assertEquals(locMap1.hashCode(), locMap2.hashCode()) ;
}
- public void testLocationMapperEquals2()
+ @Test public void testLocationMapperEquals2()
{
LocationMapper locMap1 = new LocationMapper(mapping) ;
LocationMapper locMap2 = new LocationMapper(mapping) ;
@@ -156,7 +151,7 @@ public class TestLocationMapper extends TestCase
assertFalse(locMap2.equals(locMap1)) ;
}
- public void testLocationMapperToModel1()
+ @Test public void testLocationMapperToModel1()
{
LocationMapper locMap1 = new LocationMapper(mapping) ;
LocationMapper locMap2 = new LocationMapper(locMap1.toModel()) ;
@@ -164,7 +159,7 @@ public class TestLocationMapper extends TestCase
assertEquals(locMap1.hashCode(), locMap2.hashCode()) ;
}
- public void testLocationMapperToModel2()
+ @Test public void testLocationMapperToModel2()
{
LocationMapper locMap1 = new LocationMapper(mapping) ;
LocationMapper locMap2 = new LocationMapper(mapping) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/fdeea273/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TestSortedDataBagCancellation.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TestSortedDataBagCancellation.java b/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TestSortedDataBagCancellation.java
index 8227e89..7707407 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TestSortedDataBagCancellation.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TestSortedDataBagCancellation.java
@@ -17,12 +17,16 @@
*/
package org.apache.jena.sparql.engine.iterator;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import junit.framework.TestCase;
import org.apache.jena.atlas.io.IndentedWriter;
import org.apache.jena.graph.Graph;
import org.apache.jena.graph.NodeFactory;
@@ -42,7 +46,6 @@ import org.apache.jena.sparql.engine.main.OpExecutorFactory;
import org.apache.jena.sparql.serializer.SerializationContext;
import org.apache.jena.sparql.util.Context;
import org.junit.Test;
-
/*
Test that a SortedDataBag used inside a QueryIterSort
does indeed cut off when cancelled.
@@ -52,7 +55,7 @@ import org.junit.Test;
test the SortedDataBag correctly?
*/
-public class TestSortedDataBagCancellation extends TestCase {
+public class TestSortedDataBagCancellation {
static final BindingMap b1 = BindingFactory.create();
static final BindingMap b2 = BindingFactory.create();
http://git-wip-us.apache.org/repos/asf/jena/blob/fdeea273/jena-arq/src/test/java/org/apache/jena/sparql/util/TestDateTimeParsing.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/util/TestDateTimeParsing.java b/jena-arq/src/test/java/org/apache/jena/sparql/util/TestDateTimeParsing.java
index e14d086..3955cd5 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/util/TestDateTimeParsing.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/util/TestDateTimeParsing.java
@@ -18,12 +18,11 @@
package org.apache.jena.sparql.util;
-import junit.framework.TestCase ;
import org.apache.jena.sparql.util.DateTimeStruct ;
import org.junit.Test ;
+import static org.junit.Assert.*;
-
-public class TestDateTimeParsing extends TestCase
+public class TestDateTimeParsing
{
@Test public void testDT_1() { dateTimeTest("2007-08-31T12:34:56Z") ; }
@Test public void testDT_2() { dateTimeTest("2007-08-31T12:34:56") ; }