diff options
Diffstat (limited to 'bundles')
4 files changed, 5 insertions, 8 deletions
diff --git a/bundles/org.eclipse.equinox.console.tests/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.console.tests/META-INF/MANIFEST.MF index 5eb5dd1ae..aa559b375 100755 --- a/bundles/org.eclipse.equinox.console.tests/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.console.tests/META-INF/MANIFEST.MF @@ -7,6 +7,6 @@ Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Import-Package: junit.framework;version="4.8.1", org.apache.sshd.client.future, - org.easymock;version="3.0.0", + org.easymock;version="2.4.0", org.junit;version="4.8.1" Fragment-Host: org.eclipse.equinox.console diff --git a/bundles/org.eclipse.equinox.console.tests/src/org/eclipse/equinox/console/completion/CommandNamesCompleterTests.java b/bundles/org.eclipse.equinox.console.tests/src/org/eclipse/equinox/console/completion/CommandNamesCompleterTests.java index 0797570b8..dcbd19c86 100755 --- a/bundles/org.eclipse.equinox.console.tests/src/org/eclipse/equinox/console/completion/CommandNamesCompleterTests.java +++ b/bundles/org.eclipse.equinox.console.tests/src/org/eclipse/equinox/console/completion/CommandNamesCompleterTests.java @@ -18,13 +18,10 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import org.apache.felix.service.command.CommandProcessor; import org.apache.felix.service.command.CommandSession; -import org.eclipse.equinox.console.commands.CommandsTracker; import org.junit.Test; import org.osgi.framework.BundleContext; import org.osgi.framework.Filter; -import org.osgi.framework.InvalidSyntaxException; import org.osgi.framework.ServiceListener; import org.osgi.framework.ServiceReference; @@ -52,7 +49,7 @@ public class CommandNamesCompleterTests { BundleContext context = createMock(BundleContext.class); // expect(context.createFilter(String.format("(&(%s=*)(%s=*))", CommandProcessor.COMMAND_SCOPE, CommandProcessor.COMMAND_FUNCTION))).andReturn(filter); expect(context.createFilter("(objectClass=org.eclipse.equinox.console.commands.CommandsTracker)")).andReturn(filter); - context.addServiceListener(anyObject(ServiceListener.class), anyObject(String.class)); + context.addServiceListener(isA(ServiceListener.class), isA(String.class)); expect(context.getServiceReferences("org.eclipse.equinox.console.commands.CommandsTracker", null)).andReturn(new ServiceReference[]{}); replay(context); diff --git a/bundles/org.eclipse.equinox.console.tests/src/org/eclipse/equinox/console/completion/CompletionHandlerTests.java b/bundles/org.eclipse.equinox.console.tests/src/org/eclipse/equinox/console/completion/CompletionHandlerTests.java index 3a043a3b3..07663db15 100755 --- a/bundles/org.eclipse.equinox.console.tests/src/org/eclipse/equinox/console/completion/CompletionHandlerTests.java +++ b/bundles/org.eclipse.equinox.console.tests/src/org/eclipse/equinox/console/completion/CompletionHandlerTests.java @@ -67,7 +67,7 @@ public class CompletionHandlerTests { BundleContext context = createMock(BundleContext.class); expect(context.getServiceReferences(Completer.class.getName(), null)).andReturn(null).anyTimes(); expect(context.createFilter("(objectClass=org.eclipse.equinox.console.commands.CommandsTracker)")).andReturn(filter).anyTimes(); - context.addServiceListener(anyObject(ServiceListener.class), anyObject(String.class)); + context.addServiceListener(isA(ServiceListener.class), isA(String.class)); expectLastCall().anyTimes(); expect(context.getServiceReferences("org.eclipse.equinox.console.commands.CommandsTracker", null)).andReturn(new ServiceReference[]{}).anyTimes(); replay(context); diff --git a/bundles/org.eclipse.equinox.console.tests/src/org/eclipse/equinox/console/supportability/ConsoleInputScannerTests.java b/bundles/org.eclipse.equinox.console.tests/src/org/eclipse/equinox/console/supportability/ConsoleInputScannerTests.java index eedbf5c5e..5c07ca1fb 100755 --- a/bundles/org.eclipse.equinox.console.tests/src/org/eclipse/equinox/console/supportability/ConsoleInputScannerTests.java +++ b/bundles/org.eclipse.equinox.console.tests/src/org/eclipse/equinox/console/supportability/ConsoleInputScannerTests.java @@ -11,7 +11,7 @@ package org.eclipse.equinox.console.supportability; -import static org.easymock.EasyMock.anyObject; +import static org.easymock.EasyMock.isA; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.replay; @@ -190,7 +190,7 @@ public class ConsoleInputScannerTests { BundleContext context = createMock(BundleContext.class); expect(context.getServiceReferences(Completer.class.getName(), null)).andReturn(null).anyTimes(); expect(context.createFilter("(objectClass=org.eclipse.equinox.console.commands.CommandsTracker)")).andReturn(filter); - context.addServiceListener(anyObject(ServiceListener.class), anyObject(String.class)); + context.addServiceListener(isA(ServiceListener.class), isA(String.class)); expect(context.getServiceReferences("org.eclipse.equinox.console.commands.CommandsTracker", null)).andReturn(new ServiceReference[]{}); replay(context); |