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 2013/03/04 21:38:31 UTC
svn commit: r1452495 - in /jena/trunk:
jena-arq/src/main/java/org/apache/jena/atlas/io/
jena-arq/src/test/java/com/hp/hpl/jena/query/
jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/optimize/
jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/ je...
Author: andy
Date: Mon Mar 4 20:38:29 2013
New Revision: 1452495
URL: http://svn.apache.org/r1452495
Log:
Switch to org.junit.Assert from the deprecated junit.framework.Assert.
Modified:
jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/IO.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/query/TestParameterizedSparqlString.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/optimize/TestFilterTransform.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestExprLib.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/function/user/TestUserDefinedFunctionFactory.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/function/user/TestUserFunctionsInSparql.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TestDatasets.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/resultset/TestResultSetFormat2.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestParserRegistry.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestPipedRDFIterators.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/web/TestWebContent.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/assembler/test/MockTransactionModel.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/RecordingListener.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/MoreTests.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/NTripleTestSuite.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/EventList.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/TestFrame.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/TestHandler.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/AbstractContainerMethods.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/AbstractTestReifiedStatements.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/ModelTestBase.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/RecordingModelListener.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestAddAndContains.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestAddModel.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestAltMethods.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestAnonID.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestContainerConstructors.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestContainers.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestContains.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestGet.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestHiddenStatements.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestIterators.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestList.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestListSubjects.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestListSubjectsEtc.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestLiteralImpl.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestLiterals.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestLiteralsInModel.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModel.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelBulkUpdate.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelEvents.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelExtract.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelFactory.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelMakerImpl.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelPolymorphism.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelPrefixMapping.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelRead.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelSetOperations.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestNamespace.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestObjects.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestPropertyImpl.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestRDFNodes.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestRDFWriterMap.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestReaders.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestReifiedStatements.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestRemoveBug.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestRemoveSPO.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestResourceFactory.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestResourceImpl.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestResourceMethods.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestResources.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestSelectorUse.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestSelectors.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestSeqMethods.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestSimpleListStatements.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestSimpleSelector.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestStatementCreation.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestStatementMethods.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestStatements.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/helpers/RecordingModelListener.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/ConcurrencyTest.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/OWLWGTester.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/ReasonerTester.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/TestUtil.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/WGReasonerTester.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/util/TestUtil.java
jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/TestQuery.java
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/IO.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/IO.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/IO.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/IO.java Mon Mar 4 20:38:29 2013
@@ -149,6 +149,20 @@ public class IO
}
+ public static void close(IndentedWriter resource)
+ {
+ if ( resource == null )
+ return ;
+ resource.close();
+ }
+
+ public static void closeSilent(IndentedWriter resource)
+ {
+ if ( resource == null )
+ return ;
+ try { resource.close(); } catch (Exception ex) { }
+ }
+
public static void exception(IOException ex)
{
throw new AtlasException(ex) ;
@@ -173,6 +187,13 @@ public class IO
try { out.flush(); } catch (IOException ex) { exception(ex) ; }
}
+ public static void flush(IndentedWriter out)
+ {
+ if ( out == null )
+ return ;
+ out.flush();
+ }
+
private static final int BUFFER_SIZE = 8*1024 ;
public static byte[] readWholeFile(InputStream in)
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/query/TestParameterizedSparqlString.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/query/TestParameterizedSparqlString.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/query/TestParameterizedSparqlString.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/query/TestParameterizedSparqlString.java Mon Mar 4 20:38:29 2013
@@ -34,7 +34,7 @@ import com.hp.hpl.jena.shared.impl.Prefi
import com.hp.hpl.jena.update.UpdateRequest;
import com.hp.hpl.jena.vocabulary.XSD;
-import junit.framework.Assert;
+import org.junit.Assert;
public class TestParameterizedSparqlString {
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/optimize/TestFilterTransform.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/optimize/TestFilterTransform.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/optimize/TestFilterTransform.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/optimize/TestFilterTransform.java Mon Mar 4 20:38:29 2013
@@ -18,7 +18,7 @@
package com.hp.hpl.jena.sparql.algebra.optimize;
-import junit.framework.Assert ;
+import org.junit.Assert ;
import junit.framework.JUnit4TestAdapter ;
import org.apache.jena.atlas.lib.StrUtils ;
import org.junit.Test ;
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestExprLib.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestExprLib.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestExprLib.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestExprLib.java Mon Mar 4 20:38:29 2013
@@ -18,7 +18,7 @@
package com.hp.hpl.jena.sparql.expr;
-import junit.framework.Assert ;
+import org.junit.Assert ;
import org.junit.Test ;
import com.hp.hpl.jena.sparql.util.ExprUtils ;
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/function/user/TestUserDefinedFunctionFactory.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/function/user/TestUserDefinedFunctionFactory.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/function/user/TestUserDefinedFunctionFactory.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/function/user/TestUserDefinedFunctionFactory.java Mon Mar 4 20:38:29 2013
@@ -20,7 +20,7 @@ package com.hp.hpl.jena.sparql.function.
import java.util.ArrayList;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.junit.AfterClass;
import org.junit.BeforeClass;
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/function/user/TestUserFunctionsInSparql.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/function/user/TestUserFunctionsInSparql.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/function/user/TestUserFunctionsInSparql.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/function/user/TestUserFunctionsInSparql.java Mon Mar 4 20:38:29 2013
@@ -20,7 +20,7 @@ package com.hp.hpl.jena.sparql.function.
import java.util.ArrayList;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.junit.AfterClass;
import org.junit.BeforeClass;
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TestDatasets.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TestDatasets.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TestDatasets.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TestDatasets.java Mon Mar 4 20:38:29 2013
@@ -21,7 +21,7 @@ package com.hp.hpl.jena.sparql.graph;
import java.util.ArrayList;
import java.util.List;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/resultset/TestResultSetFormat2.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/resultset/TestResultSetFormat2.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/resultset/TestResultSetFormat2.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/resultset/TestResultSetFormat2.java Mon Mar 4 20:38:29 2013
@@ -20,7 +20,7 @@ package com.hp.hpl.jena.sparql.resultset
import java.io.ByteArrayInputStream ;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.jena.atlas.lib.StrUtils ;
import org.junit.Test ;
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestParserRegistry.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestParserRegistry.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestParserRegistry.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestParserRegistry.java Mon Mar 4 20:38:29 2013
@@ -18,7 +18,7 @@
package org.apache.jena.riot;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.junit.Test;
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestPipedRDFIterators.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestPipedRDFIterators.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestPipedRDFIterators.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestPipedRDFIterators.java Mon Mar 4 20:38:29 2013
@@ -28,7 +28,7 @@ import java.util.concurrent.Future ;
import java.util.concurrent.TimeUnit ;
import java.util.concurrent.TimeoutException ;
-import junit.framework.Assert ;
+import org.junit.Assert ;
import org.apache.jena.atlas.lib.Tuple ;
import org.apache.jena.riot.RDFDataMgr ;
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/web/TestWebContent.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/web/TestWebContent.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/web/TestWebContent.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/web/TestWebContent.java Mon Mar 4 20:38:29 2013
@@ -18,7 +18,7 @@
package org.apache.jena.riot.web;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.jena.riot.WebContent ;
import org.junit.Test;
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/assembler/test/MockTransactionModel.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/assembler/test/MockTransactionModel.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/assembler/test/MockTransactionModel.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/assembler/test/MockTransactionModel.java Mon Mar 4 20:38:29 2013
@@ -20,7 +20,7 @@ package com.hp.hpl.jena.assembler.test;
import java.util.List;
-import junit.framework.Assert;
+import org.junit.Assert;
import com.hp.hpl.jena.assembler.*;
import com.hp.hpl.jena.assembler.assemblers.ModelAssembler;
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/RecordingListener.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/RecordingListener.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/RecordingListener.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/RecordingListener.java Mon Mar 4 20:38:29 2013
@@ -18,10 +18,15 @@
package com.hp.hpl.jena.graph.test;
-import com.hp.hpl.jena.graph.*;
+import java.util.ArrayList ;
+import java.util.Arrays ;
+import java.util.Iterator ;
+import java.util.List ;
-import junit.framework.*;
-import java.util.*;
+import org.junit.Assert ;
+import com.hp.hpl.jena.graph.Graph ;
+import com.hp.hpl.jena.graph.GraphListener ;
+import com.hp.hpl.jena.graph.Triple ;
/**
This testing listener records the event names and data, and provides
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/MoreTests.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/MoreTests.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/MoreTests.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/MoreTests.java Mon Mar 4 20:38:29 2013
@@ -21,7 +21,7 @@ package com.hp.hpl.jena.rdf.arp;
import java.io.*;
import java.nio.charset.Charset;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/NTripleTestSuite.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/NTripleTestSuite.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/NTripleTestSuite.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/NTripleTestSuite.java Mon Mar 4 20:38:29 2013
@@ -28,7 +28,7 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.TestSuite;
import org.xml.sax.SAXException;
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/EventList.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/EventList.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/EventList.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/EventList.java Mon Mar 4 20:38:29 2013
@@ -19,7 +19,7 @@
package com.hp.hpl.jena.rdf.arp.states;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.xml.sax.Attributes;
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/TestFrame.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/TestFrame.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/TestFrame.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/TestFrame.java Mon Mar 4 20:38:29 2013
@@ -19,7 +19,7 @@
package com.hp.hpl.jena.rdf.arp.states;
-import junit.framework.Assert;
+import org.junit.Assert;
import com.hp.hpl.jena.rdf.arp.impl.ANode;
import com.hp.hpl.jena.rdf.arp.impl.AbsXMLContext;
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/TestHandler.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/TestHandler.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/TestHandler.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/TestHandler.java Mon Mar 4 20:38:29 2013
@@ -22,7 +22,7 @@ package com.hp.hpl.jena.rdf.arp.states;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.Assert;
+import org.junit.Assert;
import com.hp.hpl.jena.rdf.arp.impl.ANode;
import com.hp.hpl.jena.rdf.arp.impl.ARPLocation;
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/AbstractContainerMethods.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/AbstractContainerMethods.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/AbstractContainerMethods.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/AbstractContainerMethods.java Mon Mar 4 20:38:29 2013
@@ -25,7 +25,7 @@ import com.hp.hpl.jena.rdf.model.Resourc
import com.hp.hpl.jena.rdf.model.test.helpers.TestingModelFactory;
import com.hp.hpl.jena.vocabulary.RDF;
-import junit.framework.Assert;
+import org.junit.Assert;
public abstract class AbstractContainerMethods extends AbstractModelTestBase
{
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/AbstractTestReifiedStatements.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/AbstractTestReifiedStatements.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/AbstractTestReifiedStatements.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/AbstractTestReifiedStatements.java Mon Mar 4 20:38:29 2013
@@ -34,7 +34,7 @@ import com.hp.hpl.jena.vocabulary.RDF;
import java.util.Set;
-import junit.framework.Assert;
+import org.junit.Assert;
public abstract class AbstractTestReifiedStatements extends ModelTestBase
{
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/ModelTestBase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/ModelTestBase.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/ModelTestBase.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/ModelTestBase.java Mon Mar 4 20:38:29 2013
@@ -38,7 +38,7 @@ import java.util.Map;
import java.util.Set;
import java.util.StringTokenizer;
-import junit.framework.Assert;
+import org.junit.Assert;
/**
* provides useful functionality for testing models, eg building small models
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/RecordingModelListener.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/RecordingModelListener.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/RecordingModelListener.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/RecordingModelListener.java Mon Mar 4 20:38:29 2013
@@ -22,7 +22,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import junit.framework.Assert;
+import org.junit.Assert;
import com.hp.hpl.jena.graph.test.GraphTestBase;
import com.hp.hpl.jena.rdf.model.Model;
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestAddAndContains.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestAddAndContains.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestAddAndContains.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestAddAndContains.java Mon Mar 4 20:38:29 2013
@@ -25,7 +25,7 @@ import com.hp.hpl.jena.rdf.model.Stateme
import com.hp.hpl.jena.rdf.model.test.helpers.TestingModelFactory;
import com.hp.hpl.jena.vocabulary.RDF;
-import junit.framework.Assert;
+import org.junit.Assert;
public class TestAddAndContains extends AbstractModelTestBase
{
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestAddModel.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestAddModel.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestAddModel.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestAddModel.java Mon Mar 4 20:38:29 2013
@@ -24,7 +24,7 @@ import com.hp.hpl.jena.rdf.model.test.he
import com.hp.hpl.jena.rdf.model.test.helpers.TestingModelFactory;
import com.hp.hpl.jena.vocabulary.RDF;
-import junit.framework.Assert;
+import org.junit.Assert;
public class TestAddModel extends AbstractModelTestBase
{
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestAltMethods.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestAltMethods.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestAltMethods.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestAltMethods.java Mon Mar 4 20:38:29 2013
@@ -27,7 +27,7 @@ import com.hp.hpl.jena.rdf.model.Seq;
import com.hp.hpl.jena.rdf.model.test.helpers.TestingModelFactory;
import com.hp.hpl.jena.vocabulary.RDF;
-import junit.framework.Assert;
+import org.junit.Assert;
public class TestAltMethods extends AbstractContainerMethods
{
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestAnonID.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestAnonID.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestAnonID.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestAnonID.java Mon Mar 4 20:38:29 2013
@@ -22,7 +22,7 @@ import com.hp.hpl.jena.rdf.model.AnonId;
import com.hp.hpl.jena.shared.impl.JenaParameters;
import com.hp.hpl.jena.test.JenaTestBase;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.TestSuite;
/**
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestContainerConstructors.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestContainerConstructors.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestContainerConstructors.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestContainerConstructors.java Mon Mar 4 20:38:29 2013
@@ -24,7 +24,7 @@ import com.hp.hpl.jena.rdf.model.Seq;
import com.hp.hpl.jena.rdf.model.test.helpers.TestingModelFactory;
import com.hp.hpl.jena.vocabulary.RDF;
-import junit.framework.Assert;
+import org.junit.Assert;
public class TestContainerConstructors extends AbstractModelTestBase
{
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestContainers.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestContainers.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestContainers.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestContainers.java Mon Mar 4 20:38:29 2013
@@ -23,7 +23,7 @@ import com.hp.hpl.jena.rdf.model.Resourc
import com.hp.hpl.jena.rdf.model.Seq;
import com.hp.hpl.jena.rdf.model.test.helpers.TestingModelFactory;
-import junit.framework.Assert;
+import org.junit.Assert;
/**
* Tests for containers.
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestContains.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestContains.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestContains.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestContains.java Mon Mar 4 20:38:29 2013
@@ -29,7 +29,7 @@ import com.hp.hpl.jena.rdf.model.impl.Mo
import com.hp.hpl.jena.rdf.model.test.helpers.ModelHelper;
import com.hp.hpl.jena.rdf.model.test.helpers.TestingModelFactory;
-import junit.framework.Assert;
+import org.junit.Assert;
public class TestContains extends AbstractModelTestBase
{
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestGet.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestGet.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestGet.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestGet.java Mon Mar 4 20:38:29 2013
@@ -26,7 +26,7 @@ import com.hp.hpl.jena.rdf.model.Seq;
import com.hp.hpl.jena.rdf.model.test.helpers.TestingModelFactory;
import com.hp.hpl.jena.vocabulary.RDF;
-import junit.framework.Assert;
+import org.junit.Assert;
public class TestGet extends AbstractModelTestBase
{
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestHiddenStatements.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestHiddenStatements.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestHiddenStatements.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestHiddenStatements.java Mon Mar 4 20:38:29 2013
@@ -18,7 +18,7 @@
package com.hp.hpl.jena.rdf.model.test;
-import junit.framework.Assert ;
+import org.junit.Assert ;
import com.hp.hpl.jena.rdf.model.test.helpers.TestingModelFactory ;
import com.hp.hpl.jena.shared.PrefixMapping ;
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestIterators.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestIterators.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestIterators.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestIterators.java Mon Mar 4 20:38:29 2013
@@ -29,7 +29,7 @@ import com.hp.hpl.jena.rdf.model.StmtIte
import com.hp.hpl.jena.rdf.model.test.helpers.TestingModelFactory;
import com.hp.hpl.jena.vocabulary.RDF;
-import junit.framework.Assert;
+import org.junit.Assert;
public class TestIterators extends AbstractModelTestBase
{
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestList.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestList.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestList.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestList.java Mon Mar 4 20:38:29 2013
@@ -39,7 +39,7 @@ import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestListSubjects.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestListSubjects.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestListSubjects.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestListSubjects.java Mon Mar 4 20:38:29 2013
@@ -33,7 +33,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Set;
-import junit.framework.Assert;
+import org.junit.Assert;
public class TestListSubjects extends AbstractModelTestBase
{
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestListSubjectsEtc.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestListSubjectsEtc.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestListSubjectsEtc.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestListSubjectsEtc.java Mon Mar 4 20:38:29 2013
@@ -25,7 +25,7 @@ import com.hp.hpl.jena.rdf.model.test.he
import com.hp.hpl.jena.rdf.model.test.helpers.TestingModelFactory;
import com.hp.hpl.jena.test.JenaTestBase;
-import junit.framework.Assert;
+import org.junit.Assert;
/**
* TestListSubjectsEtc - tests for listSubjects, listObjects [and
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestLiteralImpl.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestLiteralImpl.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestLiteralImpl.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestLiteralImpl.java Mon Mar 4 20:38:29 2013
@@ -27,7 +27,7 @@ import com.hp.hpl.jena.rdf.model.test.he
import com.hp.hpl.jena.rdf.model.test.helpers.TestingModelFactory;
import com.hp.hpl.jena.test.JenaTestBase;
-import junit.framework.Assert;
+import org.junit.Assert;
/**
* TestLiteralImpl - minimal, this is the first time an extra test has
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestLiterals.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestLiterals.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestLiterals.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestLiterals.java Mon Mar 4 20:38:29 2013
@@ -23,7 +23,7 @@ import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.test.helpers.TestingModelFactory;
import com.hp.hpl.jena.test.JenaTestBase;
-import junit.framework.Assert;
+import org.junit.Assert;
public class TestLiterals extends AbstractModelTestBase
{
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestLiteralsInModel.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestLiteralsInModel.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestLiteralsInModel.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestLiteralsInModel.java Mon Mar 4 20:38:29 2013
@@ -24,7 +24,7 @@ import com.hp.hpl.jena.rdf.model.Resourc
import com.hp.hpl.jena.rdf.model.test.helpers.ModelHelper;
import com.hp.hpl.jena.rdf.model.test.helpers.TestingModelFactory;
-import junit.framework.Assert;
+import org.junit.Assert;
public class TestLiteralsInModel extends AbstractModelTestBase
{
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModel.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModel.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModel.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModel.java Mon Mar 4 20:38:29 2013
@@ -34,7 +34,7 @@ import com.hp.hpl.jena.rdf.model.test.he
import com.hp.hpl.jena.shared.Command;
import com.hp.hpl.jena.test.JenaTestBase;
-import junit.framework.Assert;
+import org.junit.Assert;
public class TestModel extends AbstractModelTestBase
{
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelBulkUpdate.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelBulkUpdate.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelBulkUpdate.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelBulkUpdate.java Mon Mar 4 20:38:29 2013
@@ -27,7 +27,7 @@ import com.hp.hpl.jena.shared.PrefixMapp
import java.util.Arrays;
import java.util.List;
-import junit.framework.Assert;
+import org.junit.Assert;
/**
* Tests of the Model-level bulk update API.
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelEvents.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelEvents.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelEvents.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelEvents.java Mon Mar 4 20:38:29 2013
@@ -39,7 +39,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import junit.framework.Assert;
+import org.junit.Assert;
/**
* Tests for model events and listeners.
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelExtract.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelExtract.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelExtract.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelExtract.java Mon Mar 4 20:38:29 2013
@@ -33,7 +33,7 @@ import com.hp.hpl.jena.rdf.model.Stateme
import com.hp.hpl.jena.rdf.model.test.helpers.ModelHelper;
import com.hp.hpl.jena.rdf.model.test.helpers.TestingModelFactory;
-import junit.framework.Assert;
+import org.junit.Assert;
public class TestModelExtract extends AbstractModelTestBase
{
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelFactory.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelFactory.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelFactory.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelFactory.java Mon Mar 4 20:38:29 2013
@@ -30,7 +30,7 @@ import com.hp.hpl.jena.reasoner.rulesys.
import com.hp.hpl.jena.shared.PrefixMapping;
import com.hp.hpl.jena.test.JenaTestBase;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.TestCase;
/**
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelMakerImpl.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelMakerImpl.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelMakerImpl.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelMakerImpl.java Mon Mar 4 20:38:29 2013
@@ -33,7 +33,7 @@ import com.hp.hpl.jena.util.iterator.Nul
import java.util.ArrayList;
import java.util.List;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.TestCase;
/**
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelPolymorphism.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelPolymorphism.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelPolymorphism.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelPolymorphism.java Mon Mar 4 20:38:29 2013
@@ -22,7 +22,7 @@ import com.hp.hpl.jena.rdf.model.Propert
import com.hp.hpl.jena.rdf.model.Resource;
import com.hp.hpl.jena.rdf.model.test.helpers.TestingModelFactory;
-import junit.framework.Assert;
+import org.junit.Assert;
public class TestModelPolymorphism extends AbstractModelTestBase
{
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelPrefixMapping.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelPrefixMapping.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelPrefixMapping.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelPrefixMapping.java Mon Mar 4 20:38:29 2013
@@ -27,7 +27,7 @@ import com.hp.hpl.jena.rdf.model.test.he
import com.hp.hpl.jena.shared.AbstractTestPrefixMapping;
import com.hp.hpl.jena.shared.PrefixMapping;
-import junit.framework.Assert;
+import org.junit.Assert;
/**
* Test that a model is a prefix mapping.
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelRead.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelRead.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelRead.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelRead.java Mon Mar 4 20:38:29 2013
@@ -31,7 +31,7 @@ import java.net.ConnectException;
import java.net.NoRouteToHostException;
import java.net.UnknownHostException;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelSetOperations.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelSetOperations.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelSetOperations.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelSetOperations.java Mon Mar 4 20:38:29 2013
@@ -24,7 +24,7 @@ import com.hp.hpl.jena.rdf.model.StmtIte
import com.hp.hpl.jena.rdf.model.test.helpers.ModelHelper;
import com.hp.hpl.jena.rdf.model.test.helpers.TestingModelFactory;
-import junit.framework.Assert;
+import org.junit.Assert;
/**
* A revamped version of the regression set-operation tests.
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestNamespace.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestNamespace.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestNamespace.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestNamespace.java Mon Mar 4 20:38:29 2013
@@ -34,7 +34,7 @@ import java.util.Map;
import java.util.Set;
import java.util.StringTokenizer;
-import junit.framework.Assert;
+import org.junit.Assert;
public class TestNamespace extends AbstractModelTestBase
{
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestObjects.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestObjects.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestObjects.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestObjects.java Mon Mar 4 20:38:29 2013
@@ -33,7 +33,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import junit.framework.Assert;
+import org.junit.Assert;
public class TestObjects extends AbstractModelTestBase
{
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestPropertyImpl.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestPropertyImpl.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestPropertyImpl.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestPropertyImpl.java Mon Mar 4 20:38:29 2013
@@ -23,7 +23,7 @@ import com.hp.hpl.jena.rdf.model.impl.Pr
import com.hp.hpl.jena.vocabulary.RDF;
import com.hp.hpl.jena.vocabulary.RDFS;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.TestCase;
public class TestPropertyImpl extends TestCase
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestRDFNodes.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestRDFNodes.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestRDFNodes.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestRDFNodes.java Mon Mar 4 20:38:29 2013
@@ -34,7 +34,7 @@ import com.hp.hpl.jena.test.JenaTestBase
import java.util.ArrayList;
import java.util.List;
-import junit.framework.Assert;
+import org.junit.Assert;
/**
* This class tests various properties of RDFNodes.
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestRDFWriterMap.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestRDFWriterMap.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestRDFWriterMap.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestRDFWriterMap.java Mon Mar 4 20:38:29 2013
@@ -36,7 +36,7 @@ import com.hp.hpl.jena.xmloutput.impl.Ba
import java.util.HashMap;
import java.util.Map;
-import junit.framework.Assert;
+import org.junit.Assert;
public class TestRDFWriterMap extends JenaTestBase
{
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestReaders.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestReaders.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestReaders.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestReaders.java Mon Mar 4 20:38:29 2013
@@ -31,7 +31,7 @@ import java.net.ConnectException;
import java.net.NoRouteToHostException;
import java.net.UnknownHostException;
-import junit.framework.Assert;
+import org.junit.Assert;
public class TestReaders extends AbstractModelTestBase
{
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestReifiedStatements.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestReifiedStatements.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestReifiedStatements.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestReifiedStatements.java Mon Mar 4 20:38:29 2013
@@ -34,7 +34,7 @@ import com.hp.hpl.jena.vocabulary.RDF;
import java.util.Set;
-import junit.framework.Assert;
+import org.junit.Assert;
public class TestReifiedStatements extends AbstractModelTestBase
{
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestRemoveBug.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestRemoveBug.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestRemoveBug.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestRemoveBug.java Mon Mar 4 20:38:29 2013
@@ -29,7 +29,7 @@ import com.hp.hpl.jena.rdf.model.test.he
import java.io.StringReader;
-import junit.framework.Assert;
+import org.junit.Assert;
public class TestRemoveBug extends AbstractModelTestBase
{
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestRemoveSPO.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestRemoveSPO.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestRemoveSPO.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestRemoveSPO.java Mon Mar 4 20:38:29 2013
@@ -30,7 +30,7 @@ import com.hp.hpl.jena.test.JenaTestBase
import java.util.ArrayList;
import java.util.List;
-import junit.framework.Assert;
+import org.junit.Assert;
public class TestRemoveSPO extends AbstractModelTestBase
{
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestResourceFactory.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestResourceFactory.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestResourceFactory.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestResourceFactory.java Mon Mar 4 20:38:29 2013
@@ -31,7 +31,7 @@ import java.util.Calendar;
import java.util.GregorianCalendar;
import java.util.TimeZone;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.TestCase;
import junit.framework.TestSuite;
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestResourceImpl.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestResourceImpl.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestResourceImpl.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestResourceImpl.java Mon Mar 4 20:38:29 2013
@@ -28,7 +28,7 @@ import com.hp.hpl.jena.rdf.model.test.he
import com.hp.hpl.jena.test.JenaTestBase;
import com.hp.hpl.jena.vocabulary.RDF;
-import junit.framework.Assert;
+import org.junit.Assert;
/**
* TestResourceImpl - fresh tests, make sure as-ing works a bit.
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestResourceMethods.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestResourceMethods.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestResourceMethods.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestResourceMethods.java Mon Mar 4 20:38:29 2013
@@ -28,7 +28,7 @@ import com.hp.hpl.jena.shared.PropertyNo
import com.hp.hpl.jena.test.JenaTestBase;
import com.hp.hpl.jena.vocabulary.RDF;
-import junit.framework.Assert;
+import org.junit.Assert;
public class TestResourceMethods extends AbstractModelTestBase
{
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestResources.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestResources.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestResources.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestResources.java Mon Mar 4 20:38:29 2013
@@ -37,7 +37,7 @@ import com.hp.hpl.jena.vocabulary.RDF;
import java.util.HashSet;
import java.util.Set;
-import junit.framework.Assert;
+import org.junit.Assert;
public class TestResources extends AbstractModelTestBase
{
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestSelectorUse.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestSelectorUse.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestSelectorUse.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestSelectorUse.java Mon Mar 4 20:38:29 2013
@@ -31,7 +31,7 @@ import com.hp.hpl.jena.rdf.model.test.he
import java.util.List;
-import junit.framework.Assert;
+import org.junit.Assert;
// import com.hp.hpl.jena.regression.Regression.*;
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestSelectors.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestSelectors.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestSelectors.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestSelectors.java Mon Mar 4 20:38:29 2013
@@ -26,7 +26,7 @@ import com.hp.hpl.jena.rdf.model.SimpleS
import com.hp.hpl.jena.rdf.model.test.helpers.ModelHelper;
import com.hp.hpl.jena.rdf.model.test.helpers.TestingModelFactory;
-import junit.framework.Assert;
+import org.junit.Assert;
public class TestSelectors extends AbstractModelTestBase
{
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestSeqMethods.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestSeqMethods.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestSeqMethods.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestSeqMethods.java Mon Mar 4 20:38:29 2013
@@ -34,7 +34,7 @@ import com.hp.hpl.jena.vocabulary.RDF;
import java.util.ArrayList;
import java.util.List;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.TestSuite;
public class TestSeqMethods extends AbstractContainerMethods
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestSimpleListStatements.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestSimpleListStatements.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestSimpleListStatements.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestSimpleListStatements.java Mon Mar 4 20:38:29 2013
@@ -32,7 +32,7 @@ import com.hp.hpl.jena.vocabulary.RDF;
import java.util.List;
-import junit.framework.Assert;
+import org.junit.Assert;
public class TestSimpleListStatements extends AbstractModelTestBase
{
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestSimpleSelector.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestSimpleSelector.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestSimpleSelector.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestSimpleSelector.java Mon Mar 4 20:38:29 2013
@@ -27,7 +27,7 @@ import com.hp.hpl.jena.rdf.model.test.he
import com.hp.hpl.jena.vocabulary.RDF;
import com.hp.hpl.jena.vocabulary.RDFS;
-import junit.framework.Assert;
+import org.junit.Assert;
public class TestSimpleSelector extends AbstractModelTestBase
{
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestStatementCreation.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestStatementCreation.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestStatementCreation.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestStatementCreation.java Mon Mar 4 20:38:29 2013
@@ -30,7 +30,7 @@ import com.hp.hpl.jena.rdf.model.test.he
import com.hp.hpl.jena.vocabulary.RDF;
import com.hp.hpl.jena.vocabulary.RDFS;
-import junit.framework.Assert;
+import org.junit.Assert;
public class TestStatementCreation extends AbstractModelTestBase
{
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestStatementMethods.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestStatementMethods.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestStatementMethods.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestStatementMethods.java Mon Mar 4 20:38:29 2013
@@ -29,7 +29,7 @@ import com.hp.hpl.jena.rdf.model.test.he
import com.hp.hpl.jena.test.JenaTestBase;
import com.hp.hpl.jena.vocabulary.RDF;
-import junit.framework.Assert;
+import org.junit.Assert;
// import com.hp.hpl.jena.regression.Regression.*;
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestStatements.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestStatements.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestStatements.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestStatements.java Mon Mar 4 20:38:29 2013
@@ -29,7 +29,7 @@ import com.hp.hpl.jena.rdf.model.test.he
import com.hp.hpl.jena.test.JenaTestBase;
import com.hp.hpl.jena.vocabulary.RDF;
-import junit.framework.Assert;
+import org.junit.Assert;
public class TestStatements extends AbstractModelTestBase
{
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/helpers/RecordingModelListener.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/helpers/RecordingModelListener.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/helpers/RecordingModelListener.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/helpers/RecordingModelListener.java Mon Mar 4 20:38:29 2013
@@ -29,7 +29,7 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.List;
-import junit.framework.Assert;
+import org.junit.Assert;
/**
* Class to listen to model changes and record them for testing.
*/
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/ConcurrencyTest.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/ConcurrencyTest.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/ConcurrencyTest.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/ConcurrencyTest.java Mon Mar 4 20:38:29 2013
@@ -24,7 +24,7 @@ import java.lang.management.ThreadMXBean
import java.util.concurrent.ExecutorService ;
import java.util.concurrent.Executors ;
-import junit.framework.Assert ;
+import org.junit.Assert ;
import junit.framework.TestCase ;
import junit.framework.TestSuite ;
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/OWLWGTester.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/OWLWGTester.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/OWLWGTester.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/OWLWGTester.java Mon Mar 4 20:38:29 2013
@@ -23,7 +23,7 @@ import java.io.FileReader ;
import java.io.IOException ;
import java.io.Reader ;
-import junit.framework.Assert ;
+import org.junit.Assert ;
import junit.framework.TestCase ;
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/ReasonerTester.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/ReasonerTester.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/ReasonerTester.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/ReasonerTester.java Mon Mar 4 20:38:29 2013
@@ -18,21 +18,31 @@
package com.hp.hpl.jena.reasoner.test;
-import com.hp.hpl.jena.rdf.model.*;
-import com.hp.hpl.jena.graph.*;
-import com.hp.hpl.jena.rdf.model.impl.*;
-import com.hp.hpl.jena.reasoner.*;
-import com.hp.hpl.jena.reasoner.rulesys.Node_RuleVariable;
-import com.hp.hpl.jena.vocabulary.RDF;
+import java.io.BufferedReader ;
+import java.io.FileReader ;
+import java.io.IOException ;
+import java.io.Reader ;
+import java.util.* ;
-import com.hp.hpl.jena.shared.*;
+import junit.framework.TestCase ;
+import org.junit.Assert ;
+import org.slf4j.Logger ;
+import org.slf4j.LoggerFactory ;
-import junit.framework.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.*;
-import java.io.*;
+import com.hp.hpl.jena.graph.Factory ;
+import com.hp.hpl.jena.graph.Graph ;
+import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.Triple ;
+import com.hp.hpl.jena.rdf.model.* ;
+import com.hp.hpl.jena.rdf.model.impl.PropertyImpl ;
+import com.hp.hpl.jena.rdf.model.impl.ResourceImpl ;
+import com.hp.hpl.jena.reasoner.InfGraph ;
+import com.hp.hpl.jena.reasoner.Reasoner ;
+import com.hp.hpl.jena.reasoner.ReasonerFactory ;
+import com.hp.hpl.jena.reasoner.TriplePattern ;
+import com.hp.hpl.jena.reasoner.rulesys.Node_RuleVariable ;
+import com.hp.hpl.jena.shared.JenaException ;
+import com.hp.hpl.jena.vocabulary.RDF ;
/**
* A utility for loading a set of test reasoner problems and running defined
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/TestUtil.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/TestUtil.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/TestUtil.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/TestUtil.java Mon Mar 4 20:38:29 2013
@@ -18,12 +18,15 @@
package com.hp.hpl.jena.reasoner.test;
-import junit.framework.*;
-import java.util.Iterator;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import java.util.Iterator ;
-import com.hp.hpl.jena.rdf.model.*;
+import org.junit.Assert ;
+import junit.framework.TestCase ;
+import org.slf4j.Logger ;
+import org.slf4j.LoggerFactory ;
+
+import com.hp.hpl.jena.rdf.model.Resource ;
+import com.hp.hpl.jena.rdf.model.Statement ;
/**
* Collection of utilities to assist with unit testing.
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/WGReasonerTester.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/WGReasonerTester.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/WGReasonerTester.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/WGReasonerTester.java Mon Mar 4 20:38:29 2013
@@ -27,7 +27,7 @@ import java.util.ArrayList ;
import java.util.Iterator ;
import java.util.List ;
-import junit.framework.Assert ;
+import org.junit.Assert ;
import junit.framework.TestCase ;
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/util/TestUtil.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/util/TestUtil.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/util/TestUtil.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/util/TestUtil.java Mon Mar 4 20:38:29 2013
@@ -30,7 +30,7 @@ public class TestUtil
return new JUnit4TestAdapter(TestUtil.class) ;
}
- // Intermediate : JUNIt 3 and JUnit 4.
+ // Intermediate : JUnit 3 and JUnit 4.
@Test public void splitNS_01()
{ split("http://example/xyz", "http://example/", "xyz") ; }
Modified: jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/TestQuery.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/TestQuery.java?rev=1452495&r1=1452494&r2=1452495&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/TestQuery.java (original)
+++ jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/TestQuery.java Mon Mar 4 20:38:29 2013
@@ -22,7 +22,7 @@ import java.io.IOException ;
import java.net.HttpURLConnection ;
import java.net.URL ;
-import junit.framework.Assert ;
+import org.junit.Assert ;
import org.junit.AfterClass ;
import org.junit.BeforeClass ;
import org.junit.Test ;