You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by fm...@apache.org on 2009/07/09 12:29:20 UTC
svn commit: r792486 - in /felix/trunk/scr/src/test:
java/org/apache/felix/scr/impl/ resources/
Author: fmeschbe
Date: Thu Jul 9 10:29:19 2009
New Revision: 792486
URL: http://svn.apache.org/viewvc?rev=792486&view=rev
Log:
FELIX-1284 unit tests for new "modified" attribute
Modified:
felix/trunk/scr/src/test/java/org/apache/felix/scr/impl/ComponentMetadataTest.java
felix/trunk/scr/src/test/java/org/apache/felix/scr/impl/XmlHandlerTest.java
felix/trunk/scr/src/test/resources/components_activate_10.xml
felix/trunk/scr/src/test/resources/components_activate_11.xml
felix/trunk/scr/src/test/resources/components_all_elements_10.xml
Modified: felix/trunk/scr/src/test/java/org/apache/felix/scr/impl/ComponentMetadataTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/test/java/org/apache/felix/scr/impl/ComponentMetadataTest.java?rev=792486&r1=792485&r2=792486&view=diff
==============================================================================
--- felix/trunk/scr/src/test/java/org/apache/felix/scr/impl/ComponentMetadataTest.java (original)
+++ felix/trunk/scr/src/test/java/org/apache/felix/scr/impl/ComponentMetadataTest.java Thu Jul 9 10:29:19 2009
@@ -302,7 +302,7 @@
assertEquals( "Deactivate method name", "deactivate", cm1.getDeactivate() );
final ComponentMetadata cm2 = createComponentMetadata( Boolean.TRUE, null );
- cm2.setActivate( "someMethod" );
+ cm2.setDeactivate( "someMethod" );
cm2.validate( logger );
assertEquals( "Deactivate method name", "deactivate", cm2.getDeactivate() );
}
@@ -321,6 +321,32 @@
}
+ public void test_component_modified_ds10()
+ {
+ final ComponentMetadata cm1 = createComponentMetadata( Boolean.TRUE, null );
+ cm1.validate( logger );
+ assertNull( "Modified method name", cm1.getModified() );
+
+ final ComponentMetadata cm2 = createComponentMetadata( Boolean.TRUE, null );
+ cm2.setModified( "someName" );
+ cm2.validate( logger );
+ assertNull( "Modified method name", cm2.getModified() );
+ }
+
+
+ public void test_component_modified_ds11()
+ {
+ final ComponentMetadata cm1 = createComponentMetadata11( Boolean.TRUE, null );
+ cm1.validate( logger );
+ assertNull( "Modified method name", cm1.getModified() );
+
+ final ComponentMetadata cm2 = createComponentMetadata11( Boolean.TRUE, null );
+ cm2.setModified( "someMethod" );
+ cm2.validate( logger );
+ assertEquals( "Modified method name", "someMethod", cm2.getModified() );
+ }
+
+
public void test_component_configuration_policy_ds10()
{
final ComponentMetadata cm1 = createComponentMetadata( Boolean.TRUE, null );
Modified: felix/trunk/scr/src/test/java/org/apache/felix/scr/impl/XmlHandlerTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/test/java/org/apache/felix/scr/impl/XmlHandlerTest.java?rev=792486&r1=792485&r2=792486&view=diff
==============================================================================
--- felix/trunk/scr/src/test/java/org/apache/felix/scr/impl/XmlHandlerTest.java (original)
+++ felix/trunk/scr/src/test/java/org/apache/felix/scr/impl/XmlHandlerTest.java Thu Jul 9 10:29:19 2009
@@ -55,6 +55,7 @@
assertEquals( "DS Version 1.0", XmlHandler.DS_VERSION_1_0, cm10.getNamespaceCode() );
assertEquals( "Expected Activate Method not set", "activate", cm10.getActivate() );
assertEquals( "Expected Deactivate Method not set", "deactivate", cm10.getDeactivate() );
+ assertNull( "Expected Modified Method not set", cm10.getModified() );
assertEquals( "Expected Configuration Policy not set", ComponentMetadata.CONFIGURATION_POLICY_OPTIONAL, cm10
.getConfigurationPolicy() );
@@ -65,6 +66,7 @@
assertEquals( "DS Version 1.1", XmlHandler.DS_VERSION_1_1, cm11.getNamespaceCode() );
assertEquals( "Expected Activate Method set", "myactivate", cm11.getActivate() );
assertEquals( "Expected Deactivate Method set", "mydeactivate", cm11.getDeactivate() );
+ assertEquals( "Expected Modified Method set", "mymodified", cm11.getModified() );
assertEquals( "Expected Configuration Policy set", ComponentMetadata.CONFIGURATION_POLICY_IGNORE, cm11
.getConfigurationPolicy() );
}
@@ -137,6 +139,7 @@
// ds 1.1 elements
assertEquals( "activate method", "myactivate", cm10.getActivate() );
assertEquals( "deactivate method", "mydeactivate", cm10.getDeactivate() );
+ assertEquals( "modified method", "mymodified", cm10.getModified() );
assertEquals( "configuration policy", "ignore", cm10.getConfigurationPolicy() );
// from the implementation element
Modified: felix/trunk/scr/src/test/resources/components_activate_10.xml
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/test/resources/components_activate_10.xml?rev=792486&r1=792485&r2=792486&view=diff
==============================================================================
--- felix/trunk/scr/src/test/resources/components_activate_10.xml (original)
+++ felix/trunk/scr/src/test/resources/components_activate_10.xml Thu Jul 9 10:29:19 2009
@@ -19,7 +19,7 @@
-->
<components>
<scr:component name="components.activate.10"
- activate="myactivate" deactivate="mydeactivate"
+ activate="myactivate" deactivate="mydeactivate" modified="mymodified"
configuration-policy="ignore" xmlns:scr="http://www.osgi.org/xmlns/scr/v1.0.0">
<implementation class="components.activate.10" />
</scr:component>
Modified: felix/trunk/scr/src/test/resources/components_activate_11.xml
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/test/resources/components_activate_11.xml?rev=792486&r1=792485&r2=792486&view=diff
==============================================================================
--- felix/trunk/scr/src/test/resources/components_activate_11.xml (original)
+++ felix/trunk/scr/src/test/resources/components_activate_11.xml Thu Jul 9 10:29:19 2009
@@ -19,7 +19,7 @@
-->
<components>
<scr:component name="components.activate.11"
- activate="myactivate" deactivate="mydeactivate"
+ activate="myactivate" deactivate="mydeactivate" modified="mymodified"
configuration-policy="ignore" xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0">
<implementation class="components.activate.11" />
</scr:component>
Modified: felix/trunk/scr/src/test/resources/components_all_elements_10.xml
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/test/resources/components_all_elements_10.xml?rev=792486&r1=792485&r2=792486&view=diff
==============================================================================
--- felix/trunk/scr/src/test/resources/components_all_elements_10.xml (original)
+++ felix/trunk/scr/src/test/resources/components_all_elements_10.xml Thu Jul 9 10:29:19 2009
@@ -46,6 +46,7 @@
activate="myactivate"
deactivate="mydeactivate"
+ modified="mymodified"
configuration-policy="ignore"
>