FELIX--5457 : Logger Support. Use Mockito instead of EasyMock

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1781365 13f79535-47bb-0310-9956-ffa450edef68

Author: cziegeler

osgi-r7/scr/src/test/java/org/apache/felix/scr/impl/BundleComponentActivatorTest.java

@@ -24,11 +24,11 @@
 import java.util.Enumeration;
 import java.util.Vector;
 
-import junit.framework.TestCase;
-
-import org.easymock.EasyMock;
+import org.mockito.Mockito;
 import org.osgi.framework.Bundle;
 
+import junit.framework.TestCase;
+
 public class BundleComponentActivatorTest extends TestCase
 {
 
@@ -83,14 +83,11 @@ public void test_findDescriptors_withNonWildcardLocation() throws MalformedURLEx
         final URL[] descriptors = new URL[]
             { new URL( "file:foo.xml" ) };
         final Enumeration de = new Vector( Arrays.asList( descriptors ) ).elements();
-        final Bundle bundle = ( Bundle ) EasyMock.createNiceMock( Bundle.class );
-        EasyMock.expect( bundle.findEntries( "/some/location", "foo.xml", false ) ).andReturn( de );
+        final Bundle bundle = Mockito.mock( Bundle.class );
+        Mockito.when( bundle.findEntries( "/some/location", "foo.xml", false ) ).thenReturn( de );
 
-        EasyMock.replay( new Object[]
-            { bundle } );
         final URL[] urls = BundleComponentActivator.findDescriptors( bundle, "/some/location/foo.xml" );
-        EasyMock.verify( new Object[]
-            { bundle } );
+        Mockito.verify( bundle ).findEntries("/some/location", "foo.xml", false);
 
         assertNotNull( "Descriptor array is not null", urls );
         assertEquals( "Descriptor length", 1, urls.length );
@@ -109,12 +106,11 @@ public void findDescriptors_withWildcardLocation( final String location,
                 new URL( "file:foo2.xml" )
             };
         final Enumeration de = new Vector( Arrays.asList( urls ) ).elements();
-        final Bundle bundle = (Bundle) EasyMock.createNiceMock( Bundle.class );
-        EasyMock.expect( bundle.findEntries( path, filePattern, false ) ).andReturn( de );
+        final Bundle bundle = Mockito.mock( Bundle.class );
+        Mockito.when( bundle.findEntries( path, filePattern, false ) ).thenReturn( de );
 
-        EasyMock.replay( new Object[]{ bundle } );
         final URL[] actualUrls = BundleComponentActivator.findDescriptors( bundle, location );
-        EasyMock.verify( new Object[]{ bundle } );
+        Mockito.verify( bundle ).findEntries( path, filePattern, false );
 
         assertNotNull( "Descriptor array is not null", actualUrls );
         assertEquals( "Descriptor length", urls.length, actualUrls.length );
@@ -154,12 +150,11 @@ public void test_findDescriptors_withWildcardLocation02()
     public void test_findDescriptors_withWildcardLocation_nullEnum()
         throws MalformedURLException
     {
-        final Bundle bundle = (Bundle) EasyMock.createNiceMock( Bundle.class );
-        EasyMock.expect( bundle.findEntries( "/", "*.xml", false ) ).andReturn( null );
+        final Bundle bundle = Mockito.mock( Bundle.class );
+        Mockito.when( bundle.findEntries( "/", "*.xml", false ) ).thenReturn( null );
 
-        EasyMock.replay( new Object[]{ bundle } );
         final URL[] actualUrls = BundleComponentActivator.findDescriptors( bundle, "*.xml" );
-        EasyMock.verify( new Object[]{ bundle } );
+        Mockito.verify( bundle).findEntries( "/", "*.xml", false );
 
         assertNotNull( "Descriptor array is not null", actualUrls );
         assertEquals( "Descriptor length", 0, actualUrls.length );
@@ -173,12 +168,11 @@ public void test_findDescriptors_withWildcardLocation_nullEnum()
     public void test_findDescriptors_withWildcardLocation_emptyEnum()
         throws MalformedURLException
     {
-        final Bundle bundle = (Bundle) EasyMock.createNiceMock( Bundle.class );
-        EasyMock.expect( bundle.findEntries( "/", "*.xml", false ) ).andReturn( new Vector().elements() );
+        final Bundle bundle = Mockito.mock( Bundle.class );
+        Mockito.when( bundle.findEntries( "/", "*.xml", false ) ).thenReturn( new Vector().elements() );
 
-        EasyMock.replay( new Object[]{ bundle } );
         final URL[] actualUrls = BundleComponentActivator.findDescriptors( bundle, "*.xml" );
-        EasyMock.verify( new Object[]{ bundle } );
+        Mockito.verify( bundle ).findEntries( "/", "*.xml", false );
 
         assertNotNull( "Descriptor array is not null", actualUrls );
         assertEquals( "Descriptor length", 0, actualUrls.length );

osgi-r7/scr/src/test/java/org/apache/felix/scr/impl/inject/AnnotationTest.java

@@ -25,7 +25,7 @@
 import java.util.List;
 import java.util.Map;
 
-import org.easymock.EasyMock;
+import org.mockito.Mockito;
 import org.osgi.framework.Bundle;
 
 import junit.framework.TestCase;
@@ -69,10 +69,9 @@ public enum E1 {a, b, c}
 
     private Bundle mockBundle() throws ClassNotFoundException
     {
-        Bundle b = EasyMock.createMock(Bundle.class);
-        EasyMock.expect(b.loadClass(String.class.getName())).andReturn((Class) String.class).anyTimes();
-        EasyMock.expect(b.loadClass(Integer.class.getName())).andReturn((Class) Integer.class).anyTimes();
-        EasyMock.replay(b);
+        Bundle b = Mockito.mock(Bundle.class);
+        Mockito.when(b.loadClass(String.class.getName())).thenReturn((Class) String.class);
+        Mockito.when(b.loadClass(Integer.class.getName())).thenReturn((Class) Integer.class);
         return b;
     }
 

osgi-r7/scr/src/test/java/org/apache/felix/scr/impl/inject/BindMethodTest.java

@@ -35,7 +35,7 @@
 import org.apache.felix.scr.impl.manager.components2.T2;
 import org.apache.felix.scr.impl.metadata.ComponentMetadata;
 import org.apache.felix.scr.impl.metadata.DSVersion;
-import org.easymock.EasyMock;
+import org.mockito.Mockito;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
 import org.osgi.framework.ServiceReference;
@@ -54,19 +54,15 @@ public class BindMethodTest extends TestCase
     @Override
     public void setUp()
     {
-        m_serviceReference = EasyMock.createNiceMock( ServiceReference.class );
-        m_serviceInstance = EasyMock.createNiceMock( FakeService.class );
-        m_context = EasyMock.createNiceMock( BundleContext.class );
+        m_serviceReference = Mockito.mock( ServiceReference.class );
+        m_serviceInstance = Mockito.mock( FakeService.class );
+        m_context = Mockito.mock( BundleContext.class );
 
-        EasyMock.expect( m_context.getService( m_serviceReference ) ).andReturn( m_serviceInstance )
-                .anyTimes();
+        Mockito.when( m_context.getService( m_serviceReference ) ).thenReturn( m_serviceInstance );
 
-        EasyMock.expect( m_serviceReference.getPropertyKeys() ).andReturn( new String[]
-            { Constants.SERVICE_ID } ).anyTimes();
-        EasyMock.expect( m_serviceReference.getProperty( Constants.SERVICE_ID ) ).andReturn( "Fake Service" )
-            .anyTimes();
-        EasyMock.replay( new Object[]
-            { m_serviceReference, m_context } );
+        Mockito.when( m_serviceReference.getPropertyKeys() ).thenReturn( new String[]
+            { Constants.SERVICE_ID } );
+        Mockito.when( m_serviceReference.getProperty( Constants.SERVICE_ID ) ).thenReturn( "Fake Service" );
     }