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/08/23 20:13:25 UTC
svn commit: r1516961 - in
/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system:
TestIO_JenaReaders.java TestIO_JenaWriters.java
Author: andy
Date: Fri Aug 23 18:13:24 2013
New Revision: 1516961
URL: http://svn.apache.org/r1516961
Log:
JENA_520 and JENA-521 -- stablize testing by setting IO state after the tests run
Modified:
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestIO_JenaReaders.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestIO_JenaWriters.java
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestIO_JenaReaders.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestIO_JenaReaders.java?rev=1516961&r1=1516960&r2=1516961&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestIO_JenaReaders.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestIO_JenaReaders.java Fri Aug 23 18:13:24 2013
@@ -24,15 +24,21 @@ import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Properties;
+import org.apache.jena.riot.IO_Jena ;
import org.apache.jena.riot.adapters.JenaReadersWriters.RDFReaderRIOT_NT;
import org.apache.jena.riot.adapters.JenaReadersWriters.RDFReaderRIOT_RDFJSON;
import org.apache.jena.riot.adapters.JenaReadersWriters.RDFReaderRIOT_RDFXML;
import org.apache.jena.riot.adapters.JenaReadersWriters.RDFReaderRIOT_TTL;
+import org.junit.AfterClass ;
+import org.junit.BeforeClass ;
import org.junit.Test;
import com.hp.hpl.jena.rdf.model.impl.RDFReaderFImpl;
public class TestIO_JenaReaders {
+ @BeforeClass public static void beforeClass() { }
+ @AfterClass public static void afterClass() { IO_Jena.wireIntoJena(); }
+
private final class RDFReaderFImplExposingProtected extends RDFReaderFImpl {
public Map<String, String> defaultReaders() {
Map<String,String> defaults = new LinkedHashMap<String,String>();
@@ -81,7 +87,7 @@ public class TestIO_JenaReaders {
// And unregistered our additional langs
assertEquals("", readerF.getLangToClassName().get("RDF/JSON"));
-
+ IO_JenaReaders.wireIntoJena();
}
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestIO_JenaWriters.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestIO_JenaWriters.java?rev=1516961&r1=1516960&r2=1516961&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestIO_JenaWriters.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestIO_JenaWriters.java Fri Aug 23 18:13:24 2013
@@ -17,31 +17,38 @@
*/
package org.apache.jena.riot.system;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertEquals ;
+import static org.junit.Assert.assertFalse ;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Properties;
-
-import org.apache.jena.riot.adapters.JenaReadersWriters.RDFWriterRIOT_N3;
-import org.apache.jena.riot.adapters.JenaReadersWriters.RDFWriterRIOT_N3Plain;
-import org.apache.jena.riot.adapters.JenaReadersWriters.RDFWriterRIOT_N3Triples;
-import org.apache.jena.riot.adapters.JenaReadersWriters.RDFWriterRIOT_N3TriplesAlt;
-import org.apache.jena.riot.adapters.JenaReadersWriters.RDFWriterRIOT_N3_PP;
-import org.apache.jena.riot.adapters.JenaReadersWriters.RDFWriterRIOT_NTriples;
-import org.apache.jena.riot.adapters.JenaReadersWriters.RDFWriterRIOT_RDFJSON;
-import org.apache.jena.riot.adapters.JenaReadersWriters.RDFWriterRIOT_Turtle;
-import org.apache.jena.riot.adapters.JenaReadersWriters.RDFWriterRIOT_Turtle1;
-import org.apache.jena.riot.adapters.JenaReadersWriters.RDFWriterRIOT_Turtle2;
-import org.junit.Test;
-
-import com.hp.hpl.jena.n3.N3JenaWriter;
-import com.hp.hpl.jena.rdf.model.impl.RDFWriterFImpl;
-import com.hp.hpl.jena.xmloutput.impl.Abbreviated;
-import com.hp.hpl.jena.xmloutput.impl.Basic;
+import java.util.LinkedHashMap ;
+import java.util.Map ;
+import java.util.Properties ;
+
+import org.apache.jena.riot.IO_Jena ;
+import org.apache.jena.riot.adapters.JenaReadersWriters.RDFWriterRIOT_N3 ;
+import org.apache.jena.riot.adapters.JenaReadersWriters.RDFWriterRIOT_N3Plain ;
+import org.apache.jena.riot.adapters.JenaReadersWriters.RDFWriterRIOT_N3Triples ;
+import org.apache.jena.riot.adapters.JenaReadersWriters.RDFWriterRIOT_N3TriplesAlt ;
+import org.apache.jena.riot.adapters.JenaReadersWriters.RDFWriterRIOT_N3_PP ;
+import org.apache.jena.riot.adapters.JenaReadersWriters.RDFWriterRIOT_NTriples ;
+import org.apache.jena.riot.adapters.JenaReadersWriters.RDFWriterRIOT_RDFJSON ;
+import org.apache.jena.riot.adapters.JenaReadersWriters.RDFWriterRIOT_Turtle ;
+import org.apache.jena.riot.adapters.JenaReadersWriters.RDFWriterRIOT_Turtle1 ;
+import org.apache.jena.riot.adapters.JenaReadersWriters.RDFWriterRIOT_Turtle2 ;
+import org.junit.AfterClass ;
+import org.junit.BeforeClass ;
+import org.junit.Test ;
+
+import com.hp.hpl.jena.n3.N3JenaWriter ;
+import com.hp.hpl.jena.rdf.model.impl.RDFWriterFImpl ;
+import com.hp.hpl.jena.xmloutput.impl.Abbreviated ;
+import com.hp.hpl.jena.xmloutput.impl.Basic ;
public class TestIO_JenaWriters {
+
+ @BeforeClass public static void beforeClass() { }
+ @AfterClass public static void afterClass() { IO_Jena.wireIntoJena(); }
+
private final class RDFWriterFImplExposingProtected extends RDFWriterFImpl {
public Map<String, String> defaultWriters() {
Map<String,String> defaults = new LinkedHashMap<String,String>();
@@ -56,7 +63,7 @@ public class TestIO_JenaWriters {
}
@Test
- public void wireIntoJena() throws Exception {
+ public void testWireIntoJena() throws Exception {
IO_JenaWriters.wireIntoJena();
RDFWriterFImpl writerF = new RDFWriterFImpl();
assertEquals(Basic.class, writerF.getWriter().getClass());
@@ -82,7 +89,7 @@ public class TestIO_JenaWriters {
}
@Test
- public void resetJena() throws Exception {
+ public void testResetJena() throws Exception {
IO_JenaWriters.wireIntoJena();
IO_JenaWriters.resetJena();
RDFWriterFImplExposingProtected writerF = new RDFWriterFImplExposingProtected();
@@ -98,6 +105,7 @@ public class TestIO_JenaWriters {
assertEquals("", writerF.getLangToClassName().get("NT"));
assertEquals("", writerF.getLangToClassName().get("RDF/JSON"));
assertEquals("", writerF.getLangToClassName().get("RDFJSON"));
+ IO_JenaWriters.wireIntoJena();
}