You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2015/03/05 14:27:13 UTC
karaf git commit: [KARAF-3577] Fix broken unit test
Repository: karaf
Updated Branches:
refs/heads/karaf-2.x d0d09aa8a -> 65ae5082c
[KARAF-3577] Fix broken unit test
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/65ae5082
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/65ae5082
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/65ae5082
Branch: refs/heads/karaf-2.x
Commit: 65ae5082cffb39b0adbd82b2f7097880f39f5b79
Parents: d0d09aa
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Thu Mar 5 14:27:04 2015 +0100
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Thu Mar 5 14:27:04 2015 +0100
----------------------------------------------------------------------
.../security/impl/SecuredCommandConfigTransformerTest.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/65ae5082/shell/console/src/test/java/org/apache/karaf/shell/security/impl/SecuredCommandConfigTransformerTest.java
----------------------------------------------------------------------
diff --git a/shell/console/src/test/java/org/apache/karaf/shell/security/impl/SecuredCommandConfigTransformerTest.java b/shell/console/src/test/java/org/apache/karaf/shell/security/impl/SecuredCommandConfigTransformerTest.java
index 28eda60..0df130f 100644
--- a/shell/console/src/test/java/org/apache/karaf/shell/security/impl/SecuredCommandConfigTransformerTest.java
+++ b/shell/console/src/test/java/org/apache/karaf/shell/security/impl/SecuredCommandConfigTransformerTest.java
@@ -64,8 +64,7 @@ public class SecuredCommandConfigTransformerTest {
EasyMock.expect(ca.listConfigurations(
"(service.pid=" + SecuredCommandConfigTransformer.PROXY_COMMAND_ACL_PID_PREFIX + "*)")).
andReturn(new Configuration [] {commandConfig, commandConfig2, otherConfig}).anyTimes();
- EasyMock.expect(ca.getConfiguration(EasyMock.isA(String.class))).andAnswer(new IAnswer<Configuration>() {
- @Override
+ EasyMock.expect(ca.getConfiguration(EasyMock.isA(String.class), EasyMock.<String>isNull())).andAnswer(new IAnswer<Configuration>() {
public Configuration answer() throws Throwable {
String pid = (String) EasyMock.getCurrentArguments()[0];
Configuration c = configurations.get(pid);
@@ -148,7 +147,7 @@ public class SecuredCommandConfigTransformerTest {
ConfigurationAdmin cm = EasyMock.createMock(ConfigurationAdmin.class);
EasyMock.expect(cm.listConfigurations(EasyMock.isA(String.class))).andReturn(null).anyTimes();
- EasyMock.expect(cm.getConfiguration(testPid)).andReturn(conf).anyTimes();
+ EasyMock.expect(cm.getConfiguration(testPid, null)).andReturn(conf).anyTimes();
EasyMock.replay(cm);
final List<String> generateCalled = new ArrayList<String>();