You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@river.apache.org by pe...@apache.org on 2013/07/21 02:44:02 UTC
svn commit: r1505246 - in
/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice:
test_set00/MultipleEvntLeaseRenewals.java
test_set00/MultipleSrvcLeaseRenewals.java test_set02/LeaseMapRenew.java
Author: peter_firmstone
Date: Sun Jul 21 00:44:01 2013
New Revision: 1505246
URL: http://svn.apache.org/r1505246
Log:
Make some static fields final in tests that are currently failing on Windows Server x64 Java 7. There appears to be an issue with system time, as indicated by the following test output:
com.sun.jini.qa.harness.TestException: Environment problem; this configuration does not allow for the timing assumptions made by the test
at com.sun.jini.test.spec.lookupservice.QATestUtils.computeDurAndWait(QATestUtils.java:424)
at com.sun.jini.test.spec.lookupservice.test_set00.MultipleSrvcLeaseRenewals.run(MultipleSrvcLeaseRenewals.java:137)
at com.sun.jini.qa.harness.MasterTest.doTest(MasterTest.java:256)
at com.sun.jini.qa.harness.MasterTest.main(MasterTest.java:144)
Modified:
river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set00/MultipleEvntLeaseRenewals.java
river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set00/MultipleSrvcLeaseRenewals.java
river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set02/LeaseMapRenew.java
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set00/MultipleEvntLeaseRenewals.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set00/MultipleEvntLeaseRenewals.java?rev=1505246&r1=1505245&r2=1505246&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set00/MultipleEvntLeaseRenewals.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set00/MultipleEvntLeaseRenewals.java Sun Jul 21 00:44:01 2013
@@ -52,10 +52,10 @@ public class MultipleEvntLeaseRenewals e
private final static long DEFAULT_LEASEDURATION
= (4*QATestUtils.N_MS_PER_MIN);
private final static int DEFAULT_LOOP_COUNT = 5;
- private static int loopCount= DEFAULT_LOOP_COUNT;
- private static long leaseDuration = DEFAULT_LEASEDURATION;
- private static long leaseWaitTime = DEFAULT_LEASEDURATION *3/4;
- private static long halfDurationTime = DEFAULT_LEASEDURATION /2;
+ private final static int loopCount= DEFAULT_LOOP_COUNT;
+ private final static long leaseDuration = DEFAULT_LEASEDURATION;
+ private final static long leaseWaitTime = DEFAULT_LEASEDURATION *3/4;
+ private final static long halfDurationTime = DEFAULT_LEASEDURATION /2;
private ServiceItem[] srvcItems ;
private ServiceRegistration[] srvcRegs ;
private ServiceTemplate[] srvcIDTmpls;
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set00/MultipleSrvcLeaseRenewals.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set00/MultipleSrvcLeaseRenewals.java?rev=1505246&r1=1505245&r2=1505246&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set00/MultipleSrvcLeaseRenewals.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set00/MultipleSrvcLeaseRenewals.java Sun Jul 21 00:44:01 2013
@@ -45,10 +45,10 @@ public class MultipleSrvcLeaseRenewals e
private final static long DEFAULT_LEASEDURATION
= (3*QATestUtils.N_MS_PER_MIN);
private final static int DEFAULT_LOOP_COUNT = 5;
- private static int loopCount= DEFAULT_LOOP_COUNT;
- private static long leaseDuration = DEFAULT_LEASEDURATION;
- private static long leaseWaitTime = DEFAULT_LEASEDURATION *3/4;
- private static long halfDurationTime = DEFAULT_LEASEDURATION /2;
+ private final static int loopCount= DEFAULT_LOOP_COUNT;
+ private final static long leaseDuration = DEFAULT_LEASEDURATION;
+ private final static long leaseWaitTime = DEFAULT_LEASEDURATION *3/4;
+ private final static long halfDurationTime = DEFAULT_LEASEDURATION /2;
private ServiceItem[] srvcItems ;
private ServiceRegistration[] srvcRegs ;
private Lease[] srvcLeases ;
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set02/LeaseMapRenew.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set02/LeaseMapRenew.java?rev=1505246&r1=1505245&r2=1505246&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set02/LeaseMapRenew.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set02/LeaseMapRenew.java Sun Jul 21 00:44:01 2013
@@ -46,11 +46,11 @@ public class LeaseMapRenew extends QATes
/* lease duration to 1 minute */
private final static long DEFAULT_LEASEDURATION = 120000;
private final static int DEFAULT_LOOP_COUNT = 5;
- private static int loopCount= DEFAULT_LOOP_COUNT;
- private static long leaseDuration = DEFAULT_LEASEDURATION;
- private static long initialLeaseDuration = DEFAULT_LEASEDURATION * 2;
- private static long leaseWaitTime = DEFAULT_LEASEDURATION *3/4;
- private static long halfDurationTime = DEFAULT_LEASEDURATION /2;
+ private final static int loopCount= DEFAULT_LOOP_COUNT;
+ private final static long leaseDuration = DEFAULT_LEASEDURATION;
+ private final static long initialLeaseDuration = DEFAULT_LEASEDURATION * 2;
+ private final static long leaseWaitTime = DEFAULT_LEASEDURATION *3/4;
+ private final static long halfDurationTime = DEFAULT_LEASEDURATION /2;
private ServiceItem[] srvcItems ;
private ServiceRegistration[] srvcRegs ;
private Lease[] srvcLeases ;