You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2016/05/12 13:30:21 UTC
svn commit: r1743499 -
/felix/trunk/configadmin/src/test/java/org/apache/felix/cm/impl/ConfigurationManagerTest.java
Author: cziegeler
Date: Thu May 12 13:30:21 2016
New Revision: 1743499
URL: http://svn.apache.org/viewvc?rev=1743499&view=rev
Log:
Avoid compilation problems with Java 5
Modified:
felix/trunk/configadmin/src/test/java/org/apache/felix/cm/impl/ConfigurationManagerTest.java
Modified: felix/trunk/configadmin/src/test/java/org/apache/felix/cm/impl/ConfigurationManagerTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/configadmin/src/test/java/org/apache/felix/cm/impl/ConfigurationManagerTest.java?rev=1743499&r1=1743498&r2=1743499&view=diff
==============================================================================
--- felix/trunk/configadmin/src/test/java/org/apache/felix/cm/impl/ConfigurationManagerTest.java (original)
+++ felix/trunk/configadmin/src/test/java/org/apache/felix/cm/impl/ConfigurationManagerTest.java Thu May 12 13:30:21 2016
@@ -29,8 +29,6 @@ import java.util.Hashtable;
import java.util.Map;
import java.util.Set;
-import junit.framework.TestCase;
-
import org.apache.felix.cm.MockBundleContext;
import org.apache.felix.cm.MockLogService;
import org.apache.felix.cm.MockPersistenceManager;
@@ -44,6 +42,8 @@ import org.osgi.service.cm.SynchronousCo
import org.osgi.service.log.LogService;
import org.osgi.util.tracker.ServiceTracker;
+import junit.framework.TestCase;
+
public class ConfigurationManagerTest extends TestCase
{
@@ -53,6 +53,7 @@ public class ConfigurationManagerTest ex
private ByteArrayOutputStream output;
+ @Override
protected void setUp() throws Exception
{
super.setUp();
@@ -64,6 +65,7 @@ public class ConfigurationManagerTest ex
}
+ @Override
protected void tearDown() throws Exception
{
System.setErr( replacedStdErr );
@@ -212,7 +214,6 @@ public class ConfigurationManagerTest ex
SynchronousConfigurationListener syncListener1 = new SynchronousConfigurationListener()
{
- @Override
public void configurationEvent(ConfigurationEvent event)
{
result.add("L1");
@@ -220,7 +221,6 @@ public class ConfigurationManagerTest ex
};
SynchronousConfigurationListener syncListener2 = new SynchronousConfigurationListener()
{
- @Override
public void configurationEvent(ConfigurationEvent event)
{
result.add("L2");
@@ -228,7 +228,6 @@ public class ConfigurationManagerTest ex
};
SynchronousConfigurationListener syncListener3 = new SynchronousConfigurationListener()
{
- @Override
public void configurationEvent(ConfigurationEvent event)
{
result.add("L3");
@@ -361,6 +360,7 @@ public class ConfigurationManagerTest ex
field.setAccessible( true );
field.set( configMgr, new ServiceTracker( new MockBundleContext(), "", null )
{
+ @Override
public Object getService()
{
return logService;