You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2017/08/02 08:41:00 UTC
svn commit: r1803781 - in /felix/trunk/osgi-r7/scr/src:
main/java/org/apache/felix/scr/impl/
main/java/org/apache/felix/scr/impl/metadata/
test/java/org/apache/felix/scr/impl/inject/
test/java/org/apache/felix/scr/impl/inject/methods/ test/java/org/apa...
Author: cziegeler
Date: Wed Aug 2 08:41:00 2017
New Revision: 1803781
URL: http://svn.apache.org/viewvc?rev=1803781&view=rev
Log:
Remove unused logger parameter
Modified:
felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/BundleComponentActivator.java
felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/metadata/ComponentMetadata.java
felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/metadata/ReferenceMetadata.java
felix/trunk/osgi-r7/scr/src/test/java/org/apache/felix/scr/impl/inject/BindMethodTest.java
felix/trunk/osgi-r7/scr/src/test/java/org/apache/felix/scr/impl/inject/methods/ActivateMethodTest.java
felix/trunk/osgi-r7/scr/src/test/java/org/apache/felix/scr/impl/manager/ConfiguredComponentHolderTest.java
felix/trunk/osgi-r7/scr/src/test/java/org/apache/felix/scr/impl/manager/SingleComponentManagerTest.java
felix/trunk/osgi-r7/scr/src/test/java/org/apache/felix/scr/impl/metadata/ComponentMetadataTest.java
felix/trunk/osgi-r7/scr/src/test/java/org/apache/felix/scr/impl/metadata/XmlHandlerTest.java
Modified: felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/BundleComponentActivator.java
URL: http://svn.apache.org/viewvc/felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/BundleComponentActivator.java?rev=1803781&r1=1803780&r2=1803781&view=diff
==============================================================================
--- felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/BundleComponentActivator.java (original)
+++ felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/BundleComponentActivator.java Wed Aug 2 08:41:00 2017
@@ -452,7 +452,7 @@ public class BundleComponentActivator im
}
// validate the component metadata
- metadata.validate( this );
+ metadata.validate( );
// Request creation of the component manager
ComponentHolder<?> holder = m_componentRegistry.createComponentHolder( this, metadata );
Modified: felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/metadata/ComponentMetadata.java
URL: http://svn.apache.org/viewvc/felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/metadata/ComponentMetadata.java?rev=1803781&r1=1803780&r2=1803781&view=diff
==============================================================================
--- felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/metadata/ComponentMetadata.java (original)
+++ felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/metadata/ComponentMetadata.java Wed Aug 2 08:41:00 2017
@@ -57,7 +57,7 @@ public class ComponentMetadata
/** If the activate method has this value, a constructor is used instead. */
private static final String CONSTRUCTOR_MARKER = "-init-";
-
+
// the namespace code of the namespace declaring this component
private final DSVersion m_dsVersion;
@@ -101,7 +101,7 @@ public class ComponentMetadata
// activation fields (since DS 1.4)
private List<String> m_activationFields;
-
+
// Associated properties (0..*)
private final Map<String, Object> m_properties = new HashMap<String, Object>();
@@ -338,7 +338,7 @@ public class ComponentMetadata
*
* @param newProperty a property metadata object
*/
- public void addFactoryProperty( PropertyMetadata newProperty )
+ public void addFactoryProperty( PropertyMetadata newProperty )
{
if ( m_validated )
{
@@ -439,7 +439,7 @@ public class ComponentMetadata
- public void setActivationFields( final String[] fields )
+ public void setActivationFields( final String[] fields )
{
if ( m_validated )
{
@@ -628,7 +628,7 @@ public class ComponentMetadata
{
return CONSTRUCTOR_MARKER.equals(m_activate);
}
-
+
/**
* Returns the names of the activation fields
*
@@ -640,7 +640,7 @@ public class ComponentMetadata
return m_activationFields;
}
-
+
/**
* Returns the name of the deactivate method
*
@@ -720,7 +720,7 @@ public class ComponentMetadata
return m_factoryProperties;
}
-
+
/**
* Returns the list of property meta data.
* <b>Note: This method is intended for unit testing only</b>
@@ -744,7 +744,7 @@ public class ComponentMetadata
return m_factoryPropertyMetaData;
}
-
+
/**
* Returns the dependency descriptors
*
@@ -824,7 +824,7 @@ public class ComponentMetadata
/**
* Method used to verify if the semantics of this metadata are correct
*/
- public void validate( Logger logger )
+ public void validate( )
{
// nothing to do if already validated
if ( m_validated )
@@ -941,9 +941,9 @@ public class ComponentMetadata
m_propertyMetaData.clear();
// Next check if the factory properties are valid (and extract property values)
- if ( !m_dsVersion.isDS14() && !m_factoryPropertyMetaData.isEmpty() )
+ if ( !m_dsVersion.isDS14() && !m_factoryPropertyMetaData.isEmpty() )
{
- throw validationFailure( "Use of factory properties requires DS 1.4 or later namespace " );
+ throw validationFailure( "Use of factory properties requires DS 1.4 or later namespace " );
}
if ( m_dsVersion.isDS14() && isFactory() )
{
@@ -970,7 +970,7 @@ public class ComponentMetadata
Set<String> refs = new HashSet<String>();
for ( ReferenceMetadata refMeta: m_references )
{
- refMeta.validate( this, logger );
+ refMeta.validate( this );
// flag duplicates
if ( !refs.add( refMeta.getName() ) )
@@ -1017,35 +1017,35 @@ public class ComponentMetadata
{
throw validationFailure( "Activation fields require version 1.4 or later");
}
-
+
// constructor injection requires DS 1.4
if ( this.isActivateConstructor() )
{
if ( !m_dsVersion.isDS14() )
{
- throw validationFailure( "Constructor injection requires version 1.4 or later");
+ throw validationFailure( "Constructor injection requires version 1.4 or later");
}
final Set<Integer> parIndexSet = new HashSet<Integer>();
- for(final ReferenceMetadata ref : this.m_references)
+ for(final ReferenceMetadata ref : this.m_references)
{
- if ( ref.getParameterIndex() != null && !parIndexSet.add(ref.getParameterIndex()) )
+ if ( ref.getParameterIndex() != null && !parIndexSet.add(ref.getParameterIndex()) )
{
- throw validationFailure( "Duplicate reference for argument " + ref.getParameterIndex() + " in constructor" );
+ throw validationFailure( "Duplicate reference for argument " + ref.getParameterIndex() + " in constructor" );
}
}
}
else
{
// no constructor injection, check references for having a parameter index
- for(final ReferenceMetadata ref : this.m_references)
+ for(final ReferenceMetadata ref : this.m_references)
{
if ( ref.getParameterIndex() != null )
{
- throw validationFailure( "Reference must not use parameter attribute if no constructor injection is used" );
+ throw validationFailure( "Reference must not use parameter attribute if no constructor injection is used" );
}
}
}
-
+
if (m_dsVersion == DSVersion.DS12Felix)
{
m_configurableServiceProperties = true;
Modified: felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/metadata/ReferenceMetadata.java
URL: http://svn.apache.org/viewvc/felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/metadata/ReferenceMetadata.java?rev=1803781&r1=1803780&r2=1803781&view=diff
==============================================================================
--- felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/metadata/ReferenceMetadata.java (original)
+++ felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/metadata/ReferenceMetadata.java Wed Aug 2 08:41:00 2017
@@ -21,8 +21,6 @@ package org.apache.felix.scr.impl.metada
import java.util.Set;
import java.util.TreeSet;
-import org.apache.felix.scr.impl.helper.Logger;
-
/**
* Information associated to a dependency
*
@@ -132,10 +130,10 @@ public class ReferenceMetadata
// Parameter value (optional, since DS 1.4)
private String m_parameter;
-
+
// Parameter index, set based on {@code m_parameter} after validation
private Integer m_parameterIndex;
-
+
// Flags that store the values passed as strings
private boolean m_isStatic = true;
private boolean m_isOptional = false;
@@ -544,11 +542,11 @@ public class ReferenceMetadata
* successful.
* @return The parameter index , if no parameter is set this returns {@code -null}
*/
- public Integer getParameterIndex()
+ public Integer getParameterIndex()
{
return m_parameterIndex;
}
-
+
// Getters for boolean values that determine both policy and cardinality
/**
@@ -629,7 +627,7 @@ public class ReferenceMetadata
* Method used to verify if the semantics of this metadata are correct
*
*/
- void validate(final ComponentMetadata componentMetadata, final Logger logger )
+ void validate(final ComponentMetadata componentMetadata )
{
final DSVersion dsVersion = componentMetadata.getDSVersion();
@@ -764,20 +762,20 @@ public class ReferenceMetadata
{
m_parameterIndex = Integer.valueOf(m_parameter);
}
- catch ( final NumberFormatException nfe)
+ catch ( final NumberFormatException nfe)
{
throw componentMetadata.validationFailure( "Reference parameter is not a number: " + m_parameter );
}
if ( m_parameterIndex < 0 )
{
- throw componentMetadata.validationFailure( "Reference parameter value must be zero or higher: " + m_parameter );
+ throw componentMetadata.validationFailure( "Reference parameter value must be zero or higher: " + m_parameter );
}
// policy needs to be static
- if ( !isStatic() )
+ if ( !isStatic() )
{
- throw componentMetadata.validationFailure( "Reference with parameter value must be static." );
-
- }
+ throw componentMetadata.validationFailure( "Reference with parameter value must be static." );
+
+ }
}
m_validated = true;
}
Modified: felix/trunk/osgi-r7/scr/src/test/java/org/apache/felix/scr/impl/inject/BindMethodTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/osgi-r7/scr/src/test/java/org/apache/felix/scr/impl/inject/BindMethodTest.java?rev=1803781&r1=1803780&r2=1803781&view=diff
==============================================================================
--- felix/trunk/osgi-r7/scr/src/test/java/org/apache/felix/scr/impl/inject/BindMethodTest.java (original)
+++ felix/trunk/osgi-r7/scr/src/test/java/org/apache/felix/scr/impl/inject/BindMethodTest.java Wed Aug 2 08:41:00 2017
@@ -490,7 +490,7 @@ public class BindMethodTest extends Test
ComponentMetadata metadata = new ComponentMetadata( DSVersion.DS11 );
metadata.setName("foo");
metadata.setImplementationClassName(Object.class.getName());
- metadata.validate(null);
+ metadata.validate();
return metadata;
}
Modified: felix/trunk/osgi-r7/scr/src/test/java/org/apache/felix/scr/impl/inject/methods/ActivateMethodTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/osgi-r7/scr/src/test/java/org/apache/felix/scr/impl/inject/methods/ActivateMethodTest.java?rev=1803781&r1=1803780&r2=1803781&view=diff
==============================================================================
--- felix/trunk/osgi-r7/scr/src/test/java/org/apache/felix/scr/impl/inject/methods/ActivateMethodTest.java (original)
+++ felix/trunk/osgi-r7/scr/src/test/java/org/apache/felix/scr/impl/inject/methods/ActivateMethodTest.java Wed Aug 2 08:41:00 2017
@@ -336,7 +336,7 @@ public class ActivateMethodTest extends
ComponentMetadata metadata = new ComponentMetadata( DSVersion.DS11 );
metadata.setName("foo");
metadata.setImplementationClassName(Object.class.getName());
- metadata.validate(null);
+ metadata.validate();
return metadata;
}
Modified: felix/trunk/osgi-r7/scr/src/test/java/org/apache/felix/scr/impl/manager/ConfiguredComponentHolderTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/osgi-r7/scr/src/test/java/org/apache/felix/scr/impl/manager/ConfiguredComponentHolderTest.java?rev=1803781&r1=1803780&r2=1803781&view=diff
==============================================================================
--- felix/trunk/osgi-r7/scr/src/test/java/org/apache/felix/scr/impl/manager/ConfiguredComponentHolderTest.java (original)
+++ felix/trunk/osgi-r7/scr/src/test/java/org/apache/felix/scr/impl/manager/ConfiguredComponentHolderTest.java Wed Aug 2 08:41:00 2017
@@ -24,14 +24,14 @@ import java.util.Hashtable;
import java.util.List;
import java.util.Map;
-import junit.framework.TestCase;
-
import org.apache.felix.scr.impl.inject.ComponentMethods;
import org.apache.felix.scr.impl.inject.ComponentMethodsImpl;
import org.apache.felix.scr.impl.metadata.ComponentMetadata;
import org.apache.felix.scr.impl.metadata.DSVersion;
import org.apache.felix.scr.impl.metadata.TargetedPID;
+import junit.framework.TestCase;
+
public class ConfiguredComponentHolderTest extends TestCase
{
@@ -98,7 +98,7 @@ public class ConfiguredComponentHolderTe
final String name = "test.factory";
final ComponentMetadata cm = createComponentMetadata( name );
final TestingConfiguredComponentHolder holder = new TestingConfiguredComponentHolder( cm );
-
+
holder.enableComponents(false);
// assert single component and no map
@@ -164,7 +164,7 @@ public class ConfiguredComponentHolderTe
final ComponentMetadata metadata = new ComponentMetadata( DSVersion.DS11 );
metadata.setName( name );
metadata.setImplementationClassName(Object.class.getName());
- metadata.validate(null);
+ metadata.validate();
return metadata;
}
@@ -191,11 +191,13 @@ public class ConfiguredComponentHolderTe
}
+ @Override
protected SingleComponentManager createComponentManager(boolean factoryConfiguration)
{
return new MockImmediateComponentManager( this );
}
+ @Override
protected ComponentMethods createComponentMethods() {
return new ComponentMethodsImpl();
}
Modified: felix/trunk/osgi-r7/scr/src/test/java/org/apache/felix/scr/impl/manager/SingleComponentManagerTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/osgi-r7/scr/src/test/java/org/apache/felix/scr/impl/manager/SingleComponentManagerTest.java?rev=1803781&r1=1803780&r2=1803781&view=diff
==============================================================================
--- felix/trunk/osgi-r7/scr/src/test/java/org/apache/felix/scr/impl/manager/SingleComponentManagerTest.java (original)
+++ felix/trunk/osgi-r7/scr/src/test/java/org/apache/felix/scr/impl/manager/SingleComponentManagerTest.java Wed Aug 2 08:41:00 2017
@@ -189,7 +189,7 @@ public class SingleComponentManagerTest
public void testGetService() throws Exception {
ComponentMetadata cm = new ComponentMetadata(DSVersion.DS13);
cm.setImplementationClassName("foo.bar.SomeClass");
- cm.validate(null);
+ cm.validate();
@SuppressWarnings("unchecked")
ComponentContainer<Object> cc = Mockito.mock(ComponentContainer.class);
@@ -231,7 +231,7 @@ public class SingleComponentManagerTest
{
ComponentMetadata cm = new ComponentMetadata(DSVersion.DS13);
cm.setImplementationClassName("foo.bar.SomeClass");
- cm.validate(null);
+ cm.validate();
@SuppressWarnings("unchecked")
ComponentContainer<Object> cc = Mockito.mock(ComponentContainer.class);
Modified: felix/trunk/osgi-r7/scr/src/test/java/org/apache/felix/scr/impl/metadata/ComponentMetadataTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/osgi-r7/scr/src/test/java/org/apache/felix/scr/impl/metadata/ComponentMetadataTest.java?rev=1803781&r1=1803780&r2=1803781&view=diff
==============================================================================
--- felix/trunk/osgi-r7/scr/src/test/java/org/apache/felix/scr/impl/metadata/ComponentMetadataTest.java (original)
+++ felix/trunk/osgi-r7/scr/src/test/java/org/apache/felix/scr/impl/metadata/ComponentMetadataTest.java Wed Aug 2 08:41:00 2017
@@ -22,17 +22,14 @@ package org.apache.felix.scr.impl.metada
import java.lang.reflect.Array;
import java.util.List;
-import junit.framework.TestCase;
-
-import org.apache.felix.scr.impl.MockLogger;
import org.osgi.service.component.ComponentException;
+import junit.framework.TestCase;
+
public class ComponentMetadataTest extends TestCase
{
- private MockLogger logger = new MockLogger();
-
// test various combinations of component metadata with respect to
// -- immediate: true, false, unset
@@ -44,24 +41,24 @@ public class ComponentMetadataTest exten
{
// immediate is default true if no service element is defined
final ComponentMetadata cm0 = createComponentMetadata( null, null );
- cm0.validate( logger );
+ cm0.validate( );
assertTrue( "Component without service must be immediate", cm0.isImmediate() );
// immediate is explicit true
final ComponentMetadata cm1 = createComponentMetadata( Boolean.TRUE, null );
- cm1.validate( logger );
+ cm1.validate( );
assertTrue( "Component must be immediate", cm1.isImmediate() );
// immediate is explicit true
final ComponentMetadata cm2 = createComponentMetadata( Boolean.TRUE, null );
cm2.setService( createServiceMetadata( null ) );
- cm2.validate( logger );
+ cm2.validate( );
assertTrue( "Component must be immediate", cm2.isImmediate() );
// immediate is explicit true
final ComponentMetadata cm3 = createComponentMetadata( Boolean.TRUE, null );
cm3.setService( createServiceMetadata( Boolean.FALSE ) );
- cm3.validate( logger );
+ cm3.validate( );
assertTrue( "Component must be immediate", cm3.isImmediate() );
// validation failure of immediate with service factory
@@ -69,7 +66,7 @@ public class ComponentMetadataTest exten
cm4.setService( createServiceMetadata( Boolean.TRUE ) );
try
{
- cm4.validate( logger );
+ cm4.validate( );
fail( "Expect validation failure for immediate service factory" );
}
catch ( ComponentException ce )
@@ -84,44 +81,44 @@ public class ComponentMetadataTest exten
// immediate is default false if service element is defined
final ComponentMetadata cm0 = createComponentMetadata( null, null );
cm0.setService( createServiceMetadata( null ) );
- cm0.validate( logger );
+ cm0.validate( );
assertFalse( "Component with service must be delayed", cm0.isImmediate() );
// immediate is default false if service element is defined
final ComponentMetadata cm1 = createComponentMetadata( null, null );
cm1.setService( createServiceMetadata( Boolean.TRUE ) );
- cm1.validate( logger );
+ cm1.validate( );
assertFalse( "Component with service must be delayed", cm1.isImmediate() );
// immediate is default false if service element is defined
final ComponentMetadata cm2 = createComponentMetadata( null, null );
cm2.setService( createServiceMetadata( Boolean.FALSE ) );
- cm2.validate( logger );
+ cm2.validate( );
assertFalse( "Component with service must be delayed", cm2.isImmediate() );
// immediate is false if service element is defined
final ComponentMetadata cm3 = createComponentMetadata( Boolean.FALSE, null );
cm3.setService( createServiceMetadata( null ) );
- cm3.validate( logger );
+ cm3.validate( );
assertFalse( "Component with service must be delayed", cm3.isImmediate() );
// immediate is false if service element is defined
final ComponentMetadata cm4 = createComponentMetadata( Boolean.FALSE, null );
cm4.setService( createServiceMetadata( Boolean.TRUE ) );
- cm4.validate( logger );
+ cm4.validate( );
assertFalse( "Component with service must be delayed", cm4.isImmediate() );
// immediate is false if service element is defined
final ComponentMetadata cm5 = createComponentMetadata( Boolean.FALSE, null );
cm5.setService( createServiceMetadata( Boolean.FALSE ) );
- cm5.validate( logger );
+ cm5.validate( );
assertFalse( "Component with service must be delayed", cm5.isImmediate() );
// explicit delayed fails when there is no service
final ComponentMetadata cm6 = createComponentMetadata( Boolean.FALSE, null );
try
{
- cm6.validate( logger );
+ cm6.validate( );
fail( "Expect validation failure for delayed component without service" );
}
catch ( ComponentException ce )
@@ -135,19 +132,19 @@ public class ComponentMetadataTest exten
{
// immediate is default false if factory is defined
final ComponentMetadata cm0 = createComponentMetadata( null, "factory" );
- cm0.validate( logger );
+ cm0.validate( );
assertFalse( "Component with factory must be delayed", cm0.isImmediate() );
// immediate is false if factory is defined
final ComponentMetadata cm1 = createComponentMetadata( Boolean.FALSE, "factory" );
- cm1.validate( logger );
+ cm1.validate( );
assertFalse( "Component with factory must be delayed", cm1.isImmediate() );
// immediate is default false if factory is defined
final ComponentMetadata cm2 = createComponentMetadata( Boolean.TRUE, "factory" );
try
{
- cm2.validate( logger );
+ cm2.validate( );
fail( "Expect validation failure for immediate factory component" );
}
catch ( ComponentException ce )
@@ -158,13 +155,13 @@ public class ComponentMetadataTest exten
// immediate is default false if factory is defined
final ComponentMetadata cm10 = createComponentMetadata( null, "factory" );
cm10.setService( createServiceMetadata( null ) );
- cm10.validate( logger );
+ cm10.validate( );
assertFalse( "Component with factory must be delayed", cm10.isImmediate() );
// immediate is false if factory is defined
final ComponentMetadata cm11 = createComponentMetadata( Boolean.FALSE, "factory" );
cm11.setService( createServiceMetadata( null ) );
- cm11.validate( logger );
+ cm11.validate( );
assertFalse( "Component with factory must be delayed", cm11.isImmediate() );
// immediate is default false if factory is defined
@@ -172,7 +169,7 @@ public class ComponentMetadataTest exten
cm12.setService( createServiceMetadata( null ) );
try
{
- cm12.validate( logger );
+ cm12.validate( );
fail( "Expect validation failure for immediate factory component" );
}
catch ( ComponentException ce )
@@ -183,13 +180,13 @@ public class ComponentMetadataTest exten
// immediate is default false if factory is defined
final ComponentMetadata cm20 = createComponentMetadata( null, "factory" );
cm20.setService( createServiceMetadata( Boolean.FALSE ) );
- cm20.validate( logger );
+ cm20.validate( );
assertFalse( "Component with factory must be delayed", cm20.isImmediate() );
// immediate is false if factory is defined
final ComponentMetadata cm21 = createComponentMetadata( Boolean.FALSE, "factory" );
cm21.setService( createServiceMetadata( Boolean.FALSE ) );
- cm21.validate( logger );
+ cm21.validate( );
assertFalse( "Component with factory must be delayed", cm21.isImmediate() );
// immediate is default false if factory is defined
@@ -197,7 +194,7 @@ public class ComponentMetadataTest exten
cm22.setService( createServiceMetadata( Boolean.FALSE ) );
try
{
- cm22.validate( logger );
+ cm22.validate( );
fail( "Expect validation failure for immediate factory component" );
}
catch ( ComponentException ce )
@@ -210,7 +207,7 @@ public class ComponentMetadataTest exten
cm30.setService( createServiceMetadata( Boolean.TRUE ) );
try
{
- cm30.validate( logger );
+ cm30.validate( );
fail( "Expect validation failure for factory component with service factory" );
}
catch ( ComponentException ce )
@@ -223,7 +220,7 @@ public class ComponentMetadataTest exten
cm31.setService( createServiceMetadata( Boolean.TRUE ) );
try
{
- cm31.validate( logger );
+ cm31.validate( );
fail( "Expect validation failure for factory component with service factory" );
}
catch ( ComponentException ce )
@@ -236,7 +233,7 @@ public class ComponentMetadataTest exten
cm32.setService( createServiceMetadata( Boolean.TRUE ) );
try
{
- cm32.validate( logger );
+ cm32.validate( );
fail( "Expect validation failure for immediate factory component with service factory" );
}
catch ( ComponentException ce )
@@ -253,7 +250,7 @@ public class ComponentMetadataTest exten
cm1.setName( null );
try
{
- cm1.validate( logger );
+ cm1.validate( );
fail( "Expected validation failure for DS 1.0 component without name" );
}
catch ( ComponentException ce )
@@ -267,7 +264,7 @@ public class ComponentMetadataTest exten
{
final ComponentMetadata cm1 = createComponentMetadata11( Boolean.TRUE, null );
cm1.setName( null );
- cm1.validate( logger );
+ cm1.validate( );
assertEquals( "Expected name to equal implementation class name", cm1.getImplementationClassName(),
cm1.getName() );
}
@@ -276,26 +273,26 @@ public class ComponentMetadataTest exten
public void test_component_activate_ds10()
{
final ComponentMetadata cm1 = createComponentMetadata( Boolean.TRUE, null );
- cm1.validate( logger );
+ cm1.validate( );
assertEquals( "Activate method name", "activate", cm1.getActivate() );
assertFalse( "Activate method expected to not be declared", cm1.isActivateDeclared() );
final ComponentMetadata cm2 = createComponentMetadata( Boolean.TRUE, null );
cm2.setActivate( "someMethod" );
- failDS10Validation( cm2, "activate", logger );
+ failDS10Validation( cm2, "activate" );
}
public void test_component_activate_ds11()
{
final ComponentMetadata cm1 = createComponentMetadata11( Boolean.TRUE, null );
- cm1.validate( logger );
+ cm1.validate( );
assertEquals( "Activate method name", "activate", cm1.getActivate() );
assertFalse( "Activate method expected to not be declared", cm1.isActivateDeclared() );
final ComponentMetadata cm2 = createComponentMetadata11( Boolean.TRUE, null );
cm2.setActivate( "someMethod" );
- cm2.validate( logger );
+ cm2.validate( );
assertEquals( "Activate method name", "someMethod", cm2.getActivate() );
assertTrue( "Activate method expected to be declared", cm2.isActivateDeclared() );
}
@@ -304,26 +301,26 @@ public class ComponentMetadataTest exten
public void test_component_deactivate_ds10()
{
final ComponentMetadata cm1 = createComponentMetadata( Boolean.TRUE, null );
- cm1.validate( logger );
+ cm1.validate( );
assertEquals( "Deactivate method name", "deactivate", cm1.getDeactivate() );
assertFalse( "Deactivate method expected to not be declared", cm1.isDeactivateDeclared() );
final ComponentMetadata cm2 = createComponentMetadata( Boolean.TRUE, null );
cm2.setDeactivate( "someMethod" );
- failDS10Validation( cm2, "deactivate", logger );
+ failDS10Validation( cm2, "deactivate" );
}
public void test_component_deactivate_ds11()
{
final ComponentMetadata cm1 = createComponentMetadata11( Boolean.TRUE, null );
- cm1.validate( logger );
+ cm1.validate( );
assertEquals( "Deactivate method name", "deactivate", cm1.getDeactivate() );
assertFalse( "Deactivate method expected to not be declared", cm1.isDeactivateDeclared() );
final ComponentMetadata cm2 = createComponentMetadata11( Boolean.TRUE, null );
cm2.setDeactivate( "someMethod" );
- cm2.validate( logger );
+ cm2.validate( );
assertEquals( "Deactivate method name", "someMethod", cm2.getDeactivate() );
assertTrue( "Deactivate method expected to be declared", cm2.isDeactivateDeclared() );
}
@@ -332,24 +329,24 @@ public class ComponentMetadataTest exten
public void test_component_modified_ds10()
{
final ComponentMetadata cm1 = createComponentMetadata( Boolean.TRUE, null );
- cm1.validate( logger );
+ cm1.validate( );
assertNull( "Modified method name", cm1.getModified() );
final ComponentMetadata cm2 = createComponentMetadata( Boolean.TRUE, null );
cm2.setModified( "someName" );
- failDS10Validation( cm2, "modified", logger );
+ failDS10Validation( cm2, "modified" );
}
public void test_component_modified_ds11()
{
final ComponentMetadata cm1 = createComponentMetadata11( Boolean.TRUE, null );
- cm1.validate( logger );
+ cm1.validate( );
assertNull( "Modified method name", cm1.getModified() );
final ComponentMetadata cm2 = createComponentMetadata11( Boolean.TRUE, null );
cm2.setModified( "someMethod" );
- cm2.validate( logger );
+ cm2.validate( );
assertEquals( "Modified method name", "someMethod", cm2.getModified() );
}
@@ -357,50 +354,50 @@ public class ComponentMetadataTest exten
public void test_component_configuration_policy_ds10()
{
final ComponentMetadata cm1 = createComponentMetadata( Boolean.TRUE, null );
- cm1.validate( logger );
+ cm1.validate( );
assertEquals( "Configuration policy", ComponentMetadata.CONFIGURATION_POLICY_OPTIONAL,
cm1.getConfigurationPolicy() );
final ComponentMetadata cm2 = createComponentMetadata( Boolean.TRUE, null );
cm2.setConfigurationPolicy( ComponentMetadata.CONFIGURATION_POLICY_IGNORE );
- failDS10Validation( cm2, "configuration-policy", logger );
+ failDS10Validation( cm2, "configuration-policy" );
final ComponentMetadata cm3 = createComponentMetadata( Boolean.TRUE, null );
cm3.setConfigurationPolicy( ComponentMetadata.CONFIGURATION_POLICY_OPTIONAL );
- failDS10Validation( cm3, "configuration-policy", logger );
+ failDS10Validation( cm3, "configuration-policy" );
final ComponentMetadata cm4 = createComponentMetadata( Boolean.TRUE, null );
cm4.setConfigurationPolicy( ComponentMetadata.CONFIGURATION_POLICY_REQUIRE );
- failDS10Validation( cm4, "configuration-policy", logger );
+ failDS10Validation( cm4, "configuration-policy" );
final ComponentMetadata cm5 = createComponentMetadata( Boolean.TRUE, null );
cm5.setConfigurationPolicy( "undefined" );
- failDS10Validation( cm5, "configuration-policy", logger );
+ failDS10Validation( cm5, "configuration-policy" );
}
public void test_component_configuration_policy_ds11()
{
final ComponentMetadata cm1 = createComponentMetadata11( Boolean.TRUE, null );
- cm1.validate( logger );
+ cm1.validate( );
assertEquals( "Configuration policy", ComponentMetadata.CONFIGURATION_POLICY_OPTIONAL,
cm1.getConfigurationPolicy() );
final ComponentMetadata cm2 = createComponentMetadata11( Boolean.TRUE, null );
cm2.setConfigurationPolicy( ComponentMetadata.CONFIGURATION_POLICY_IGNORE );
- cm2.validate( logger );
+ cm2.validate( );
assertEquals( "Configuration policy", ComponentMetadata.CONFIGURATION_POLICY_IGNORE,
cm2.getConfigurationPolicy() );
final ComponentMetadata cm3 = createComponentMetadata11( Boolean.TRUE, null );
cm3.setConfigurationPolicy( ComponentMetadata.CONFIGURATION_POLICY_OPTIONAL );
- cm3.validate( logger );
+ cm3.validate( );
assertEquals( "Configuration policy", ComponentMetadata.CONFIGURATION_POLICY_OPTIONAL,
cm3.getConfigurationPolicy() );
final ComponentMetadata cm4 = createComponentMetadata11( Boolean.TRUE, null );
cm4.setConfigurationPolicy( ComponentMetadata.CONFIGURATION_POLICY_REQUIRE );
- cm4.validate( logger );
+ cm4.validate( );
assertEquals( "Configuration policy", ComponentMetadata.CONFIGURATION_POLICY_REQUIRE,
cm4.getConfigurationPolicy() );
@@ -408,7 +405,7 @@ public class ComponentMetadataTest exten
cm5.setConfigurationPolicy( "undefined" );
try
{
- cm5.validate( logger );
+ cm5.validate( );
fail( "Expected validation failure due to undefined configuration policy" );
}
catch ( ComponentException ce )
@@ -424,7 +421,7 @@ public class ComponentMetadataTest exten
final ComponentMetadata cm1 = createComponentMetadata( Boolean.TRUE, null );
cm1.addDependency( createReferenceMetadata( "name1" ) );
cm1.addDependency( createReferenceMetadata( "name2" ) );
- cm1.validate( logger );
+ cm1.validate( );
}
@@ -436,7 +433,7 @@ public class ComponentMetadataTest exten
cm2.addDependency( createReferenceMetadata( "name1" ) );
try
{
- cm2.validate( logger );
+ cm2.validate( );
fail( "Expect validation failure for duplicate reference name" );
}
catch ( ComponentException ee )
@@ -453,7 +450,7 @@ public class ComponentMetadataTest exten
cm3.addDependency( createReferenceMetadata( null ) );
try
{
- cm3.validate( logger );
+ cm3.validate( );
fail( "Expect validation failure for DS 1.0 reference without name" );
}
catch ( ComponentException ce )
@@ -469,7 +466,7 @@ public class ComponentMetadataTest exten
final ComponentMetadata cm4 = createComponentMetadata11( Boolean.TRUE, null );
final ReferenceMetadata rm4 = createReferenceMetadata( null );
cm4.addDependency( rm4 );
- cm4.validate( logger );
+ cm4.validate( );
assertEquals( "Reference name defaults to interface", rm4.getInterface(), rm4.getName() );
}
@@ -483,7 +480,7 @@ public class ComponentMetadataTest exten
cm3.addDependency( rm3 );
// according to DS 1.2 must fail validation (FELIX-3648)
- failDS10Validation( cm3, "updated", logger );
+ failDS10Validation( cm3, "updated" );
}
@@ -496,7 +493,7 @@ public class ComponentMetadataTest exten
cm3.addDependency( rm3 );
// according to DS 1.2 must fail validation (FELIX-3648)
- failDS10Validation( cm3, "updated", logger );
+ failDS10Validation( cm3, "updated" );
}
@@ -509,7 +506,7 @@ public class ComponentMetadataTest exten
cm3.addDependency( rm3 );
// validates fine and logs no message
- cm3.validate( logger );
+ cm3.validate( );
assertEquals( "my_updated_method", rm3.getUpdated() );
}
@@ -524,7 +521,7 @@ public class ComponentMetadataTest exten
cm3.addDependency( rm3 );
// validates fine and logs no message
- cm3.validate( logger );
+ cm3.validate( );
assertEquals( "my_updated_method", rm3.getUpdated() );
}
@@ -536,7 +533,7 @@ public class ComponentMetadataTest exten
cm.setImplementationClassName( "second.implementation.class" );
try
{
- cm.validate( logger );
+ cm.validate( );
fail( "Expect validation failure for duplicate implementation element" );
}
catch ( ComponentException ce )
@@ -552,7 +549,7 @@ public class ComponentMetadataTest exten
cm.setImplementationClassName( "second.implementation.class" );
try
{
- cm.validate( logger );
+ cm.validate( );
fail( "Expect validation failure for duplicate implementation element" );
}
catch ( ComponentException ce )
@@ -569,7 +566,7 @@ public class ComponentMetadataTest exten
cm.setService( createServiceMetadata( Boolean.TRUE ) );
try
{
- cm.validate( logger );
+ cm.validate( );
fail( "Expect validation failure for duplicate service element" );
}
catch ( ComponentException ce )
@@ -586,7 +583,7 @@ public class ComponentMetadataTest exten
cm.setService( createServiceMetadata( Boolean.TRUE ) );
try
{
- cm.validate( logger );
+ cm.validate( );
fail( "Expect validation failure for duplicate service element" );
}
catch ( ComponentException ce )
@@ -602,7 +599,7 @@ public class ComponentMetadataTest exten
cm.addProperty( createPropertyMetadata( null, null, "" ) );
try
{
- cm.validate( logger );
+ cm.validate( );
fail( "Expect validation failure for missing property name" );
}
catch ( ComponentException ce )
@@ -618,7 +615,7 @@ public class ComponentMetadataTest exten
cm.addProperty( createPropertyMetadata( null, null, "" ) );
try
{
- cm.validate( logger );
+ cm.validate( );
fail( "Expect validation failure for missing property name" );
}
catch ( ComponentException ce )
@@ -633,7 +630,7 @@ public class ComponentMetadataTest exten
final ComponentMetadata cm = createComponentMetadata( null, null );
PropertyMetadata prop = createPropertyMetadata( "x", "Char", Integer.toString( 'x' ) );
cm.addProperty( prop );
- cm.validate( logger );
+ cm.validate( );
assertTrue( prop.getValue() instanceof Character );
assertEquals( new Character( 'x' ), prop.getValue() );
}
@@ -645,7 +642,7 @@ public class ComponentMetadataTest exten
cm.addProperty( createPropertyMetadata( "x", "Char", "x" ) );
try
{
- cm.validate( logger );
+ cm.validate( );
fail( "Expect validation failure for illegal property type Char" );
}
catch ( ComponentException ce )
@@ -718,7 +715,7 @@ public class ComponentMetadataTest exten
try
{
cm.setConfigurationPid( new String[] {"configurationPid"} );
- cm.validate( logger );
+ cm.validate( );
fail( "Expect validation failure for illegal configuration-pid usage in ds 1.1 namespace" );
}
catch ( ComponentException ce )
@@ -730,7 +727,7 @@ public class ComponentMetadataTest exten
try
{
cm.setConfigurationPid( new String[] {"configurationPid"} );
- cm.validate( logger );
+ cm.validate( );
}
catch ( ComponentException ce )
{
@@ -757,7 +754,7 @@ public class ComponentMetadataTest exten
{
cm.setImplementationClassName("implementation.class");
cm.setName( null );
- cm.validate( logger );
+ cm.validate( );
}
catch ( ComponentException ce )
{
@@ -775,7 +772,7 @@ public class ComponentMetadataTest exten
{
cm.setImplementationClassName("implementation.class");
cm.setName("my.component.name");
- cm.validate( logger );
+ cm.validate( );
}
catch ( ComponentException ce )
{
@@ -792,7 +789,7 @@ public class ComponentMetadataTest exten
final ComponentMetadata cm = createComponentMetadata11( null, null );
PropertyMetadata prop = createPropertyMetadata( "x", "Character", Integer.toString( 'x' ) );
cm.addProperty( prop );
- cm.validate( logger );
+ cm.validate( );
assertTrue( prop.getValue() instanceof Character );
assertEquals( new Character( 'x' ), prop.getValue() );
}
@@ -801,12 +798,11 @@ public class ComponentMetadataTest exten
//---------- Helper methods
// method also used by XmlHandlerTest
- static void failDS10Validation( final ComponentMetadata metadata, final String expectedValidationReason,
- final MockLogger logger )
+ static void failDS10Validation( final ComponentMetadata metadata, final String expectedValidationReason )
{
try
{
- metadata.validate( logger );
+ metadata.validate( );
fail( "Expected validation failure for Component " + metadata.getName() + " containing '"
+ expectedValidationReason + "'" );
}
Modified: felix/trunk/osgi-r7/scr/src/test/java/org/apache/felix/scr/impl/metadata/XmlHandlerTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/osgi-r7/scr/src/test/java/org/apache/felix/scr/impl/metadata/XmlHandlerTest.java?rev=1803781&r1=1803780&r2=1803781&view=diff
==============================================================================
--- felix/trunk/osgi-r7/scr/src/test/java/org/apache/felix/scr/impl/metadata/XmlHandlerTest.java (original)
+++ felix/trunk/osgi-r7/scr/src/test/java/org/apache/felix/scr/impl/metadata/XmlHandlerTest.java Wed Aug 2 08:41:00 2017
@@ -27,8 +27,6 @@ import java.io.StringReader;
import java.util.Iterator;
import java.util.List;
-import junit.framework.TestCase;
-
import org.apache.felix.scr.impl.MockBundle;
import org.apache.felix.scr.impl.MockLogger;
import org.apache.felix.scr.impl.parser.KXml2SAXParser;
@@ -37,12 +35,15 @@ import org.apache.felix.scr.impl.xml.Xml
import org.osgi.service.component.ComponentException;
import org.xmlpull.v1.XmlPullParserException;
+import junit.framework.TestCase;
+
public class XmlHandlerTest extends TestCase
{
private MockLogger logger;
+ @Override
protected void setUp() throws Exception
{
super.setUp();
@@ -159,16 +160,16 @@ public class XmlHandlerTest extends Test
{
final List metadataList10 = readMetadata( "/components_activate_10.xml" );
assertEquals( "Component Descriptors", 4, metadataList10.size() );
- ComponentMetadataTest.failDS10Validation( ( ComponentMetadata ) metadataList10.get( 0 ), "activate", logger );
- ComponentMetadataTest.failDS10Validation( ( ComponentMetadata ) metadataList10.get( 1 ), "deactivate", logger );
- ComponentMetadataTest.failDS10Validation( ( ComponentMetadata ) metadataList10.get( 2 ), "modified", logger );
+ ComponentMetadataTest.failDS10Validation( ( ComponentMetadata ) metadataList10.get( 0 ), "activate" );
+ ComponentMetadataTest.failDS10Validation( ( ComponentMetadata ) metadataList10.get( 1 ), "deactivate" );
+ ComponentMetadataTest.failDS10Validation( ( ComponentMetadata ) metadataList10.get( 2 ), "modified" );
ComponentMetadataTest.failDS10Validation( ( ComponentMetadata ) metadataList10.get( 3 ),
- "configuration-policy", logger );
+ "configuration-policy" );
final List metadataList11 = readMetadata( "/components_activate_11.xml" );
assertEquals( "Component Descriptors", 1, metadataList11.size() );
final ComponentMetadata cm11 = ( ComponentMetadata ) metadataList11.get( 0 );
- cm11.validate( logger );
+ cm11.validate( );
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() );
@@ -187,7 +188,7 @@ public class XmlHandlerTest extends Test
final ComponentMetadata cm10 = ( ComponentMetadata ) metadataList10.get( 0 );
try
{
- cm10.validate( logger );
+ cm10.validate( );
fail( "Expected validation failure for component without name" );
}
catch ( ComponentException ce )
@@ -198,7 +199,7 @@ public class XmlHandlerTest extends Test
final List metadataList11 = readMetadata( "/components_anonymous_11.xml" );
assertEquals( "Component Descriptors", 1, metadataList11.size() );
final ComponentMetadata cm11 = ( ComponentMetadata ) metadataList11.get( 0 );
- cm11.validate( logger );
+ cm11.validate( );
assertEquals( "Expected name equals class", cm11.getImplementationClassName(), cm11.getName() );
}
@@ -210,7 +211,7 @@ public class XmlHandlerTest extends Test
final ComponentMetadata cm10 = ( ComponentMetadata ) metadataList10.get( 0 );
try
{
- cm10.validate( logger );
+ cm10.validate( );
fail( "Expected validation failure for component without name" );
}
catch ( ComponentException ce )
@@ -221,7 +222,7 @@ public class XmlHandlerTest extends Test
final List metadataList11 = readMetadata( "/components_anonymous_11.xml" );
assertEquals( "Component Descriptors", 1, metadataList11.size() );
final ComponentMetadata cm11 = ( ComponentMetadata ) metadataList11.get( 0 );
- cm11.validate( logger );
+ cm11.validate( );
assertEquals( "Expected name equals class", cm11.getImplementationClassName(), cm11.getName() );
}
@@ -312,7 +313,7 @@ public class XmlHandlerTest extends Test
final ComponentMetadata cm10 = ( ComponentMetadata ) metadataList10.get( 0 );
try
{
- cm10.validate( logger );
+ cm10.validate( );
fail( "Expect validation failure for duplicate implementation element" );
}
catch ( ComponentException ce )
@@ -329,7 +330,7 @@ public class XmlHandlerTest extends Test
final ComponentMetadata cm11 = ( ComponentMetadata ) metadataList11.get( 0 );
try
{
- cm11.validate( logger );
+ cm11.validate( );
fail( "Expect validation failure for duplicate implementation element" );
}
catch ( ComponentException ce )
@@ -346,7 +347,7 @@ public class XmlHandlerTest extends Test
final ComponentMetadata cm10 = ( ComponentMetadata ) metadataList10.get( 0 );
try
{
- cm10.validate( logger );
+ cm10.validate( );
fail( "Expect validation failure for duplicate service element" );
}
catch ( ComponentException ce )
@@ -363,7 +364,7 @@ public class XmlHandlerTest extends Test
final ComponentMetadata cm11 = ( ComponentMetadata ) metadataList11.get( 0 );
try
{
- cm11.validate( logger );
+ cm11.validate( );
fail( "Expect validation failure for duplicate service element" );
}
catch ( ComponentException ce )