Author: rwesten
Date: Thu Aug 28 13:26:54 2014
New Revision: 1621132
URL: http://svn.apache.org/r1621132
Log:
minor: fix for a similar failior as reported by
http://stanbol.markmail.org/thread/w7zddluhpo6rntz7
Modified:
stanbol/trunk/ontologymanager/sources/clerezza/src/test/java/org/apache/stanbol/ontologymanager/sources/clerezza/MockOsgiContext.java
stanbol/trunk/ontologymanager/sources/clerezza/src/test/java/org/apache/stanbol/ontologymanager/sources/clerezza/TestClerezzaInputSources.java
Modified:
stanbol/trunk/ontologymanager/sources/clerezza/src/test/java/org/apache/stanbol/ontologymanager/sources/clerezza/MockOsgiContext.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/sources/clerezza/src/test/java/org/apache/stanbol/ontologymanager/sources/clerezza/MockOsgiContext.java?rev=1621132&r1=1621131&r2=1621132&view=diff
==============================================================================
---
stanbol/trunk/ontologymanager/sources/clerezza/src/test/java/org/apache/stanbol/ontologymanager/sources/clerezza/MockOsgiContext.java
(original)
+++
stanbol/trunk/ontologymanager/sources/clerezza/src/test/java/org/apache/stanbol/ontologymanager/sources/clerezza/MockOsgiContext.java
Thu Aug 28 13:26:54 2014
@@ -38,34 +38,13 @@ import org.apache.clerezza.rdf.simple.st
*/
public class MockOsgiContext {
- private static Dictionary<String,Object> config;
+ private static Dictionary<String,Object> config = new
Hashtable<String,Object>();
- public static Parser parser;
+ public static Parser parser = Parser.getInstance();
- public static Serializer serializer;
+ public static Serializer serializer = Serializer.getInstance();
- public static TcManager tcManager;
+ public static TcManager tcManager = TcManager.getInstance();
- static {
- config = new Hashtable<String,Object>();
- reset();
- }
-
- /**
- * Sets up a new mock OSGi context and cleans all resources and components.
- */
- public static void reset() {
- // reset Clerezza objects
- tcManager = new TcManager();
- tcManager.addWeightedTcProvider(new SimpleTcProvider());
- parser = new Parser(); // add Jena-supported formats + RDF/JSON
- parser.bindParsingProvider(new JenaParserProvider());
- parser.bindParsingProvider(new RdfJsonParsingProvider());
- serializer = new Serializer(); // add Jena-supported formats + RDF/JSON
- serializer.bindSerializingProvider(new JenaSerializerProvider());
- serializer.bindSerializingProvider(new RdfJsonSerializingProvider());
-
- // reset Stanbol objects
- }
}
Modified:
stanbol/trunk/ontologymanager/sources/clerezza/src/test/java/org/apache/stanbol/ontologymanager/sources/clerezza/TestClerezzaInputSources.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/sources/clerezza/src/test/java/org/apache/stanbol/ontologymanager/sources/clerezza/TestClerezzaInputSources.java?rev=1621132&r1=1621131&r2=1621132&view=diff
==============================================================================
---
stanbol/trunk/ontologymanager/sources/clerezza/src/test/java/org/apache/stanbol/ontologymanager/sources/clerezza/TestClerezzaInputSources.java
(original)
+++
stanbol/trunk/ontologymanager/sources/clerezza/src/test/java/org/apache/stanbol/ontologymanager/sources/clerezza/TestClerezzaInputSources.java
Thu Aug 28 13:26:54 2014
@@ -17,7 +17,6 @@
package org.apache.stanbol.ontologymanager.sources.clerezza;
import static
org.apache.stanbol.ontologymanager.sources.clerezza.MockOsgiContext.parser;
-import static
org.apache.stanbol.ontologymanager.sources.clerezza.MockOsgiContext.reset;
import static
org.apache.stanbol.ontologymanager.sources.clerezza.MockOsgiContext.tcManager;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
@@ -49,7 +48,7 @@ public class TestClerezzaInputSources {
@BeforeClass
public static void loadGraphs() throws Exception {
- reset();
+ //nothing to do
}
private String dummy_RdfXml = "/ontologies/dummy-01.rdfxml.rdf";
@@ -77,7 +76,7 @@ public class TestClerezzaInputSources {
@After
public void cleanup() {
- reset();
+ //nothing to do
}
/*
