You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2009/03/11 16:50:14 UTC
svn commit: r752482 - in
/servicemix/smx4/nmr/trunk/jbi/deployer/src/test/java/org/apache/servicemix/jbi/deployer/artifacts:
AssemblyReferencesListenerTest.java ServiceAssemblyImplTest.java
Author: gnodet
Date: Wed Mar 11 15:50:13 2009
New Revision: 752482
URL: http://svn.apache.org/viewvc?rev=752482&view=rev
Log:
Fix junit tests
Modified:
servicemix/smx4/nmr/trunk/jbi/deployer/src/test/java/org/apache/servicemix/jbi/deployer/artifacts/AssemblyReferencesListenerTest.java
servicemix/smx4/nmr/trunk/jbi/deployer/src/test/java/org/apache/servicemix/jbi/deployer/artifacts/ServiceAssemblyImplTest.java
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/src/test/java/org/apache/servicemix/jbi/deployer/artifacts/AssemblyReferencesListenerTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/test/java/org/apache/servicemix/jbi/deployer/artifacts/AssemblyReferencesListenerTest.java?rev=752482&r1=752481&r2=752482&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/src/test/java/org/apache/servicemix/jbi/deployer/artifacts/AssemblyReferencesListenerTest.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/src/test/java/org/apache/servicemix/jbi/deployer/artifacts/AssemblyReferencesListenerTest.java Wed Mar 11 15:50:13 2009
@@ -16,14 +16,11 @@
*/
package org.apache.servicemix.jbi.deployer.artifacts;
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-
import java.util.Collections;
-import junit.framework.TestCase;
+import javax.jbi.component.Component;
+import junit.framework.TestCase;
import org.apache.servicemix.jbi.deployer.artifacts.AbstractLifecycleJbiArtifact.State;
import org.apache.servicemix.jbi.deployer.descriptor.DescriptorFactory;
import org.apache.servicemix.jbi.deployer.descriptor.ServiceAssemblyDesc;
@@ -37,6 +34,9 @@
import org.apache.servicemix.nmr.api.service.ServiceHelper;
import org.apache.servicemix.nmr.core.ExchangeImpl;
import org.apache.servicemix.nmr.core.InternalEndpointWrapper;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
import org.osgi.service.prefs.Preferences;
/**
@@ -120,8 +120,10 @@
final Preferences prefs = createMock(Preferences.class);
expect(prefs.get("state", State.Shutdown.name())).andReturn(State.Shutdown.name()).anyTimes();
replay(prefs);
+ final Component component = createMock(Component.class);
+ replay(component);
- ComponentImpl comp = new ComponentImpl(null, null, null, prefs, false, null);
+ ComponentImpl comp = new ComponentImpl(null, null, component, prefs, false, null);
ServiceUnitImpl su = new ServiceUnitImpl(descriptor.getServiceUnits()[0], null, comp);
ServiceAssemblyImpl sa = new ServiceAssemblyImpl(null, descriptor, Collections.singletonList(su), prefs, new AssemblyReferencesListener(), false);
return sa;
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/src/test/java/org/apache/servicemix/jbi/deployer/artifacts/ServiceAssemblyImplTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/test/java/org/apache/servicemix/jbi/deployer/artifacts/ServiceAssemblyImplTest.java?rev=752482&r1=752481&r2=752482&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/src/test/java/org/apache/servicemix/jbi/deployer/artifacts/ServiceAssemblyImplTest.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/src/test/java/org/apache/servicemix/jbi/deployer/artifacts/ServiceAssemblyImplTest.java Wed Mar 11 15:50:13 2009
@@ -16,24 +16,25 @@
*/
package org.apache.servicemix.jbi.deployer.artifacts;
-import static org.easymock.EasyMock.*;
-
import java.util.ArrayList;
+import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
-import java.util.Collections;
import javax.jbi.JBIException;
+import javax.jbi.component.Component;
+import junit.framework.TestCase;
import org.apache.servicemix.jbi.deployer.ServiceAssembly;
import org.apache.servicemix.jbi.deployer.artifacts.AbstractLifecycleJbiArtifact.State;
import org.apache.servicemix.jbi.deployer.descriptor.DescriptorFactory;
import org.apache.servicemix.jbi.deployer.descriptor.ServiceAssemblyDesc;
-import org.apache.servicemix.jbi.deployer.artifacts.AssemblyReferencesListener;
import org.apache.servicemix.nmr.api.Wire;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
import org.osgi.framework.ServiceRegistration;
import org.osgi.service.prefs.Preferences;
-import junit.framework.TestCase;
/**
* Test cases for {@link ServiceAssemblyImpl}
@@ -45,8 +46,10 @@
final Preferences prefs = createMock(Preferences.class);
expect(prefs.get("state", State.Shutdown.name())).andReturn(State.Shutdown.name()).anyTimes();
replay(prefs);
+ final Component component = createMock(Component.class);
+ replay(component);
- ComponentImpl comp = new ComponentImpl(null, null, null, prefs, false, null);
+ ComponentImpl comp = new ComponentImpl(null, null, component, prefs, false, null);
comp.state = State.Shutdown;
ServiceUnitImpl su = new ServiceUnitImpl(descriptor.getServiceUnits()[0], null, comp);
ServiceAssemblyImpl sa = new ServiceAssemblyImpl(null, descriptor, Collections.singletonList(su), prefs, new AssemblyReferencesListener(), false);