aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLazar Kirchev2013-08-02 02:15:00 (EDT)
committerLazar Kirchev2013-08-02 02:15:00 (EDT)
commit10bb2468a5a764bc15151708cca2e41654fd4dce (patch)
treea3ed40501548c5f8807b19ed03a369d3f7a60baa
parenta1d841fe938b26a6f899f906a592e1e1e8590554 (diff)
downloadrt.equinox.bundles-10bb2468a5a764bc15151708cca2e41654fd4dce.zip
rt.equinox.bundles-10bb2468a5a764bc15151708cca2e41654fd4dce.tar.gz
rt.equinox.bundles-10bb2468a5a764bc15151708cca2e41654fd4dce.tar.bz2
Bug 403938 - [console] can't register a Gogo command when the method name contains lowercase and uppercase - fix easymock version in testsI20130807-0800I20130806-2000I20130806-0800I20130805-2000I20130805-0800I20130804-2300
-rwxr-xr-xbundles/org.eclipse.equinox.console.tests/META-INF/MANIFEST.MF2
-rwxr-xr-xbundles/org.eclipse.equinox.console.tests/src/org/eclipse/equinox/console/completion/CommandNamesCompleterTests.java5
-rwxr-xr-xbundles/org.eclipse.equinox.console.tests/src/org/eclipse/equinox/console/completion/CompletionHandlerTests.java2
-rwxr-xr-xbundles/org.eclipse.equinox.console.tests/src/org/eclipse/equinox/console/supportability/ConsoleInputScannerTests.java4
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 5eb5dd1..aa559b3 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 0797570..dcbd19c 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 3a043a3..07663db 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 eedbf5c..5c07ca1 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);