[FELIX-2763] Fix unit test compilation
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1301564 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/fileinstall/src/test/java/org/apache/felix/fileinstall/internal/ConfigInstallerTest.java b/fileinstall/src/test/java/org/apache/felix/fileinstall/internal/ConfigInstallerTest.java
index 9a6edb8..a3c3b8a 100644
--- a/fileinstall/src/test/java/org/apache/felix/fileinstall/internal/ConfigInstallerTest.java
+++ b/fileinstall/src/test/java/org/apache/felix/fileinstall/internal/ConfigInstallerTest.java
@@ -168,19 +168,19 @@
public void testShouldSaveConfig()
{
- final AtomicReference<Boolean> disable = new AtomicReference<Boolean>();
- final AtomicReference<Boolean> enable = new AtomicReference<Boolean>();
+ final AtomicReference disable = new AtomicReference();
+ final AtomicReference enable = new AtomicReference();
EasyMock.expect(mockBundleContext.getProperty(DirectoryWatcher.DISABLE_CONFIG_SAVE)).andAnswer(
- new IAnswer<String>() {
- public String answer() throws Throwable {
+ new IAnswer() {
+ public Object answer() throws Throwable {
return disable.get() != null ? disable.get().toString() : null;
}
}
).anyTimes();
EasyMock.expect(mockBundleContext.getProperty(DirectoryWatcher.ENABLE_CONFIG_SAVE)).andAnswer(
- new IAnswer<String>() {
- public String answer() throws Throwable {
+ new IAnswer() {
+ public Object answer() throws Throwable {
return enable.get() != null ? enable.get().toString() : null;
}
}
@@ -193,36 +193,36 @@
enable.set(null);
assertTrue( ci.shouldSaveConfig() );
- disable.set(false);
+ disable.set(Boolean.FALSE);
enable.set(null);
assertFalse( ci.shouldSaveConfig() );
- disable.set(true);
+ disable.set(Boolean.TRUE);
enable.set(null);
assertTrue( ci.shouldSaveConfig() );
disable.set(null);
- enable.set(false);
+ enable.set(Boolean.FALSE);
assertFalse( ci.shouldSaveConfig() );
- disable.set(false);
- enable.set(false);
+ disable.set(Boolean.FALSE);
+ enable.set(Boolean.FALSE);
assertFalse( ci.shouldSaveConfig() );
- disable.set(true);
- enable.set(false);
+ disable.set(Boolean.TRUE);
+ enable.set(Boolean.FALSE);
assertFalse( ci.shouldSaveConfig() );
disable.set(null);
- enable.set(true);
+ enable.set(Boolean.TRUE);
assertTrue( ci.shouldSaveConfig() );
- disable.set(false);
- enable.set(true);
+ disable.set(Boolean.FALSE);
+ enable.set(Boolean.TRUE);
assertTrue( ci.shouldSaveConfig() );
- disable.set(true);
- enable.set(true);
+ disable.set(Boolean.TRUE);
+ enable.set(Boolean.TRUE);
assertTrue( ci.shouldSaveConfig() );
EasyMock.verify(new Object[]{mockConfiguration, mockConfigurationAdmin, mockBundleContext});