svn commit: r1621376 - in /stanbol/trunk/ontologymanager/registry/src/test/java/org/apache/stanbol/ontologymanager/registry: MockOsgiContext.java TestOntologyRegistry.java TestRegistryManager.java

[al...@apache.org]

Author: alexdma
Date: Fri Aug 29 19:53:01 2014
New Revision: 1621376

URL: http://svn.apache.org/r1621376
Log:
Modified ontology registry manager unit test configuration to conform to STANBOL-621 by replacing calls to Clerezza Parser.

Modified:
    stanbol/trunk/ontologymanager/registry/src/test/java/org/apache/stanbol/ontologymanager/registry/MockOsgiContext.java
    stanbol/trunk/ontologymanager/registry/src/test/java/org/apache/stanbol/ontologymanager/registry/TestOntologyRegistry.java
    stanbol/trunk/ontologymanager/registry/src/test/java/org/apache/stanbol/ontologymanager/registry/TestRegistryManager.java

Modified: stanbol/trunk/ontologymanager/registry/src/test/java/org/apache/stanbol/ontologymanager/registry/MockOsgiContext.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/registry/src/test/java/org/apache/stanbol/ontologymanager/registry/MockOsgiContext.java?rev=1621376&r1=1621375&r2=1621376&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/registry/src/test/java/org/apache/stanbol/ontologymanager/registry/MockOsgiContext.java (original)
+++ stanbol/trunk/ontologymanager/registry/src/test/java/org/apache/stanbol/ontologymanager/registry/MockOsgiContext.java Fri Aug 29 19:53:01 2014
@@ -19,10 +19,6 @@ package org.apache.stanbol.ontologymanag
 import org.apache.clerezza.rdf.core.access.TcManager;
 import org.apache.clerezza.rdf.core.serializedform.Parser;
 import org.apache.clerezza.rdf.core.serializedform.Serializer;
-import org.apache.clerezza.rdf.jena.parser.JenaParserProvider;
-import org.apache.clerezza.rdf.jena.serializer.JenaSerializerProvider;
-import org.apache.clerezza.rdf.rdfjson.parser.RdfJsonParsingProvider;
-import org.apache.clerezza.rdf.rdfjson.serializer.RdfJsonSerializingProvider;
 import org.apache.clerezza.rdf.simple.storage.SimpleTcProvider;
 
 public class MockOsgiContext {
@@ -30,7 +26,7 @@ public class MockOsgiContext {
     public static Parser parser = Parser.getInstance();
 
     public static TcManager tcManager;
-    
+
     public static Serializer serializer = Serializer.getInstance();
 
     static {

Modified: stanbol/trunk/ontologymanager/registry/src/test/java/org/apache/stanbol/ontologymanager/registry/TestOntologyRegistry.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/registry/src/test/java/org/apache/stanbol/ontologymanager/registry/TestOntologyRegistry.java?rev=1621376&r1=1621375&r2=1621376&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/registry/src/test/java/org/apache/stanbol/ontologymanager/registry/TestOntologyRegistry.java (original)
+++ stanbol/trunk/ontologymanager/registry/src/test/java/org/apache/stanbol/ontologymanager/registry/TestOntologyRegistry.java Fri Aug 29 19:53:01 2014
@@ -49,7 +49,8 @@ import org.semanticweb.owlapi.model.OWLO
 import org.semanticweb.owlapi.util.AutoIRIMapper;
 
 /**
- * Verifies the correct setup of ontology registries.
+ * Verifies the correct setup of ontology registries. As these objects are virtually unaware of the OSGi
+ * environment, the context is constructed using plain Java objects.
  */
 public class TestOntologyRegistry {
 
@@ -71,7 +72,7 @@ public class TestOntologyRegistry {
         OfflineConfiguration offline = new OfflineConfigurationImpl(config);
         // The registry manager can be updated via calls to createModel()
         regman = new RegistryManagerImpl(offline, new ClerezzaOntologyProvider(new SimpleTcProvider(),
-                offline, new Parser()), config);
+                offline, Parser.getInstance()), config);
     }
 
     /**

Modified: stanbol/trunk/ontologymanager/registry/src/test/java/org/apache/stanbol/ontologymanager/registry/TestRegistryManager.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/registry/src/test/java/org/apache/stanbol/ontologymanager/registry/TestRegistryManager.java?rev=1621376&r1=1621375&r2=1621376&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/registry/src/test/java/org/apache/stanbol/ontologymanager/registry/TestRegistryManager.java (original)
+++ stanbol/trunk/ontologymanager/registry/src/test/java/org/apache/stanbol/ontologymanager/registry/TestRegistryManager.java Fri Aug 29 19:53:01 2014
@@ -17,7 +17,6 @@
 package org.apache.stanbol.ontologymanager.registry;
 
 import static org.apache.stanbol.ontologymanager.registry.MockOsgiContext.parser;
-import static org.apache.stanbol.ontologymanager.registry.MockOsgiContext.reset;
 import static org.apache.stanbol.ontologymanager.registry.MockOsgiContext.tcManager;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -81,7 +80,7 @@ public class TestRegistryManager {
                                   .toString()});
         offline = new OfflineConfigurationImpl(configuration);
 
-        reset();
+        MockOsgiContext.reset();
 
     }
 
@@ -94,7 +93,7 @@ public class TestRegistryManager {
 
     @After
     public void cleanup() throws Exception {
-        reset();
+        MockOsgiContext.reset();
         provider = new ClerezzaOntologyProvider(tcManager, offline, parser);
     }