Author: peter_firmstone Date: Sun Jun 1 00:33:54 2014 New Revision: 1598934
URL: http://svn.apache.org/r1598934 Log: Event notifications can arrive out of order, ensure tests that depend on order sort events before checking for expected results. Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set01/NotifyOnComboAttrAddNonNull.java river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set01/NotifyOnComboAttrAddNull.java river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set01/NotifyOnComboAttrDelNonNull.java river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set01/NotifyOnComboAttrDelNull.java river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set01/NotifyOnComboAttrModNonNull.java river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set01/NotifyOnComboAttrModNull.java river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set01/NotifyOnComboSrvcLeaseExp.java river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set01/NotifyOnComboSrvcReg.java river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set01/NotifyOnEntryAttrAddNonNull.java river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set01/NotifyOnEntryAttrAddNull.java river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set01/NotifyOnEntrySrvcReg.java river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set02/NotifyOnComboAttrSet.java Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set01/NotifyOnComboAttrAddNonNull.java URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set01/NotifyOnComboAttrAddNonNull.java?rev=1598934&r1=1598933&r2=1598934&view=diff ============================================================================== --- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set01/NotifyOnComboAttrAddNonNull.java (original) +++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set01/NotifyOnComboAttrAddNonNull.java Sun Jun 1 00:33:54 2014 @@ -24,6 +24,7 @@ import com.sun.jini.qa.harness.TestExcep import com.sun.jini.test.spec.lookupservice.QATestRegistrar; import com.sun.jini.test.spec.lookupservice.QATestUtils; +import com.sun.jini.test.spec.lookupservice.RemoteEventComparator; import net.jini.core.lookup.ServiceRegistrar; import net.jini.core.lookup.ServiceEvent; import net.jini.core.lookup.ServiceItem; @@ -43,6 +44,7 @@ import java.util.Vector; import java.io.IOException; import java.io.Serializable; import java.util.ArrayList; +import java.util.Collections; import java.util.List; /** This class is used to verify that after using templates containing a @@ -278,6 +280,7 @@ public class NotifyOnComboAttrAddNonNull } QATestUtils.verifyEventTuples (receivedTuples,expectedTuples,maxNMsToWaitForEvents,SHOW_TIMINGS, this); + Collections.sort(evntVec, new RemoteEventComparator()); QATestUtils.verifyEventItems(evntVec); } Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set01/NotifyOnComboAttrAddNull.java URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set01/NotifyOnComboAttrAddNull.java?rev=1598934&r1=1598933&r2=1598934&view=diff ============================================================================== --- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set01/NotifyOnComboAttrAddNull.java (original) +++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set01/NotifyOnComboAttrAddNull.java Sun Jun 1 00:33:54 2014 @@ -24,6 +24,7 @@ import com.sun.jini.qa.harness.TestExcep import com.sun.jini.test.spec.lookupservice.QATestRegistrar; import com.sun.jini.test.spec.lookupservice.QATestUtils; +import com.sun.jini.test.spec.lookupservice.RemoteEventComparator; import net.jini.core.lookup.ServiceRegistrar; import net.jini.core.lookup.ServiceEvent; import net.jini.core.lookup.ServiceItem; @@ -43,6 +44,7 @@ import java.util.Vector; import java.io.IOException; import java.io.Serializable; import java.util.ArrayList; +import java.util.Collections; import java.util.List; /* This class is used to verify that after using templates containing a @@ -277,6 +279,7 @@ public class NotifyOnComboAttrAddNull ex } QATestUtils.verifyEventTuples (receivedTuples,expectedTuples,maxNMsToWaitForEvents,SHOW_TIMINGS, this); + Collections.sort(evntVec, new RemoteEventComparator()); QATestUtils.verifyEventItems(evntVec); } Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set01/NotifyOnComboAttrDelNonNull.java URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set01/NotifyOnComboAttrDelNonNull.java?rev=1598934&r1=1598933&r2=1598934&view=diff ============================================================================== --- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set01/NotifyOnComboAttrDelNonNull.java (original) +++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set01/NotifyOnComboAttrDelNonNull.java Sun Jun 1 00:33:54 2014 @@ -24,6 +24,7 @@ import com.sun.jini.qa.harness.TestExcep import com.sun.jini.test.spec.lookupservice.QATestRegistrar; import com.sun.jini.test.spec.lookupservice.QATestUtils; +import com.sun.jini.test.spec.lookupservice.RemoteEventComparator; import net.jini.core.lookup.ServiceRegistrar; import net.jini.core.lookup.ServiceEvent; import net.jini.core.lookup.ServiceItem; @@ -43,6 +44,7 @@ import java.util.Vector; import java.io.IOException; import java.io.Serializable; import java.util.ArrayList; +import java.util.Collections; import java.util.List; /** This class is used to verify that after using templates containing a @@ -299,6 +301,7 @@ public class NotifyOnComboAttrDelNonNull } QATestUtils.verifyEventTuples (receivedTuples,expectedTuples,maxNMsToWaitForEvents,SHOW_TIMINGS, this); + Collections.sort(evntVec, new RemoteEventComparator()); QATestUtils.verifyEventItems(evntVec); } Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set01/NotifyOnComboAttrDelNull.java URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set01/NotifyOnComboAttrDelNull.java?rev=1598934&r1=1598933&r2=1598934&view=diff ============================================================================== --- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set01/NotifyOnComboAttrDelNull.java (original) +++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set01/NotifyOnComboAttrDelNull.java Sun Jun 1 00:33:54 2014 @@ -24,6 +24,7 @@ import com.sun.jini.qa.harness.TestExcep import com.sun.jini.test.spec.lookupservice.QATestRegistrar; import com.sun.jini.test.spec.lookupservice.QATestUtils; +import com.sun.jini.test.spec.lookupservice.RemoteEventComparator; import net.jini.core.lookup.ServiceRegistrar; import net.jini.core.lookup.ServiceEvent; import net.jini.core.lookup.ServiceItem; @@ -43,6 +44,7 @@ import java.util.Vector; import java.io.IOException; import java.io.Serializable; import java.util.ArrayList; +import java.util.Collections; import java.util.List; /** This class is used to verify that after using templates containing a @@ -299,6 +301,7 @@ public class NotifyOnComboAttrDelNull ex } QATestUtils.verifyEventTuples (receivedTuples,expectedTuples,maxNMsToWaitForEvents,SHOW_TIMINGS, this); + Collections.sort(evntVec, new RemoteEventComparator()); QATestUtils.verifyEventItems(evntVec); } Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set01/NotifyOnComboAttrModNonNull.java URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set01/NotifyOnComboAttrModNonNull.java?rev=1598934&r1=1598933&r2=1598934&view=diff ============================================================================== --- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set01/NotifyOnComboAttrModNonNull.java (original) +++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set01/NotifyOnComboAttrModNonNull.java Sun Jun 1 00:33:54 2014 @@ -24,6 +24,7 @@ import com.sun.jini.qa.harness.TestExcep import com.sun.jini.test.spec.lookupservice.QATestRegistrar; import com.sun.jini.test.spec.lookupservice.QATestUtils; +import com.sun.jini.test.spec.lookupservice.RemoteEventComparator; import net.jini.core.lookup.ServiceRegistrar; import net.jini.core.lookup.ServiceEvent; import net.jini.core.lookup.ServiceItem; @@ -43,6 +44,7 @@ import java.util.Vector; import java.io.IOException; import java.io.Serializable; import java.util.ArrayList; +import java.util.Collections; import java.util.List; /** This class is used to verify that after using templates containing a @@ -298,6 +300,7 @@ public class NotifyOnComboAttrModNonNull } QATestUtils.verifyEventTuples (receivedTuples,expectedTuples,maxNMsToWaitForEvents,SHOW_TIMINGS, this); + Collections.sort(evntVec, new RemoteEventComparator()); QATestUtils.verifyEventItems(evntVec); } Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set01/NotifyOnComboAttrModNull.java URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set01/NotifyOnComboAttrModNull.java?rev=1598934&r1=1598933&r2=1598934&view=diff ============================================================================== --- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set01/NotifyOnComboAttrModNull.java (original) +++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set01/NotifyOnComboAttrModNull.java Sun Jun 1 00:33:54 2014 @@ -24,6 +24,7 @@ import com.sun.jini.qa.harness.TestExcep import com.sun.jini.test.spec.lookupservice.QATestRegistrar; import com.sun.jini.test.spec.lookupservice.QATestUtils; +import com.sun.jini.test.spec.lookupservice.RemoteEventComparator; import net.jini.core.lookup.ServiceRegistrar; import net.jini.core.lookup.ServiceEvent; import net.jini.core.lookup.ServiceItem; @@ -43,6 +44,7 @@ import java.util.Vector; import java.io.IOException; import java.io.Serializable; import java.util.ArrayList; +import java.util.Collections; import java.util.List; /** This class is used to verify that after using templates containing a @@ -299,6 +301,7 @@ public class NotifyOnComboAttrModNull ex } QATestUtils.verifyEventTuples (receivedTuples,expectedTuples,maxNMsToWaitForEvents,SHOW_TIMINGS, this); + Collections.sort(evntVec, new RemoteEventComparator()); QATestUtils.verifyEventItems(evntVec); } Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set01/NotifyOnComboSrvcLeaseExp.java URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set01/NotifyOnComboSrvcLeaseExp.java?rev=1598934&r1=1598933&r2=1598934&view=diff ============================================================================== --- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set01/NotifyOnComboSrvcLeaseExp.java (original) +++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set01/NotifyOnComboSrvcLeaseExp.java Sun Jun 1 00:33:54 2014 @@ -24,6 +24,7 @@ import com.sun.jini.qa.harness.TestExcep import com.sun.jini.test.spec.lookupservice.QATestRegistrar; import com.sun.jini.test.spec.lookupservice.QATestUtils; +import com.sun.jini.test.spec.lookupservice.RemoteEventComparator; import net.jini.core.lookup.ServiceRegistrar; import net.jini.core.lookup.ServiceEvent; import net.jini.core.lookup.ServiceItem; @@ -43,6 +44,7 @@ import java.util.Vector; import java.io.IOException; import java.io.Serializable; import java.util.ArrayList; +import java.util.Collections; import java.util.List; /** This class is used to verify that after using templates containing a @@ -291,6 +293,7 @@ public class NotifyOnComboSrvcLeaseExp e } QATestUtils.verifyEventTuples (receivedTuples,expectedTuples,maxNMsToWaitForEvents,SHOW_TIMINGS, this); + Collections.sort(evntVec, new RemoteEventComparator()); QATestUtils.verifyEventItems(evntVec); } Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set01/NotifyOnComboSrvcReg.java URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set01/NotifyOnComboSrvcReg.java?rev=1598934&r1=1598933&r2=1598934&view=diff ============================================================================== --- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set01/NotifyOnComboSrvcReg.java (original) +++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set01/NotifyOnComboSrvcReg.java Sun Jun 1 00:33:54 2014 @@ -24,6 +24,7 @@ import com.sun.jini.qa.harness.TestExcep import com.sun.jini.test.spec.lookupservice.QATestRegistrar; import com.sun.jini.test.spec.lookupservice.QATestUtils; +import com.sun.jini.test.spec.lookupservice.RemoteEventComparator; import net.jini.core.lookup.ServiceRegistrar; import net.jini.core.lookup.ServiceEvent; import net.jini.core.lookup.ServiceItem; @@ -43,6 +44,7 @@ import java.util.Vector; import java.io.IOException; import java.io.Serializable; import java.util.ArrayList; +import java.util.Collections; import java.util.List; /** This class is used to verify that after using templates containing a @@ -288,6 +290,7 @@ public class NotifyOnComboSrvcReg extend } QATestUtils.verifyEventTuples (receivedTuples,expectedTuples,maxNMsToWaitForEvents,SHOW_TIMINGS, this); + Collections.sort(evntVec, new RemoteEventComparator()); QATestUtils.verifyEventItems(evntVec); } Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set01/NotifyOnEntryAttrAddNonNull.java URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set01/NotifyOnEntryAttrAddNonNull.java?rev=1598934&r1=1598933&r2=1598934&view=diff ============================================================================== --- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set01/NotifyOnEntryAttrAddNonNull.java (original) +++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set01/NotifyOnEntryAttrAddNonNull.java Sun Jun 1 00:33:54 2014 @@ -24,6 +24,7 @@ import com.sun.jini.qa.harness.TestExcep import com.sun.jini.test.spec.lookupservice.QATestRegistrar; import com.sun.jini.test.spec.lookupservice.QATestUtils; +import com.sun.jini.test.spec.lookupservice.RemoteEventComparator; import net.jini.core.lookup.ServiceRegistrar; import net.jini.core.lookup.ServiceEvent; import net.jini.core.lookup.ServiceItem; @@ -43,6 +44,7 @@ import java.util.Vector; import java.io.IOException; import java.io.Serializable; import java.util.ArrayList; +import java.util.Collections; import java.util.List; /** This class is used to verify that after using templates containing only @@ -254,6 +256,7 @@ public class NotifyOnEntryAttrAddNonNull } QATestUtils.verifyEventTuples (receivedTuples,expectedTuples,maxNMsToWaitForEvents,SHOW_TIMINGS, this); + Collections.sort(evntVec, new RemoteEventComparator()); QATestUtils.verifyEventItems(evntVec); } Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set01/NotifyOnEntryAttrAddNull.java URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set01/NotifyOnEntryAttrAddNull.java?rev=1598934&r1=1598933&r2=1598934&view=diff ============================================================================== --- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set01/NotifyOnEntryAttrAddNull.java (original) +++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set01/NotifyOnEntryAttrAddNull.java Sun Jun 1 00:33:54 2014 @@ -24,6 +24,7 @@ import com.sun.jini.qa.harness.TestExcep import com.sun.jini.test.spec.lookupservice.QATestRegistrar; import com.sun.jini.test.spec.lookupservice.QATestUtils; +import com.sun.jini.test.spec.lookupservice.RemoteEventComparator; import net.jini.core.lookup.ServiceRegistrar; import net.jini.core.lookup.ServiceEvent; import net.jini.core.lookup.ServiceItem; @@ -43,6 +44,7 @@ import java.util.Vector; import java.io.IOException; import java.io.Serializable; import java.util.ArrayList; +import java.util.Collections; import java.util.List; /** This class is used to verify that after using templates containing only @@ -254,6 +256,7 @@ public class NotifyOnEntryAttrAddNull ex } QATestUtils.verifyEventTuples (receivedTuples,expectedTuples,maxNMsToWaitForEvents,SHOW_TIMINGS, this); + Collections.sort(evntVec, new RemoteEventComparator()); QATestUtils.verifyEventItems(evntVec); } Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set01/NotifyOnEntrySrvcReg.java URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set01/NotifyOnEntrySrvcReg.java?rev=1598934&r1=1598933&r2=1598934&view=diff ============================================================================== --- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set01/NotifyOnEntrySrvcReg.java (original) +++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set01/NotifyOnEntrySrvcReg.java Sun Jun 1 00:33:54 2014 @@ -24,6 +24,7 @@ import com.sun.jini.qa.harness.TestExcep import com.sun.jini.test.spec.lookupservice.QATestRegistrar; import com.sun.jini.test.spec.lookupservice.QATestUtils; +import com.sun.jini.test.spec.lookupservice.RemoteEventComparator; import net.jini.core.lookup.ServiceRegistrar; import net.jini.core.lookup.ServiceEvent; import net.jini.core.lookup.ServiceItem; @@ -43,6 +44,7 @@ import java.util.Vector; import java.io.IOException; import java.io.Serializable; import java.util.ArrayList; +import java.util.Collections; import java.util.List; /** This class is used to verify that after using templates containing only @@ -252,6 +254,7 @@ public class NotifyOnEntrySrvcReg extend } QATestUtils.verifyEventTuples (receivedTuples,expectedTuples,maxNMsToWaitForEvents,SHOW_TIMINGS, this); + Collections.sort(evntVec, new RemoteEventComparator()); QATestUtils.verifyEventItems(evntVec); } Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set02/NotifyOnComboAttrSet.java URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set02/NotifyOnComboAttrSet.java?rev=1598934&r1=1598933&r2=1598934&view=diff ============================================================================== --- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set02/NotifyOnComboAttrSet.java (original) +++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set02/NotifyOnComboAttrSet.java Sun Jun 1 00:33:54 2014 @@ -24,6 +24,7 @@ import com.sun.jini.qa.harness.TestExcep import com.sun.jini.test.spec.lookupservice.QATestRegistrar; import com.sun.jini.test.spec.lookupservice.QATestUtils; +import com.sun.jini.test.spec.lookupservice.RemoteEventComparator; import net.jini.core.lookup.ServiceRegistrar; import net.jini.core.lookup.ServiceEvent; import net.jini.core.lookup.ServiceItem; @@ -43,6 +44,7 @@ import java.util.Vector; import java.io.IOException; import java.io.Serializable; import java.util.ArrayList; +import java.util.Collections; import java.util.List; /** This class is used to verify that after using templates containing a @@ -296,6 +298,7 @@ public class NotifyOnComboAttrSet extend } QATestUtils.verifyEventTuples (receivedTuples,expectedTuples,maxNMsToWaitForEvents,SHOW_TIMINGS, this); + Collections.sort(evntVec, new RemoteEventComparator()); QATestUtils.verifyEventItems(evntVec); }
