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 2012/11/14 14:39:06 UTC
svn commit: r1409198 - in /river/jtsk/trunk/qa/src/com/sun/jini/test:
impl/joinmanager/ impl/lookupdiscovery/ share/ spec/discoverymanager/
spec/joinmanager/ spec/locatordiscovery/ spec/lookupdiscovery/
spec/servicediscovery/ spec/servicediscovery/lookup/
Author: peter_firmstone
Date: Wed Nov 14 13:39:02 2012
New Revision: 1409198
URL: http://svn.apache.org/viewvc?rev=1409198&view=rev
Log:
Clearing up what appears to be some synchronisation issues in the QA test suite, replacing ArrayList with List and HashMap with Map.
Modified:
river/jtsk/trunk/qa/src/com/sun/jini/test/impl/joinmanager/RegisterStorm.java
river/jtsk/trunk/qa/src/com/sun/jini/test/impl/lookupdiscovery/RestoreContextForTasks.java
river/jtsk/trunk/qa/src/com/sun/jini/test/share/BaseQATest.java
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/discoverymanager/AbstractBaseTest.java
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/discoverymanager/DiscardUnreachable.java
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/discoverymanager/GroupsMulticastMonitorReplace.java
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/discoverymanager/MulticastMonitorChange.java
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/discoverymanager/MulticastMonitorReplace.java
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/discoverymanager/MulticastMonitorReplaceNone.java
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/discoverymanager/MulticastMonitorStop.java
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/discoverymanager/MulticastMonitorTerminate.java
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/discoverymanager/RemoveGroupsSome.java
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/discoverymanager/SetGroupsReplaceSome.java
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/joinmanager/AbstractBaseTest.java
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/joinmanager/GetJoinSetCallback.java
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/AbstractBaseTest.java
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/DiscardUnreachable.java
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/GetRegistrars.java
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/RemoveLocatorsSome.java
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/SetLocatorsReplaceSome.java
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupdiscovery/AbstractBaseTest.java
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupdiscovery/DiscardUnreachable.java
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupdiscovery/Discovered.java
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupdiscovery/GetRegistrars.java
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupdiscovery/MulticastMonitorChange.java
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupdiscovery/MulticastMonitorReplace.java
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupdiscovery/MulticastMonitorStopReplace.java
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupdiscovery/RemoveGroupsRemoveSome.java
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupdiscovery/SetGroupsReplaceSome.java
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/AbstractBaseTest.java
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/Lookup.java
Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/impl/joinmanager/RegisterStorm.java
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/impl/joinmanager/RegisterStorm.java?rev=1409198&r1=1409197&r2=1409198&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/impl/joinmanager/RegisterStorm.java (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/impl/joinmanager/RegisterStorm.java Wed Nov 14 13:39:02 2012
@@ -34,6 +34,7 @@ import net.jini.core.lookup.ServiceMatch
import java.rmi.RemoteException;
import java.util.ArrayList;
+import java.util.List;
/**
* This class verifies that the <code>JoinManager</code> utility class
@@ -116,7 +117,7 @@ public class RegisterStorm extends Abstr
logger.log(Level.FINE,
"querying the lookup service "
+"to verify all service registrations ...");
- ArrayList lusList = getLookupListSnapshot
+ List lusList = getLookupListSnapshot
("impl.joinmanager.RegisterStorm");
ServiceRegistrar reg = (ServiceRegistrar)lusList.get(0);
/* Verify nServices registered with lookup service 0 */
Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/impl/lookupdiscovery/RestoreContextForTasks.java
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/impl/lookupdiscovery/RestoreContextForTasks.java?rev=1409198&r1=1409197&r2=1409198&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/impl/lookupdiscovery/RestoreContextForTasks.java (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/impl/lookupdiscovery/RestoreContextForTasks.java Wed Nov 14 13:39:02 2012
@@ -140,7 +140,7 @@ public class RestoreContextForTasks exte
* </ul>
* @throws com.sun.jini.qa.harness.TestException
*/
- private void doDiscovery(ArrayList locGroupsListStartedLookups,
+ private void doDiscovery(List locGroupsListStartedLookups,
LookupDiscovery ld,
LookupListener listener,
String[] groupsToDiscover)
Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/share/BaseQATest.java
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/share/BaseQATest.java?rev=1409198&r1=1409197&r2=1409198&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/share/BaseQATest.java (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/share/BaseQATest.java Wed Nov 14 13:39:02 2012
@@ -57,6 +57,7 @@ import java.rmi.RemoteException;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
@@ -170,7 +171,7 @@ abstract public class BaseQATest extends
synchronized(this) {
Set dSet = discoveredMap.keySet();
Set eSet = expectedDiscoveredMap.keySet();
- ArrayList uLocsList = new ArrayList(eSet.size());
+ List uLocsList = new ArrayList(eSet.size());
Iterator iter = eSet.iterator();
while(iter.hasNext()) {
LookupLocator loc = (LookupLocator)iter.next();
@@ -207,7 +208,7 @@ abstract public class BaseQATest extends
/** Use this method to set the contents of the discoveredMap to a
* specific set of values.
*/
- public void setDiscoveredMap(ArrayList locGroupsList) {
+ public void setDiscoveredMap(List locGroupsList) {
synchronized(this) {
discoveredMap.clear();
discardedMap.clear();
@@ -222,7 +223,7 @@ abstract public class BaseQATest extends
/** Use this method to set the contents of both the discoveredMap
* and the expectedDiscardedMap to a specific set of values.
*/
- public void setDiscardEventInfo(ArrayList locGroupsList) {
+ public void setDiscardEventInfo(List locGroupsList) {
synchronized(this) {
discoveredMap.clear();
discardedMap.clear();
@@ -245,13 +246,13 @@ abstract public class BaseQATest extends
* current and/or expected state of the fields of this class related
* to the discovered/discarded event state of this listener.
*/
- public void setLookupsToDiscover(ArrayList locGroupsList) {
+ public void setLookupsToDiscover(List locGroupsList) {
setLookupsToDiscover(locGroupsList,
toLocatorArray(allLookupsToStart),
toGroupsArray(allLookupsToStart));
}//end setLookupsToDiscover
- public void setLookupsToDiscover(ArrayList locGroupsList,
+ public void setLookupsToDiscover(List locGroupsList,
LookupLocator[] locatorsToDiscover)
{
setLookupsToDiscover(locGroupsList,
@@ -259,7 +260,7 @@ abstract public class BaseQATest extends
DiscoveryGroupManagement.NO_GROUPS);
}//end setLookupsToDiscover
- public void setLookupsToDiscover(ArrayList locGroupsList,
+ public void setLookupsToDiscover(List locGroupsList,
String[] groupsToDiscover)
{
setLookupsToDiscover(locGroupsList,
@@ -267,7 +268,7 @@ abstract public class BaseQATest extends
groupsToDiscover);
}//end setLookupsToDiscover
- public void setLookupsToDiscover(ArrayList locGroupsList,
+ public void setLookupsToDiscover(List locGroupsList,
LookupLocator[] locatorsToDiscover,
String[] groupsToDiscover)
{
@@ -534,7 +535,7 @@ abstract public class BaseQATest extends
Map groupsMap = evnt.getGroups();
synchronized(this) {
boolean oneDiscovered = false;
- ArrayList lusList = getLookupListSnapshot
+ List lusList = getLookupListSnapshot
("BaseQATest$LookupListenter.discovered");
for(int i=0;i<regs.length;i++) {
LookupLocator loc = null;
@@ -708,12 +709,12 @@ abstract public class BaseQATest extends
* current and/or expected state of the fields of this class related
* to the changed event state of this listener.
*/
- public void setLookupsToDiscover(ArrayList locGroupsList) {
+ public void setLookupsToDiscover(List locGroupsList) {
this.setLookupsToDiscover(locGroupsList,
toGroupsArray(allLookupsToStart));
}//end setLookupsToDiscover
- public void setLookupsToDiscover(ArrayList locGroupsList,
+ public void setLookupsToDiscover(List locGroupsList,
String[] groupsToDiscover)
{
this.setLookupsToDiscover(locGroupsList,
@@ -721,7 +722,7 @@ abstract public class BaseQATest extends
groupsToDiscover);
}//end setLookupsToDiscover
- public void setLookupsToDiscover(ArrayList locGroupsList,
+ public void setLookupsToDiscover(List locGroupsList,
LookupLocator[] locatorsToDiscover,
String[] groupsToDiscover)
{
@@ -821,7 +822,7 @@ abstract public class BaseQATest extends
Map groupsMap = evnt.getGroups();
synchronized(this) {
boolean oneChanged = false;
- ArrayList regList = getLookupListSnapshot
+ List regList = getLookupListSnapshot
("BaseQATest$LookupListenter.changed");
for(int i=0;i<regs.length;i++) {
if( regList.contains(regs[i]) ) {
@@ -874,14 +875,14 @@ abstract public class BaseQATest extends
2*60*1000,
60*1000, 30*1000, 20*1000, 10*1000, 5*1000 };
private int startIndx = 0;
- private final ArrayList locGroupsList;
+ private final List locGroupsList;
/** Use this constructor if it is desired that all lookup services
* be started in this thread. The locGroupsList parameter is an
* ArrayList that should contain LocatorGroupsPair instances that
* reference the locator and corresponding member groups of each
* lookup service to start.
*/
- public StaggeredStartThread(ArrayList locGroupsList) {
+ public StaggeredStartThread(List locGroupsList) {
this(0,locGroupsList);
}//end constructor
@@ -892,7 +893,7 @@ abstract public class BaseQATest extends
* instances that reference the locator and corresponding member
* groups of each lookup service to start.
*/
- public StaggeredStartThread(int startIndx,ArrayList locGroupsList) {
+ public StaggeredStartThread(int startIndx,List locGroupsList) {
super("StaggeredStartThread");
setDaemon(true);
this.startIndx = startIndx;
@@ -997,22 +998,21 @@ abstract public class BaseQATest extends
protected volatile String remoteHost = "UNKNOWN_HOST";
/* Data structures - lookup services */
- protected final ArrayList initLookupsToStart = new ArrayList(11);
- protected final ArrayList addLookupsToStart = new ArrayList(11);
- protected final ArrayList allLookupsToStart = new ArrayList(11);
- protected final ArrayList lookupsStarted = new ArrayList(11);
+ protected final List initLookupsToStart = Collections.synchronizedList(new ArrayList(11));
+ protected final List addLookupsToStart = Collections.synchronizedList(new ArrayList(11));
+ protected final List allLookupsToStart = Collections.synchronizedList(new ArrayList(11));
+ protected final List lookupsStarted = Collections.synchronizedList(new ArrayList(11));
- protected final ArrayList lookupList = new ArrayList(1);
- protected final HashMap genMap = new HashMap(11);
+ protected final List lookupList = new ArrayList(1); //Synchronized externally.
+ protected final Map genMap = Collections.synchronizedMap(new HashMap(11));
protected volatile int nStarted = 0;
/* Data structures - lookup discovery services */
- protected final ArrayList initLDSToStart = new ArrayList(11);
- protected final ArrayList addLDSToStart = new ArrayList(11);
- protected final ArrayList allLDSToStart = new ArrayList(11);
- protected final ArrayList ldsList = new ArrayList(1);
+ protected final List initLDSToStart = Collections.synchronizedList(new ArrayList(11));
+ protected final List addLDSToStart = Collections.synchronizedList(new ArrayList(11));
+ protected final List allLDSToStart = Collections.synchronizedList(new ArrayList(11));
+ protected final List ldsList = Collections.synchronizedList(new ArrayList(1));
- protected volatile Class[] serviceClasses = null;
- protected final ArrayList expectedServiceList = new ArrayList(1);
+ protected final List expectedServiceList = Collections.synchronizedList(new ArrayList(1));
protected volatile QAConfig config = null;
@@ -1026,7 +1026,7 @@ abstract public class BaseQATest extends
* is started, the registrar and its locator/groups pair are added to this
* map.
*/
- protected final HashMap regsToLocGroupsMap = new HashMap(11);
+ protected final Map regsToLocGroupsMap = Collections.synchronizedMap(new HashMap(11));
/* Private instance variables */
@@ -1034,7 +1034,7 @@ abstract public class BaseQATest extends
* lookup service so those groups can be mapped to the correct member
* groups configuration item.
*/
- private final ArrayList memberGroupsList = new ArrayList(11);
+ private final List memberGroupsList = Collections.synchronizedList(new ArrayList(11));
/** Performs actions necessary to prepare for execution of the
* current test as follows:
@@ -1149,7 +1149,7 @@ abstract public class BaseQATest extends
* the locator component of an element of the given <code>ArrayList</code>
* containing instances of <code>LocatorGroupsPair</code>.
*/
- public static LookupLocator[] toLocatorArray(ArrayList list) {
+ public static LookupLocator[] toLocatorArray(List list) {
LookupLocator[] locArray = new LookupLocator[list.size()];
for(int i=0;i<list.size();i++) {
LocatorGroupsPair pair = (LocatorGroupsPair)list.get(i);
@@ -1171,8 +1171,8 @@ abstract public class BaseQATest extends
* (although it can belong to NO_GROUPS), this method does not deal
* with the possibility of ALL_GROUPS in the given <code>ArrayList</code>.
*/
- public static String[] toGroupsArray(ArrayList list) {
- ArrayList groupsList = new ArrayList(11);
+ public static String[] toGroupsArray(List list) {
+ List groupsList = new ArrayList(11);
for(int i=0;i<list.size();i++) {
LocatorGroupsPair pair = (LocatorGroupsPair)list.get(i);
String[] curGroups = pair.groups;
@@ -1237,7 +1237,7 @@ abstract public class BaseQATest extends
* mean simply that the given locator with corresponding groups
* was not found.
*/
- public static String[] getGroups(LookupLocator loc, ArrayList list) {
+ public static String[] getGroups(LookupLocator loc, List list) {
for(int i=0;i<list.size();i++) {
LocatorGroupsPair pair = (LocatorGroupsPair)list.get(i);
if(loc.equals(pair.locator)) return pair.groups;
@@ -1254,7 +1254,7 @@ abstract public class BaseQATest extends
* service belongs to groups which are not desired to be discovered,
* this method returns false.
*/
- public static boolean discoverAllLookups(ArrayList list,
+ public static boolean discoverAllLookups(List list,
String[] groupsToDiscover)
{
/* If ALL_GROUPS, then we must want to discover all the lookups */
@@ -1281,10 +1281,10 @@ abstract public class BaseQATest extends
* if one or more of the groups associated with a particular element of
* the given list are contained in the given set of groupsToDiscover.
*/
- public static ArrayList filterListByGroups(ArrayList list,
+ public static List filterListByGroups(List list,
String[] groupsToDiscover)
{
- ArrayList filteredList = new ArrayList(list.size());
+ List filteredList = new ArrayList(list.size());
for(int i=0;i<list.size();i++) {
LocatorGroupsPair pair = (LocatorGroupsPair)list.get(i);
String[] groups = pair.groups;
@@ -1371,18 +1371,18 @@ abstract public class BaseQATest extends
* The size of that list is retrieved while the list is locked,
* so that the list is not modified while the copy is being made.
*/
- protected ArrayList getLookupListSnapshot() {
+ protected List getLookupListSnapshot() {
return getLookupListSnapshot(null);
}//end getLookupListSnapshot
- protected ArrayList getLookupListSnapshot(String infoStr) {
+ protected List getLookupListSnapshot(String infoStr) {
String str = ( (infoStr == null) ?
" sync on lookupList --> " :
" "+infoStr+" - sync on lookupList --> ");
if(debugsync) logger.log(Level.FINE, str+"requested");
synchronized(lookupList) {
if(debugsync) logger.log(Level.FINE, str+"granted");
- ArrayList listSnapshot = new ArrayList(lookupList.size());
+ List listSnapshot = new ArrayList(lookupList.size());
for(int i=0;i<lookupList.size();i++) {
listSnapshot.add(i,lookupList.get(i));
}//end loop
@@ -2379,12 +2379,12 @@ abstract public class BaseQATest extends
* correctly (a discarded event should not be expected for a lookup
* service that couldn't be discarded).
*/
- protected ArrayList pingAndDiscard(ServiceRegistrar[] proxies,
+ protected List pingAndDiscard(ServiceRegistrar[] proxies,
DiscoveryManagement dm,
LookupListener listener)
{
- ArrayList proxiesToDiscard = new ArrayList(1);
- ArrayList locGroupsNotDiscarded = new ArrayList(1);
+ List proxiesToDiscard = new ArrayList(1);
+ List locGroupsNotDiscarded = new ArrayList(1);
/* Determine proxies to discard and proxies that cannot be discarded */
for(int i=0;i<proxies.length;i++) {
LocatorGroupsPair curPair
@@ -2578,8 +2578,8 @@ abstract public class BaseQATest extends
* This method can be used to cause various discovered/discarded/changed
* events to be sent by the discovery helper utility.
*/
- protected ArrayList replaceMemberGroups(boolean alternate) {
- ArrayList locGroupsList = new ArrayList(genMap.size());
+ protected List replaceMemberGroups(boolean alternate) {
+ List locGroupsList = new ArrayList(genMap.size());
Iterator iter = genMap.keySet().iterator();
for(int i=0;iter.hasNext();i++) {
/* Replace the member groups of the current lookup service */
@@ -2616,7 +2616,7 @@ abstract public class BaseQATest extends
* This method can be used to cause various discovered/discarded/changed
* events to be sent by the discovery helper utility.
*/
- protected ArrayList replaceMemberGroups() {
+ protected List replaceMemberGroups() {
return replaceMemberGroups(false);
}//end replaceMemberGroups
@@ -2629,7 +2629,7 @@ abstract public class BaseQATest extends
* of the lookup services that was started; and in which the locator of
* the associated lookup service is paired with given set of groups.
*/
- protected ArrayList replaceMemberGroups(String[] newGroups) {
+ protected List replaceMemberGroups(String[] newGroups) {
return replaceMemberGroups(genMap.size(),newGroups);
}//end replaceMemberGroups
@@ -2643,10 +2643,10 @@ abstract public class BaseQATest extends
* of the lookup services that was started; and in which the locator of
* the associated lookup service is paired with the given set of groups.
*/
- protected ArrayList replaceMemberGroups(int nReplacements,
+ protected List replaceMemberGroups(int nReplacements,
String[] newGroups)
{
- ArrayList locGroupsList = new ArrayList(genMap.size());
+ List locGroupsList = new ArrayList(genMap.size());
Iterator iter = genMap.keySet().iterator();
for(int i=0;iter.hasNext();i++) {
Object generator = iter.next();
@@ -3313,8 +3313,8 @@ abstract public class BaseQATest extends
* class type.
*/
protected Class[] getServiceClassArray() {
- ArrayList classnamesList = new ArrayList(5);
- ArrayList loadedClassList = new ArrayList(expectedServiceList.size());
+ List classnamesList = new ArrayList(5);
+ List loadedClassList = new ArrayList(expectedServiceList.size());
if( (nLookupDiscoveryServices+nRemoteLookupDiscoveryServices) > 0) {
classnamesList.add
(new String("net.jini.discovery.LookupDiscoveryService") );
@@ -3367,7 +3367,7 @@ abstract public class BaseQATest extends
String[] tojoin = config.parseString(tojoinArg,",");
if(tojoin == null) return DiscoveryGroupManagement.ALL_GROUPS;
if(tojoin.length == 0) return DiscoveryGroupManagement.NO_GROUPS;
- ArrayList tojoinList = new ArrayList(tojoin.length);
+ List tojoinList = new ArrayList(tojoin.length);
for(int i=0;i<tojoin.length;i++) {
if( !config.isLocator(tojoin[i]) ) tojoinList.add(tojoin[i]);
}//end loop
@@ -3387,7 +3387,7 @@ abstract public class BaseQATest extends
String[] tojoin = config.parseString(tojoinArg,",");
if(tojoin == null) return new LookupLocator[0];
if(tojoin.length == 0) return new LookupLocator[0];
- ArrayList tojoinList = new ArrayList(tojoin.length);
+ List tojoinList = new ArrayList(tojoin.length);
for(int i=0;i<tojoin.length;i++) {
try {
tojoinList.add(QAConfig.getConstrainedLocator(tojoin[i]));
Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/discoverymanager/AbstractBaseTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/discoverymanager/AbstractBaseTest.java?rev=1409198&r1=1409197&r2=1409198&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/discoverymanager/AbstractBaseTest.java (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/discoverymanager/AbstractBaseTest.java Wed Nov 14 13:39:02 2012
@@ -36,6 +36,7 @@ import net.jini.core.lookup.ServiceRegis
import java.io.IOException;
import java.rmi.RemoteException;
import java.util.ArrayList;
+import java.util.List;
/**
* This class is an abstract class that acts as the base class which
@@ -165,7 +166,7 @@ abstract public class AbstractBaseTest e
* </ul>
* @throws com.sun.jini.qa.harness.TestException
*/
- protected void doDiscovery(ArrayList locGroupsListStartedLookups,
+ protected void doDiscovery(List locGroupsListStartedLookups,
LookupDiscoveryManager ldm,
LookupListener listener,
LookupLocator[] locsToDiscover,
@@ -210,7 +211,7 @@ abstract public class AbstractBaseTest e
* determining the lookups to discover by group, by locator, and by both.
* @throws com.sun.jini.qa.harness.TestException
*/
- protected void doDiscovery(ArrayList locGroupsListStartedLookups,
+ protected void doDiscovery(List locGroupsListStartedLookups,
LookupDiscoveryManager ldm,
LookupListener listener,
int discoverByRow) throws TestException,
@@ -232,7 +233,7 @@ abstract public class AbstractBaseTest e
* the lookups to discover by group, by locator, and by both.
* @throws com.sun.jini.qa.harness.TestException
*/
- protected void doDiscovery(ArrayList locGroupsListStartedLookups,
+ protected void doDiscovery(List locGroupsListStartedLookups,
LookupListener listener,
int discoverByRow) throws TestException,
IOException
@@ -254,7 +255,7 @@ abstract public class AbstractBaseTest e
* mechanism(s) (group, locator or both) are to be used to discover
* the corresponding lookup service.
*/
- public static LookupLocator[] toLocatorsToDiscover(ArrayList list,
+ public static LookupLocator[] toLocatorsToDiscover(List list,
int discoverByRow)
{
ArrayList locList = new ArrayList(list.size());
@@ -279,7 +280,7 @@ abstract public class AbstractBaseTest e
* mechanism(s) (group, locator or both) are to be used to discover
* the corresponding lookup service.
*/
- public static String[] toGroupsToDiscover(ArrayList list,
+ public static String[] toGroupsToDiscover(List list,
int discoverByRow)
{
ArrayList groupsList = new ArrayList(11);
Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/discoverymanager/DiscardUnreachable.java
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/discoverymanager/DiscardUnreachable.java?rev=1409198&r1=1409197&r2=1409198&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/discoverymanager/DiscardUnreachable.java (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/discoverymanager/DiscardUnreachable.java Wed Nov 14 13:39:02 2012
@@ -25,6 +25,7 @@ import net.jini.core.lookup.ServiceRegis
import java.util.ArrayList;
import java.util.logging.Level;
import com.sun.jini.qa.harness.QAConfig;
+import java.util.List;
/**
* With respect to the <code>discard</code> method, this class verifies
@@ -89,7 +90,7 @@ public class DiscardUnreachable extends
logger.log(Level.FINE, "discarding un-reachable lookup services ...");
/* This will cause discarded events to be sent */
- ArrayList locGroupsNotDiscarded = pingAndDiscard(proxies,
+ List locGroupsNotDiscarded = pingAndDiscard(proxies,
discoveryMgr,
mainListener);
/* Set the expected discard event info */
Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/discoverymanager/GroupsMulticastMonitorReplace.java
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/discoverymanager/GroupsMulticastMonitorReplace.java?rev=1409198&r1=1409197&r2=1409198&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/discoverymanager/GroupsMulticastMonitorReplace.java (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/discoverymanager/GroupsMulticastMonitorReplace.java Wed Nov 14 13:39:02 2012
@@ -21,6 +21,7 @@ package com.sun.jini.test.spec.discovery
import java.util.logging.Level;
import com.sun.jini.qa.harness.QAConfig;
import java.util.ArrayList;
+import java.util.List;
/**
* This class verifies that the <code>LookupDiscoveryManager</code> utility
@@ -87,7 +88,7 @@ public class GroupsMulticastMonitorRepla
* maps to change until setLookupsToDiscover returns.
*/
synchronized(mainListener) {
- ArrayList locGroupsPairList = null;
+ List locGroupsPairList = null;
/* Replace current groups with new groups to cause discards */
if(replacementGroups == null) {//use unique generated groups
locGroupsPairList = replaceMemberGroups();
Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/discoverymanager/MulticastMonitorChange.java
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/discoverymanager/MulticastMonitorChange.java?rev=1409198&r1=1409197&r2=1409198&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/discoverymanager/MulticastMonitorChange.java (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/discoverymanager/MulticastMonitorChange.java Wed Nov 14 13:39:02 2012
@@ -22,6 +22,7 @@ import java.util.logging.Level;
import java.util.ArrayList;
import com.sun.jini.qa.harness.QAConfig;
+import java.util.List;
/**
* This class verifies that the <code>LookupDiscoveryManager</code> utility
@@ -83,7 +84,7 @@ public class MulticastMonitorChange exte
*/
synchronized(mainListener) {
/* Replace alternate groups to cause changed events */
- ArrayList locGroupsPairList = replaceMemberGroups(true);
+ List locGroupsPairList = replaceMemberGroups(true);
/* Set the expected changed event info */
mainListener.setLookupsToDiscover(locGroupsPairList,
locatorsToDiscover,
Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/discoverymanager/MulticastMonitorReplace.java
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/discoverymanager/MulticastMonitorReplace.java?rev=1409198&r1=1409197&r2=1409198&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/discoverymanager/MulticastMonitorReplace.java (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/discoverymanager/MulticastMonitorReplace.java Wed Nov 14 13:39:02 2012
@@ -22,6 +22,7 @@ import java.util.logging.Level;
import java.util.ArrayList;
import com.sun.jini.qa.harness.QAConfig;
+import java.util.List;
/**
* This class verifies that the <code>LookupDiscoveryManager</code> utility
@@ -79,7 +80,7 @@ public class MulticastMonitorReplace ext
*/
synchronized(mainListener) {
/* Replace all groups to cause discarded/changed events */
- ArrayList locGroupsPairList = replaceMemberGroups(false);
+ List locGroupsPairList = replaceMemberGroups(false);
/* Set the expected changed event info */
mainListener.setLookupsToDiscover(locGroupsPairList,
locatorsToDiscover,
Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/discoverymanager/MulticastMonitorReplaceNone.java
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/discoverymanager/MulticastMonitorReplaceNone.java?rev=1409198&r1=1409197&r2=1409198&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/discoverymanager/MulticastMonitorReplaceNone.java (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/discoverymanager/MulticastMonitorReplaceNone.java Wed Nov 14 13:39:02 2012
@@ -23,6 +23,7 @@ import java.util.logging.Level;
import net.jini.discovery.DiscoveryGroupManagement;
import java.util.ArrayList;
import com.sun.jini.qa.harness.QAConfig;
+import java.util.List;
/**
* This class verifies that the <code>LookupDiscoveryManager</code> utility
@@ -69,7 +70,7 @@ public class MulticastMonitorReplaceNone
*/
synchronized(mainListener) {
/* Replace all groups with NO_GROUPS to generate events */
- ArrayList locGroupsPairList = replaceMemberGroups
+ List locGroupsPairList = replaceMemberGroups
(DiscoveryGroupManagement.NO_GROUPS);
/* Set the expected changed event info */
mainListener.setLookupsToDiscover(locGroupsPairList,
Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/discoverymanager/MulticastMonitorStop.java
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/discoverymanager/MulticastMonitorStop.java?rev=1409198&r1=1409197&r2=1409198&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/discoverymanager/MulticastMonitorStop.java (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/discoverymanager/MulticastMonitorStop.java Wed Nov 14 13:39:02 2012
@@ -23,6 +23,7 @@ import java.util.logging.Level;
import java.util.ArrayList;
import java.util.logging.Level;
import com.sun.jini.qa.harness.QAConfig;
+import java.util.List;
/**
* This class verifies that the <code>LookupDiscoveryManager</code> utility
@@ -104,7 +105,7 @@ public class MulticastMonitorStop extend
synchronized(mainListener) {
stopAnnouncements();
/* Replace current groups with new groups to cause discards */
- ArrayList locGroupsPairList = replaceMemberGroups(false);
+ List locGroupsPairList = replaceMemberGroups(false);
mainListener.setLookupsToDiscover(locGroupsPairList,
locatorsToDiscover,
groupsToDiscover);
Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/discoverymanager/MulticastMonitorTerminate.java
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/discoverymanager/MulticastMonitorTerminate.java?rev=1409198&r1=1409197&r2=1409198&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/discoverymanager/MulticastMonitorTerminate.java (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/discoverymanager/MulticastMonitorTerminate.java Wed Nov 14 13:39:02 2012
@@ -22,6 +22,7 @@ import java.util.logging.Level;
import java.util.ArrayList;
import com.sun.jini.qa.harness.QAConfig;
+import java.util.List;
/**
* This class verifies that the <code>LookupDiscoveryManager</code> utility
@@ -80,7 +81,7 @@ public class MulticastMonitorTerminate e
* both group and locator discovery are retrieved, and the
* expected discard info is set for those lookups.
*/
- ArrayList discoveredByGroupsList =
+ List discoveredByGroupsList =
filterListByGroups(initLookupsToStart,
groupsToDiscover);
mainListener.setDiscardEventInfo(discoveredByGroupsList);
Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/discoverymanager/RemoveGroupsSome.java
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/discoverymanager/RemoveGroupsSome.java?rev=1409198&r1=1409197&r2=1409198&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/discoverymanager/RemoveGroupsSome.java (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/discoverymanager/RemoveGroupsSome.java Wed Nov 14 13:39:02 2012
@@ -24,6 +24,7 @@ import com.sun.jini.test.share.GroupsUti
import net.jini.discovery.DiscoveryGroupManagement;
import java.util.ArrayList;
import com.sun.jini.qa.harness.QAConfig;
+import java.util.List;
/**
* With respect to the <code>removeGroups</code> method, this class verifies
@@ -106,9 +107,9 @@ public class RemoveGroupsSome extends Di
* invoked by the run() method. This method constructs the set of
* groups to remove from the lookup discovery manager.
*/
- void setGroupsToRemove(ArrayList list, boolean alternate) {
- ArrayList removeList = new ArrayList(11);
- ArrayList newDiscoverList = new ArrayList(11);
+ void setGroupsToRemove(List list, boolean alternate) {
+ List removeList = new ArrayList(11);
+ List newDiscoverList = new ArrayList(11);
for(int i=0;i<list.size();i++) {
LocatorGroupsPair pair = (LocatorGroupsPair)list.get(i);
String[] curGroups = pair.groups;
Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/discoverymanager/SetGroupsReplaceSome.java
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/discoverymanager/SetGroupsReplaceSome.java?rev=1409198&r1=1409197&r2=1409198&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/discoverymanager/SetGroupsReplaceSome.java (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/discoverymanager/SetGroupsReplaceSome.java Wed Nov 14 13:39:02 2012
@@ -24,6 +24,7 @@ import com.sun.jini.test.share.GroupsUti
import net.jini.discovery.DiscoveryGroupManagement;
import java.util.ArrayList;
import com.sun.jini.qa.harness.QAConfig;
+import java.util.List;
/**
* With respect to the <code>setGroups</code> method, this class verifies
@@ -105,8 +106,8 @@ public class SetGroupsReplaceSome extend
* invoked by the run() method. This method constructs the new
* set of groups with which to re-configure the lookup discovery manager.
*/
- void setNewGroups(ArrayList list, boolean alternate) {
- ArrayList newDiscoverList = new ArrayList(11);
+ void setNewGroups(List list, boolean alternate) {
+ List newDiscoverList = new ArrayList(11);
for(int i=0;i<list.size();i++) {
LocatorGroupsPair pair = (LocatorGroupsPair)list.get(i);
String[] curGroups = pair.groups;
Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/joinmanager/AbstractBaseTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/joinmanager/AbstractBaseTest.java?rev=1409198&r1=1409197&r2=1409198&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/joinmanager/AbstractBaseTest.java (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/joinmanager/AbstractBaseTest.java Wed Nov 14 13:39:02 2012
@@ -58,6 +58,7 @@ import java.rmi.RemoteException;
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.List;
import net.jini.config.ConfigurationException;
/**
@@ -473,7 +474,7 @@ abstract public class AbstractBaseTest e
DiscoveryServiceUtil.delayMS(1000);
}//end loop
/* Wait no more than another nSecsJoin */
- ArrayList lusList = getLookupListSnapshot
+ List lusList = getLookupListSnapshot
("AbstractBaseTest.verifyJoin");
ArrayList regList = new ArrayList(lusList.size());
long T0 = System.currentTimeMillis();
@@ -545,7 +546,7 @@ abstract public class AbstractBaseTest e
+nEventsRcvd
+" ServiceID event(s) received");
/* Retrieve and store the service's ID as stored in each lookup */
- ArrayList lusList = getLookupListSnapshot
+ List lusList = getLookupListSnapshot
("AbstractBaseTest.verifyJoin");
ArrayList srvcIDs = new ArrayList(lusList.size());
for(int i=0;i<lusList.size();i++) {
@@ -593,7 +594,7 @@ abstract public class AbstractBaseTest e
protected void verifyAttrsInJoinMgr(JoinManager joinMgr, Entry[] attrs)
throws Exception
{
- ArrayList lusList = getLookupListSnapshot
+ List lusList = getLookupListSnapshot
("AbstractBaseTest.verifyAttrsInJoinMgr");
if(lusList.size() > 0) {
verifyJoin(1);
@@ -645,7 +646,7 @@ abstract public class AbstractBaseTest e
protected void verifyPropagation(Entry[] attrs, int nSecsWait)
throws Exception
{
- ArrayList lusList = getLookupListSnapshot
+ List lusList = getLookupListSnapshot
("AbstractBaseTest.verifyPropagation");
if(lusList.size() > 0) {
if(nSecsWait > 0) {
Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/joinmanager/GetJoinSetCallback.java
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/joinmanager/GetJoinSetCallback.java?rev=1409198&r1=1409197&r2=1409198&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/joinmanager/GetJoinSetCallback.java (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/joinmanager/GetJoinSetCallback.java Wed Nov 14 13:39:02 2012
@@ -27,6 +27,7 @@ import net.jini.lookup.JoinManager;
import net.jini.core.lookup.ServiceRegistrar;
import java.util.ArrayList;
+import java.util.List;
/**
* This class verifies that the <code>JoinManager</code> utility class
@@ -98,7 +99,7 @@ public class GetJoinSetCallback extends
waitForDiscovery(mainListener);
verifyJoin();
joinRegs = jm.getJoinSet();
- ArrayList lusList = getLookupListSnapshot("GetJoinSetCallback.run");
+ List lusList = getLookupListSnapshot("GetJoinSetCallback.run");
startedRegs = (ServiceRegistrar[])(lusList).toArray
(new ServiceRegistrar[lusList.size()]);
logger.log(Level.FINE, "comparing the join set to the "
Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/AbstractBaseTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/AbstractBaseTest.java?rev=1409198&r1=1409197&r2=1409198&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/AbstractBaseTest.java (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/AbstractBaseTest.java Wed Nov 14 13:39:02 2012
@@ -32,6 +32,8 @@ import net.jini.core.lookup.ServiceRegis
import java.rmi.RemoteException;
import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
/**
* This class is an abstract class that acts as the base class from which
@@ -65,9 +67,9 @@ import java.util.ArrayList;
*/
abstract public class AbstractBaseTest extends BaseQATest {
- protected LookupLocatorDiscovery locatorDiscovery = null;
- protected ArrayList locatorDiscoveryList = new ArrayList(1);
- protected LookupListener mainListener = null;
+ protected volatile LookupLocatorDiscovery locatorDiscovery = null;
+ protected final List locatorDiscoveryList = Collections.synchronizedList(new ArrayList(1));
+ protected volatile LookupListener mainListener = null;
/** Performs actions necessary to prepare for execution of the
* current test as follows:
@@ -141,7 +143,7 @@ abstract public class AbstractBaseTest e
* </ul>
* @throws com.sun.jini.qa.harness.TestException
*/
- protected void doDiscovery(ArrayList locGroupsListToDiscover,
+ protected void doDiscovery(List locGroupsListToDiscover,
LookupLocatorDiscovery lld,
LookupListener listener) throws TestException
{
@@ -166,7 +168,7 @@ abstract public class AbstractBaseTest e
* created during setup is to be used for discovery.
* @throws com.sun.jini.qa.harness.TestException
*/
- protected void doDiscovery(ArrayList locGroupsListToDiscover,
+ protected void doDiscovery(List locGroupsListToDiscover,
LookupListener listener) throws TestException
{
doDiscovery(locGroupsListToDiscover,locatorDiscovery,listener);
Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/DiscardUnreachable.java
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/DiscardUnreachable.java?rev=1409198&r1=1409197&r2=1409198&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/DiscardUnreachable.java (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/DiscardUnreachable.java Wed Nov 14 13:39:02 2012
@@ -27,6 +27,7 @@ import com.sun.jini.test.share.Discovery
import net.jini.core.lookup.ServiceRegistrar;
import java.util.ArrayList;
+import java.util.List;
/**
* With respect to the <code>discard</code> method, this class verifies
@@ -92,7 +93,7 @@ public class DiscardUnreachable extends
DiscoveryServiceUtil.delayMS(7000);//wait for shutdown complete
logger.log(Level.FINE, "discarding un-reachable lookup services ...");
/* This will cause discarded events to be sent */
- ArrayList locGroupsNotDiscarded = pingAndDiscard
+ List locGroupsNotDiscarded = pingAndDiscard
(proxies,
locatorDiscovery,
mainListener);
Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/GetRegistrars.java
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/GetRegistrars.java?rev=1409198&r1=1409197&r2=1409198&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/GetRegistrars.java (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/GetRegistrars.java Wed Nov 14 13:39:02 2012
@@ -27,6 +27,7 @@ import net.jini.core.discovery.LookupLoc
import net.jini.core.lookup.ServiceRegistrar;
import java.util.ArrayList;
+import java.util.List;
/**
* This class verifies that the <code>LookupLocatorDiscovery</code> utility
@@ -79,7 +80,7 @@ public class GetRegistrars extends Disco
logger.log(Level.FINE, "calling getRegistrars ... ");
ServiceRegistrar[] regs = locatorDiscovery.getRegistrars();
- ArrayList lusList = getLookupListSnapshot("GetRegistrars.run");
+ List lusList = getLookupListSnapshot("GetRegistrars.run");
logger.log(Level.FINE, "# of lookups started = "+lusList.size()
+", # of registrars from LookupLocatorDiscover = "
+regs.length);
Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/RemoveLocatorsSome.java
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/RemoveLocatorsSome.java?rev=1409198&r1=1409197&r2=1409198&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/RemoveLocatorsSome.java (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/RemoveLocatorsSome.java Wed Nov 14 13:39:02 2012
@@ -25,6 +25,7 @@ import com.sun.jini.qa.harness.TestExcep
import net.jini.core.discovery.LookupLocator;
import java.util.ArrayList;
+import java.util.List;
/**
* With respect to the <code>removeLocators</code> method, this class
@@ -51,9 +52,9 @@ import java.util.ArrayList;
*/
public class RemoveLocatorsSome extends Discovered {
- protected ArrayList curLookupsToDiscover = initLookupsToStart;
- protected ArrayList newLookupsToDiscover = new ArrayList(11);
- protected ArrayList lookupsToRemoveList = new ArrayList(11);
+ protected List curLookupsToDiscover = initLookupsToStart;
+ protected List newLookupsToDiscover = new ArrayList(11);
+ protected List lookupsToRemoveList = new ArrayList(11);
protected LookupLocator[] locsToRemove = new LookupLocator[0];
protected boolean changeAll = false;
Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/SetLocatorsReplaceSome.java
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/SetLocatorsReplaceSome.java?rev=1409198&r1=1409197&r2=1409198&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/SetLocatorsReplaceSome.java (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/SetLocatorsReplaceSome.java Wed Nov 14 13:39:02 2012
@@ -26,6 +26,7 @@ import com.sun.jini.qa.harness.QAConfig;
import net.jini.core.discovery.LookupLocator;
import java.util.ArrayList;
+import java.util.List;
/**
* With respect to the <code>setLocators</code> method, this class verifies
@@ -59,9 +60,9 @@ import java.util.ArrayList;
public class SetLocatorsReplaceSome extends Discovered {
protected LookupLocator[] newLocatorsToDiscover = new LookupLocator[0];
- protected ArrayList oldLookupsToDiscover = initLookupsToStart;
- protected ArrayList newLookupsToDiscover = new ArrayList(11);
- protected ArrayList newLocatorsList = new ArrayList(11);
+ protected List oldLookupsToDiscover = initLookupsToStart;
+ protected List newLookupsToDiscover = new ArrayList(11);
+ protected List newLocatorsList = new ArrayList(11);
protected boolean changeAll = false;
Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupdiscovery/AbstractBaseTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupdiscovery/AbstractBaseTest.java?rev=1409198&r1=1409197&r2=1409198&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupdiscovery/AbstractBaseTest.java (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupdiscovery/AbstractBaseTest.java Wed Nov 14 13:39:02 2012
@@ -35,6 +35,7 @@ import net.jini.core.lookup.ServiceRegis
import java.io.IOException;
import java.rmi.RemoteException;
import java.util.ArrayList;
+import java.util.List;
/**
* This class is an abstract class that acts as the base class which
@@ -131,7 +132,7 @@ abstract public class AbstractBaseTest e
* </ul>
* @throws com.sun.jini.qa.harness.TestException
*/
- protected void doDiscovery(ArrayList locGroupsListStartedLookups,
+ protected void doDiscovery(List locGroupsListStartedLookups,
LookupDiscovery ld,
LookupListener listener,
String[] groupsToDiscover)
@@ -171,7 +172,7 @@ abstract public class AbstractBaseTest e
* parameter.
* @throws com.sun.jini.qa.harness.TestException
*/
- protected void doDiscovery(ArrayList locGroupsListStartedLookups,
+ protected void doDiscovery(List locGroupsListStartedLookups,
LookupListener listener,
String[] groupsToDiscover)
throws TestException,
@@ -189,7 +190,7 @@ abstract public class AbstractBaseTest e
* parameter.
* @throws com.sun.jini.qa.harness.TestException
*/
- protected void doDiscovery(ArrayList locGroupsListStartedLookups,
+ protected void doDiscovery(List locGroupsListStartedLookups,
LookupDiscovery ld,
LookupListener listener) throws TestException,
IOException
@@ -207,7 +208,7 @@ abstract public class AbstractBaseTest e
* parameter.
* @throws com.sun.jini.qa.harness.TestException
*/
- protected void doDiscovery(ArrayList locGroupsListStartedLookups,
+ protected void doDiscovery(List locGroupsListStartedLookups,
LookupListener listener) throws TestException,
IOException
{
Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupdiscovery/DiscardUnreachable.java
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupdiscovery/DiscardUnreachable.java?rev=1409198&r1=1409197&r2=1409198&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupdiscovery/DiscardUnreachable.java (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupdiscovery/DiscardUnreachable.java Wed Nov 14 13:39:02 2012
@@ -27,6 +27,7 @@ import com.sun.jini.test.share.Discovery
import net.jini.core.lookup.ServiceRegistrar;
import java.util.ArrayList;
+import java.util.List;
/**
* With respect to the <code>discard</code> method, this class verifies
@@ -98,7 +99,7 @@ public class DiscardUnreachable extends
logger.log(Level.FINE,
"discarding un-reachable lookup services ...");
/* This will cause discarded events to be sent */
- ArrayList locGroupsNotDiscarded = pingAndDiscard
+ List locGroupsNotDiscarded = pingAndDiscard
(proxies,
lookupDiscovery,
mainListener);
Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupdiscovery/Discovered.java
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupdiscovery/Discovered.java?rev=1409198&r1=1409197&r2=1409198&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupdiscovery/Discovered.java (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupdiscovery/Discovered.java Wed Nov 14 13:39:02 2012
@@ -25,6 +25,7 @@ import net.jini.discovery.DiscoveryGroup
import net.jini.discovery.LookupDiscovery;
import java.util.ArrayList;
+import java.util.List;
/**
* This class verifies that the <code>LookupDiscovery</code> utility
@@ -55,7 +56,7 @@ import java.util.ArrayList;
*/
public class Discovered extends AbstractBaseTest {
- protected ArrayList locGroupsList = new ArrayList(1);
+ protected List locGroupsList = new ArrayList(1);
protected LookupDiscovery ldToUse = null;
protected LookupListener listenerToUse = null;
protected String[] groupsToDiscover = DiscoveryGroupManagement.NO_GROUPS;
Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupdiscovery/GetRegistrars.java
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupdiscovery/GetRegistrars.java?rev=1409198&r1=1409197&r2=1409198&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupdiscovery/GetRegistrars.java (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupdiscovery/GetRegistrars.java Wed Nov 14 13:39:02 2012
@@ -27,6 +27,7 @@ import net.jini.core.discovery.LookupLoc
import net.jini.core.lookup.ServiceRegistrar;
import java.util.ArrayList;
+import java.util.List;
/**
* This class verifies that the <code>LookupDiscovery</code> utility
@@ -76,7 +77,7 @@ public class GetRegistrars extends Disco
super.run();
logger.log(Level.FINE, "calling getRegistrars ... ");
ServiceRegistrar[] regs = ldToUse.getRegistrars(); // prepared by lds
- ArrayList lusList = getLookupListSnapshot("GetRegistrars.run");
+ List lusList = getLookupListSnapshot("GetRegistrars.run");
logger.log(Level.FINE,
"# of lookups started = "+lusList.size()
+", # of registrars from LookupDiscovery = "
Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupdiscovery/MulticastMonitorChange.java
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupdiscovery/MulticastMonitorChange.java?rev=1409198&r1=1409197&r2=1409198&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupdiscovery/MulticastMonitorChange.java (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupdiscovery/MulticastMonitorChange.java Wed Nov 14 13:39:02 2012
@@ -22,6 +22,7 @@ import com.sun.jini.qa.harness.QAConfig;
import java.util.logging.Level;
import java.util.ArrayList;
+import java.util.List;
/**
* This class verifies that the <code>LookupDiscovery</code> utility
@@ -100,7 +101,7 @@ public class MulticastMonitorChange exte
* maps to change until setLookupsToDiscover returns.
*/
synchronized(listenerToUse) {
- ArrayList locGroupsPairList = null;
+ List locGroupsPairList = null;
/* Replace groups with new groups to cause changed events */
locGroupsPairList = replaceMemberGroups(alternateReplacements);
/* Set the expected changed event info */
Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupdiscovery/MulticastMonitorReplace.java
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupdiscovery/MulticastMonitorReplace.java?rev=1409198&r1=1409197&r2=1409198&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupdiscovery/MulticastMonitorReplace.java (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupdiscovery/MulticastMonitorReplace.java Wed Nov 14 13:39:02 2012
@@ -24,6 +24,7 @@ import java.util.logging.Level;
import com.sun.jini.qa.harness.TestException;
import java.util.ArrayList;
+import java.util.List;
/**
* This class verifies that the <code>LookupDiscovery</code> utility
@@ -96,7 +97,7 @@ public class MulticastMonitorReplace ext
* maps to change until setLookupsToDiscover returns.
*/
synchronized(listenerToUse) {
- ArrayList locGroupsPairList = null;
+ List locGroupsPairList = null;
/* Replace current groups with new groups to cause discards */
if(replacementGroups == null) {//use unique generated groups
locGroupsPairList = replaceMemberGroups();
Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupdiscovery/MulticastMonitorStopReplace.java
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupdiscovery/MulticastMonitorStopReplace.java?rev=1409198&r1=1409197&r2=1409198&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupdiscovery/MulticastMonitorStopReplace.java (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupdiscovery/MulticastMonitorStopReplace.java Wed Nov 14 13:39:02 2012
@@ -22,6 +22,7 @@ import com.sun.jini.qa.harness.QAConfig;
import java.util.logging.Level;
import java.util.ArrayList;
+import java.util.List;
/** This class verifies that the <code>LookupDiscovery</code> utility
* monitors the multicast announcements sent from lookup services
@@ -99,7 +100,7 @@ public class MulticastMonitorStopReplace
synchronized(mainListener) {
stopAnnouncements();
/* Replace current groups with new groups to cause discards */
- ArrayList locGroupsPairList = replaceMemberGroups();
+ List locGroupsPairList = replaceMemberGroups();
/* Set the expected discard event info */
mainListener.setLookupsToDiscover
(locGroupsPairList,
Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupdiscovery/RemoveGroupsRemoveSome.java
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupdiscovery/RemoveGroupsRemoveSome.java?rev=1409198&r1=1409197&r2=1409198&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupdiscovery/RemoveGroupsRemoveSome.java (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupdiscovery/RemoveGroupsRemoveSome.java Wed Nov 14 13:39:02 2012
@@ -26,6 +26,7 @@ import com.sun.jini.test.share.GroupsUti
import net.jini.discovery.DiscoveryGroupManagement;
import java.util.ArrayList;
+import java.util.List;
/**
* With respect to the <code>removeGroups</code> method, this class
@@ -59,9 +60,9 @@ import java.util.ArrayList;
*/
public class RemoveGroupsRemoveSome extends Discovered {
- protected ArrayList curLookupsToDiscover = initLookupsToStart;
- protected ArrayList newLookupsToDiscover = new ArrayList(11);
- protected ArrayList lookupsToRemoveList = new ArrayList(11);
+ protected List curLookupsToDiscover = initLookupsToStart;
+ protected List newLookupsToDiscover = new ArrayList(11);
+ protected List lookupsToRemoveList = new ArrayList(11);
protected String[] groupsToRemove = DiscoveryGroupManagement.NO_GROUPS;
protected boolean changeAll = false;
Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupdiscovery/SetGroupsReplaceSome.java
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupdiscovery/SetGroupsReplaceSome.java?rev=1409198&r1=1409197&r2=1409198&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupdiscovery/SetGroupsReplaceSome.java (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupdiscovery/SetGroupsReplaceSome.java Wed Nov 14 13:39:02 2012
@@ -22,6 +22,7 @@ import com.sun.jini.qa.harness.QAConfig;
import java.util.logging.Level;
import java.util.ArrayList;
+import java.util.List;
/**
* With respect to the <code>setGroups</code> method, this class verifies
@@ -52,7 +53,7 @@ import java.util.ArrayList;
*/
public class SetGroupsReplaceSome extends Discovered {
- protected ArrayList oldLookupsToDiscover = null;
+ protected List oldLookupsToDiscover = null;
protected String[] newGroupsToDiscover = new String[] {"SetGroups_newSet"};
protected boolean changeAll = false;
Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/AbstractBaseTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/AbstractBaseTest.java?rev=1409198&r1=1409197&r2=1409198&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/AbstractBaseTest.java (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/AbstractBaseTest.java Wed Nov 14 13:39:02 2012
@@ -63,6 +63,7 @@ import java.rmi.RemoteException;
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.List;
import java.util.Properties;
import net.jini.config.ConfigurationException;
@@ -710,7 +711,7 @@ abstract public class AbstractBaseTest e
throws UnknownLeaseException, RemoteException
{
- ArrayList lusList = getLookupListSnapshot
+ List lusList = getLookupListSnapshot
("AbstractBaseTest.registerServices");
/* Construct and register the expected service(s) */
int begIndx = ( (startVal >= 0) ? startVal : 0 );
Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/Lookup.java
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/Lookup.java?rev=1409198&r1=1409197&r2=1409198&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/Lookup.java (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/Lookup.java Wed Nov 14 13:39:02 2012
@@ -28,6 +28,7 @@ import net.jini.core.lookup.ServiceItem;
import java.util.ArrayList;
import com.sun.jini.qa.harness.QAConfig;
import com.sun.jini.qa.harness.TestException;
+import java.util.List;
/**
* With respect to the <code>lookup</code> method defined by the
@@ -105,7 +106,7 @@ public class Lookup extends AbstractBase
* containing the registered services.
*/
protected void displaySrvcInfoOnFailure(ServiceItem srvcItem,
- ArrayList srvcList)
+ List srvcList)
{
logger.log(Level.FINE, "returned service item "
+" is not equivalent to any of the "