You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by cs...@apache.org on 2015/04/21 17:48:42 UTC
svn commit: r1675139 - in /aries/trunk/blueprint: blueprint-authz/
blueprint-core/
blueprint-core/src/test/java/org/apache/aries/blueprint/container/
blueprint-core/src/test/java/org/apache/aries/blueprint/utils/
Author: cschneider
Date: Tue Apr 21 15:48:42 2015
New Revision: 1675139
URL: http://svn.apache.org/r1675139
Log:
[ARIES-1312] Use easymock instead testsupport
Modified:
aries/trunk/blueprint/blueprint-authz/pom.xml
aries/trunk/blueprint/blueprint-core/pom.xml
aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/container/BPQuiesceTest.java
aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/utils/ReflectionUtilsTest.java
Modified: aries/trunk/blueprint/blueprint-authz/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-authz/pom.xml?rev=1675139&r1=1675138&r2=1675139&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-authz/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-authz/pom.xml Tue Apr 21 15:48:42 2015
@@ -69,12 +69,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.aries.testsupport</groupId>
- <artifactId>org.apache.aries.testsupport.unit</artifactId>
- <scope>test</scope>
- <version>1.0.0</version>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<scope>provided</scope>
Modified: aries/trunk/blueprint/blueprint-core/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/pom.xml?rev=1675139&r1=1675138&r2=1675139&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-core/pom.xml Tue Apr 21 15:48:42 2015
@@ -169,9 +169,9 @@
<version>${quiesce.api.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.aries.testsupport</groupId>
- <artifactId>org.apache.aries.testsupport.unit</artifactId>
- <version>1.0.0</version>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>3.2</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/container/BPQuiesceTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/container/BPQuiesceTest.java?rev=1675139&r1=1675138&r2=1675139&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/container/BPQuiesceTest.java (original)
+++ aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/container/BPQuiesceTest.java Tue Apr 21 15:48:42 2015
@@ -18,28 +18,28 @@
*/
package org.apache.aries.blueprint.container;
+import static junit.framework.Assert.assertTrue;
+
import java.util.Arrays;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
import org.apache.aries.quiesce.manager.QuiesceCallback;
-import org.apache.aries.unittest.mocks.MethodCall;
-import org.apache.aries.unittest.mocks.Skeleton;
+import org.easymock.EasyMock;
+import org.easymock.IMocksControl;
import org.junit.Test;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
-import static junit.framework.Assert.*;
-
public class BPQuiesceTest {
@Test
public void canQuiesceNoBPBundle() throws Exception {
- BundleContext ctx = Skeleton.newMock(BundleContext.class);
- Bundle bpBundle = Skeleton.newMock(Bundle.class);
- Bundle testBundle = Skeleton.newMock(Bundle.class);
+ IMocksControl c = EasyMock.createControl();
+ BundleContext ctx = c.createMock(BundleContext.class);
+ Bundle bpBundle = c.createMock(Bundle.class);
+ Bundle testBundle = c.createMock(Bundle.class);
- Skeleton.getSkeleton(ctx).setReturnValue(
- new MethodCall(BundleContext.class, "getBundle"), bpBundle);
+ EasyMock.expect(ctx.getBundle()).andReturn(bpBundle);
BlueprintQuiesceParticipant bqp = new BlueprintQuiesceParticipant(ctx, new BlueprintExtender() {
@Override
@@ -55,9 +55,9 @@ public class BPQuiesceTest {
result.release();
}
};
-
+ c.replay();
bqp.quiesce(qc, Arrays.asList(testBundle));
-
+ c.verify();
assertTrue(result.tryAcquire(2, TimeUnit.SECONDS));
}
}
Modified: aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/utils/ReflectionUtilsTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/utils/ReflectionUtilsTest.java?rev=1675139&r1=1675138&r2=1675139&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/utils/ReflectionUtilsTest.java (original)
+++ aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/utils/ReflectionUtilsTest.java Tue Apr 21 15:48:42 2015
@@ -18,6 +18,10 @@
*/
package org.apache.aries.blueprint.utils;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -29,29 +33,22 @@ import java.util.List;
import java.util.Queue;
import java.util.concurrent.Future;
-import org.apache.aries.blueprint.services.ExtendedBlueprintContainer;
import org.apache.aries.blueprint.di.CircularDependencyException;
import org.apache.aries.blueprint.di.ExecutionContext;
import org.apache.aries.blueprint.di.Recipe;
+import org.apache.aries.blueprint.services.ExtendedBlueprintContainer;
import org.apache.aries.blueprint.utils.ReflectionUtils.PropertyDescriptor;
-import org.apache.aries.unittest.mocks.Skeleton;
+import org.easymock.Capture;
+import org.easymock.EasyMock;
+import org.easymock.IAnswer;
import org.junit.BeforeClass;
import org.junit.Test;
import org.osgi.service.blueprint.container.ComponentDefinitionException;
import org.osgi.service.blueprint.container.ReifiedType;
-import static org.junit.Assert.*;
-
public class ReflectionUtilsTest {
private PropertyDescriptor[] sut;
- private final ExtendedBlueprintContainer mockBlueprint = Skeleton.newMock(
- new Object() {
- public Class<?> loadClass(String name) throws ClassNotFoundException {
- return Thread.currentThread().getContextClassLoader().loadClass(name);
- }
- },
- ExtendedBlueprintContainer.class);
-
+ private static ExtendedBlueprintContainer mockBlueprint;
public static class GetterOnly {
public String getValue() { return "test"; }
}
@@ -59,8 +56,17 @@ public class ReflectionUtilsTest {
private class Inconvertible {}
@BeforeClass
- public static void before()
+ public static void before() throws ClassNotFoundException
{
+ mockBlueprint = EasyMock.createNiceMock(ExtendedBlueprintContainer.class);
+ final Capture<String> nameCapture = new Capture<String>();
+ EasyMock.expect(mockBlueprint.loadClass(EasyMock.capture(nameCapture))).andAnswer(new IAnswer<Class<?>>() {
+ public Class<?> answer() throws Throwable {
+ return Thread.currentThread().getContextClassLoader().loadClass(nameCapture.getValue());
+ }
+ });
+ EasyMock.replay(mockBlueprint);
+
ExecutionContext.Holder.setContext(new ExecutionContext() {
public void addPartialObject(String name, Object object) {}
public boolean containsObject(String name) { return false; }