Only set the 'ds.service.changecount.timeout' system property within the Felix6778Test

Author: glimmerveen

scr/src/test/java/org/apache/felix/scr/integration/ComponentTestBase.java

@@ -142,8 +142,6 @@ public abstract class ComponentTestBase
 
     protected static final String PROP_NAME_FACTORY = ComponentTestBase.PROP_NAME + ".factory";
 
-    protected static long DS_SERVICE_CHANGECOUNT_TIMEOUT = ScrConfiguration.DEFAULT_SERVICE_CHANGECOUNT_TIMEOUT_MILLISECONDS;
-
     static
     {
         theConfig = new Hashtable<>();
@@ -202,8 +200,7 @@ public static Option[] configuration()
                 systemProperty( "ds.loglevel" ).value( DS_LOGLEVEL ),
                 systemProperty( "ds.cache.metadata" ).value( Boolean.toString(CACHE_META_DATA) ),
                 systemProperty( "logback.configurationFile" ).value( "src/test/resources/logback-test.xml" ),
-                systemProperty( EXAM_FAIL_ON_UNRESOLVED_KEY ).value( "true" ),
-                systemProperty( "ds.service.changecount.timeout" ).value( Long.toString(DS_SERVICE_CHANGECOUNT_TIMEOUT) )
+                systemProperty( EXAM_FAIL_ON_UNRESOLVED_KEY ).value( "true" )
 
                 );
         final Option vmOption = ( paxRunnerVmOption != null )? CoreOptions.vmOption( paxRunnerVmOption ): null;

scr/src/test/java/org/apache/felix/scr/integration/Felix6778Test.java

@@ -22,6 +22,9 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.OptionUtils;
 import org.ops4j.pax.exam.junit.PaxExam;
 import org.osgi.framework.BundleException;
 import org.osgi.framework.Constants;
@@ -35,15 +38,17 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertSame;
+import static org.ops4j.pax.exam.CoreOptions.systemProperty;
 
 @RunWith(PaxExam.class)
 public class Felix6778Test extends ComponentTestBase implements ServiceListener
 {
 
+    private static final long DS_SERVICE_CHANGECOUNT_TIMEOUT = 1000;
+
     static
     {
         descriptorFile = "/integration_test_simple_components.xml";
-        DS_SERVICE_CHANGECOUNT_TIMEOUT = 1000;
     }
 
     class RecordedScrChangeCount
@@ -58,6 +63,13 @@ class RecordedScrChangeCount
         }
     }
 
+    @Configuration
+    public static Option[] configuration()
+    {
+        return OptionUtils.combine(ComponentTestBase.configuration(),
+                systemProperty( "ds.service.changecount.timeout" ).value( Long.toString(DS_SERVICE_CHANGECOUNT_TIMEOUT) ));
+    }
+
     private List<RecordedScrChangeCount> recordedEvents = new CopyOnWriteArrayList<>();
 
     @Before