You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by io...@apache.org on 2011/11/24 23:43:14 UTC
svn commit: r1206005 - in
/karaf/branches/karaf-2.2.x/shell/config/src/test/java/org/apache/karaf/shell/config:
EditCommandTest.java UpdateCommandTest.java
Author: iocanel
Date: Thu Nov 24 22:43:13 2011
New Revision: 1206005
URL: http://svn.apache.org/viewvc?rev=1206005&view=rev
Log:
[KARAF-1035] Fixed config command unit tests.
Modified:
karaf/branches/karaf-2.2.x/shell/config/src/test/java/org/apache/karaf/shell/config/EditCommandTest.java
karaf/branches/karaf-2.2.x/shell/config/src/test/java/org/apache/karaf/shell/config/UpdateCommandTest.java
Modified: karaf/branches/karaf-2.2.x/shell/config/src/test/java/org/apache/karaf/shell/config/EditCommandTest.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/shell/config/src/test/java/org/apache/karaf/shell/config/EditCommandTest.java?rev=1206005&r1=1206004&r2=1206005&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/shell/config/src/test/java/org/apache/karaf/shell/config/EditCommandTest.java (original)
+++ karaf/branches/karaf-2.2.x/shell/config/src/test/java/org/apache/karaf/shell/config/EditCommandTest.java Thu Nov 24 22:43:13 2011
@@ -51,7 +51,7 @@ public class EditCommandTest extends Tes
command.setBundleContext(context);
ServiceReference reference = createMock(ServiceReference.class);
- expect(context.getServiceReference(ConfigurationAdmin.class.getName())).andReturn(reference);
+ expect(context.getServiceReference(ConfigurationAdmin.class.getName())).andReturn(reference).anyTimes();
admin = createMock(ConfigurationAdmin.class);
expect(context.getService(reference)).andReturn(admin);
Modified: karaf/branches/karaf-2.2.x/shell/config/src/test/java/org/apache/karaf/shell/config/UpdateCommandTest.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/shell/config/src/test/java/org/apache/karaf/shell/config/UpdateCommandTest.java?rev=1206005&r1=1206004&r2=1206005&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/shell/config/src/test/java/org/apache/karaf/shell/config/UpdateCommandTest.java (original)
+++ karaf/branches/karaf-2.2.x/shell/config/src/test/java/org/apache/karaf/shell/config/UpdateCommandTest.java Thu Nov 24 22:43:13 2011
@@ -51,7 +51,7 @@ public class UpdateCommandTest extends T
command.setBundleContext(context);
ServiceReference reference = createMock(ServiceReference.class);
- expect(context.getServiceReference(ConfigurationAdmin.class.getName())).andReturn(reference);
+ expect(context.getServiceReference(ConfigurationAdmin.class.getName())).andReturn(reference).anyTimes();
admin = createMock(ConfigurationAdmin.class);
expect(context.getService(reference)).andReturn(admin);