You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by dj...@apache.org on 2014/08/03 21:28:01 UTC

svn commit: r1615441 [2/2] - in /felix/trunk/scr/src: main/java/org/apache/felix/scr/impl/config/ main/java/org/apache/felix/scr/impl/helper/ main/java/org/apache/felix/scr/impl/manager/ main/java/org/apache/felix/scr/impl/metadata/ test/java/org/apach...

Modified: felix/trunk/scr/src/test/java/org/apache/felix/scr/impl/metadata/ComponentMetadataTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/test/java/org/apache/felix/scr/impl/metadata/ComponentMetadataTest.java?rev=1615441&r1=1615440&r2=1615441&view=diff
==============================================================================
--- felix/trunk/scr/src/test/java/org/apache/felix/scr/impl/metadata/ComponentMetadataTest.java (original)
+++ felix/trunk/scr/src/test/java/org/apache/felix/scr/impl/metadata/ComponentMetadataTest.java Sun Aug  3 19:28:01 2014
@@ -505,7 +505,7 @@ public class ComponentMetadataTest exten
         // updated method accepted for DS 1.1-felix
         final ReferenceMetadata rm3 = createReferenceMetadata( "test" );
         rm3.setUpdated( "my_updated_method" );
-        final ComponentMetadata cm3 = createComponentMetadata( XmlHandler.DS_VERSION_1_1_FELIX, Boolean.TRUE, null );
+        final ComponentMetadata cm3 = createComponentMetadata( DSVersion.DS11Felix, Boolean.TRUE, null );
         cm3.addDependency( rm3 );
 
         // validates fine and logs no message
@@ -520,7 +520,7 @@ public class ComponentMetadataTest exten
         // updated method accepted for DS 1.2
         final ReferenceMetadata rm3 = createReferenceMetadata( "test" );
         rm3.setUpdated( "my_updated_method" );
-        final ComponentMetadata cm3 = createComponentMetadata( XmlHandler.DS_VERSION_1_2, Boolean.TRUE, null );
+        final ComponentMetadata cm3 = createComponentMetadata( DSVersion.DS12, Boolean.TRUE, null );
         cm3.addDependency( rm3 );
 
         // validates fine and logs no message
@@ -741,16 +741,16 @@ public class ComponentMetadataTest exten
 
     public void test_get_configuration_pid_method()
     {
-        doTest_get_configuration_pid_method(XmlHandler.DS_VERSION_1_0);
-        doTest_get_configuration_pid_method(XmlHandler.DS_VERSION_1_1);
-        doTest_get_configuration_pid_method(XmlHandler.DS_VERSION_1_2);
+        doTest_get_configuration_pid_method(DSVersion.DS10);
+        doTest_get_configuration_pid_method(DSVersion.DS11);
+        doTest_get_configuration_pid_method(DSVersion.DS12);
     }
 
-    private void doTest_get_configuration_pid_method(int specVersion)
+    private void doTest_get_configuration_pid_method(DSVersion specVersion)
     {
         // Make sure that getConfigurationPid returns the default component name (implementation class name).
         // We only do this kind of test if spec is greater than ds 1.0, because in ds 1.0, the component name is mandatory.
-        if (specVersion > XmlHandler.DS_VERSION_1_0)
+        if ( specVersion.isDS11() )
         {
             ComponentMetadata cm = new ComponentMetadata( specVersion );
             try
@@ -820,9 +820,9 @@ public class ComponentMetadataTest exten
 
 
     // Creates Component Metadata for the given namespace
-    private ComponentMetadata createComponentMetadata( int nameSpaceCode, Boolean immediate, String factory )
+    private ComponentMetadata createComponentMetadata( DSVersion dsVersion, Boolean immediate, String factory )
     {
-        ComponentMetadata meta = new ComponentMetadata( nameSpaceCode );
+        ComponentMetadata meta = new ComponentMetadata( dsVersion );
         meta.setName( "place.holder" );
         meta.setImplementationClassName( "place.holder.implementation" );
         if ( immediate != null )
@@ -840,20 +840,20 @@ public class ComponentMetadataTest exten
     // Creates DS 1.0 Component Metadata
     private ComponentMetadata createComponentMetadata( Boolean immediate, String factory )
     {
-        return createComponentMetadata( XmlHandler.DS_VERSION_1_0, immediate, factory );
+        return createComponentMetadata( DSVersion.DS10, immediate, factory );
     }
 
 
     // Creates DS 1.1 Component Metadata
     private ComponentMetadata createComponentMetadata11( Boolean immediate, String factory )
     {
-        return createComponentMetadata( XmlHandler.DS_VERSION_1_1, immediate, factory );
+        return createComponentMetadata( DSVersion.DS11, immediate, factory );
     }
 
     // Creates DS 1.2 Component Metadata
     private ComponentMetadata createComponentMetadata12( Boolean immediate, String factory )
     {
-        return createComponentMetadata( XmlHandler.DS_VERSION_1_2, immediate, factory );
+        return createComponentMetadata( DSVersion.DS12, immediate, factory );
     }
 
     private ServiceMetadata createServiceMetadata( Boolean serviceFactory )

Modified: felix/trunk/scr/src/test/java/org/apache/felix/scr/impl/metadata/XmlHandlerTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/test/java/org/apache/felix/scr/impl/metadata/XmlHandlerTest.java?rev=1615441&r1=1615440&r2=1615441&view=diff
==============================================================================
--- felix/trunk/scr/src/test/java/org/apache/felix/scr/impl/metadata/XmlHandlerTest.java (original)
+++ felix/trunk/scr/src/test/java/org/apache/felix/scr/impl/metadata/XmlHandlerTest.java Sun Aug  3 19:28:01 2014
@@ -97,7 +97,7 @@ public class XmlHandlerTest extends Test
         final List metadataList = readMetadataFromString( "<scr:component xmlns:scr=\"http://www.osgi.org/xmlns/scr/v1.0.0\" name=\"n\" ><implementation class=\"n\"/></scr:component>" );
         assertEquals( "1 Descriptor expected", 1, metadataList.size() );
         final ComponentMetadata metadata = ( ComponentMetadata ) metadataList.get( 0 );
-        assertEquals( "Expect NS 1.0.0", XmlHandler.DS_VERSION_1_0, metadata.getNamespaceCode() );
+        assertEquals( "Expect NS 1.0.0", DSVersion.DS10, metadata.getDSVersion() );
     }
 
 
@@ -106,7 +106,7 @@ public class XmlHandlerTest extends Test
         final List metadataList = readMetadataFromString( "<scr:component xmlns:scr=\"http://www.osgi.org/xmlns/scr/v1.1.0\" name=\"n\" ><implementation class=\"n\"/></scr:component>" );
         assertEquals( "1 Descriptor expected", 1, metadataList.size() );
         final ComponentMetadata metadata = ( ComponentMetadata ) metadataList.get( 0 );
-        assertEquals( "Expect NS 1.1.0", XmlHandler.DS_VERSION_1_1, metadata.getNamespaceCode() );
+        assertEquals( "Expect NS 1.1.0", DSVersion.DS11, metadata.getDSVersion() );
     }
 
 
@@ -115,7 +115,7 @@ public class XmlHandlerTest extends Test
         final List metadataList = readMetadataFromString( "<scr:component xmlns:scr=\"http://felix.apache.org/xmlns/scr/v1.1.0-felix\" name=\"n\" ><implementation class=\"n\"/></scr:component>" );
         assertEquals( "1 Descriptor expected", 1, metadataList.size() );
         final ComponentMetadata metadata = ( ComponentMetadata ) metadataList.get( 0 );
-        assertEquals( "Expect NS 1.1.0-felix", XmlHandler.DS_VERSION_1_1_FELIX, metadata.getNamespaceCode() );
+        assertEquals( "Expect NS 1.1.0-felix", DSVersion.DS11Felix, metadata.getDSVersion() );
     }
 
 
@@ -124,7 +124,7 @@ public class XmlHandlerTest extends Test
         final List metadataList = readMetadataFromString( "<scr:component xmlns:scr=\"http://www.osgi.org/xmlns/scr/v1.2.0\" name=\"n\" ><implementation class=\"n\"/></scr:component>" );
         assertEquals( "1 Descriptor expected", 1, metadataList.size() );
         final ComponentMetadata metadata = ( ComponentMetadata ) metadataList.get( 0 );
-        assertEquals( "Expect NS 1.2.0", XmlHandler.DS_VERSION_1_2, metadata.getNamespaceCode() );
+        assertEquals( "Expect NS 1.2.0", DSVersion.DS12, metadata.getDSVersion() );
     }
 
 
@@ -133,7 +133,7 @@ public class XmlHandlerTest extends Test
         final List metadataList = readMetadataFromString( "<scr:component xmlns:scr=\"http://felix.apache.org/xmlns/scr/v1.2.0-felix\" name=\"n\" ><implementation class=\"n\"/></scr:component>" );
         assertEquals( "1 Descriptor expected", 1, metadataList.size() );
         final ComponentMetadata metadata = ( ComponentMetadata ) metadataList.get( 0 );
-        assertEquals( "Expect NS 1.2.0-felix", XmlHandler.DS_VERSION_1_2_FELIX, metadata.getNamespaceCode() );
+        assertEquals( "Expect NS 1.2.0-felix", DSVersion.DS12Felix, metadata.getDSVersion() );
     }
 
 
@@ -150,7 +150,7 @@ public class XmlHandlerTest extends Test
         assertEquals( "1 Descriptor expected", 1, metadataList.size() );
 
         final ComponentMetadata metadata = ( ComponentMetadata ) metadataList.get( 0 );
-        assertEquals( "Expect NS 1.0.0", XmlHandler.DS_VERSION_1_0, metadata.getNamespaceCode() );
+        assertEquals( "Expect NS 1.0.0", DSVersion.DS10, metadata.getDSVersion() );
     }
 
 
@@ -168,7 +168,7 @@ public class XmlHandlerTest extends Test
         assertEquals( "Component Descriptors", 1, metadataList11.size() );
         final ComponentMetadata cm11 = ( ComponentMetadata ) metadataList11.get( 0 );
         cm11.validate( logger );
-        assertEquals( "DS Version 1.1", XmlHandler.DS_VERSION_1_1, cm11.getNamespaceCode() );
+        assertEquals( "DS Version 1.1", DSVersion.DS11, cm11.getDSVersion() );
         assertEquals( "Expected Activate Method set", "myactivate", cm11.getActivate() );
         assertTrue( "Activate method expected to be declared", cm11.isActivateDeclared() );
         assertEquals( "Expected Deactivate Method set", "mydeactivate", cm11.getDeactivate() );
@@ -234,8 +234,8 @@ public class XmlHandlerTest extends Test
         // dont validate this, we test the raw reading
 
         // ds namespace
-        assertEquals( "DS Version 1.0", XmlHandler.DS_VERSION_1_0, cm10.getNamespaceCode() );
-        assertFalse( "DS Version 1.0", cm10.isDS11() );
+        assertEquals( "DS Version 1.0", DSVersion.DS10, cm10.getDSVersion() );
+        assertFalse( "DS Version 1.0", cm10.getDSVersion().isDS11() );
 
         // base component attributes
         assertEquals( "component name", true, cm10.isEnabled() );
@@ -458,8 +458,8 @@ public class XmlHandlerTest extends Test
         // dont validate this, we test the raw reading
 
         // ds namespace
-        assertEquals( "DS Version 1.1", XmlHandler.DS_VERSION_1_1, cm11.getNamespaceCode() );
-        assertTrue( "DS Version 1.1", cm11.isDS11() );
+        assertEquals( "DS Version 1.1", DSVersion.DS11, cm11.getDSVersion() );
+        assertTrue( "DS Version 1.1", cm11.getDSVersion().isDS11() );
 
         assertEquals( "component name", "DummyClass", cm11.getName() );
         assertEquals( "component name", "DummyClass", cm11.getImplementationClassName() );