river-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From peter_firmst...@apache.org
Subject svn commit: r1444802 - in /river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test: resources/qa1.logging share/BaseQATest.java
Date Mon, 11 Feb 2013 14:43:29 GMT
Author: peter_firmstone
Date: Mon Feb 11 14:43:28 2013
New Revision: 1444802

URL: http://svn.apache.org/r1444802
Log:
Minor refactor to BaseQATest.

Removed TaskManager from LookupDiscoveryLocator and replaced with ExecutorService, added configuration
option for users.

Modified:
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/resources/qa1.logging
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/share/BaseQATest.java

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/resources/qa1.logging
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/resources/qa1.logging?rev=1444802&r1=1444801&r2=1444802&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/resources/qa1.logging (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/resources/qa1.logging Mon
Feb 11 14:43:28 2013
@@ -105,9 +105,9 @@ java.util.logging.FileHandler.level = IN
 
 # For Everything
 sun.rmi.level = CONFIG
-net.jini.level = CONFIG
+net.jini.level = FINE
 org.apache.river.level = CONFIG
-com.sun.jini.level = CONFIG
+com.sun.jini.level = FINE
 
 # For the LogManager
 com.sun.jini.logging.LogManager.level = INFO

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/share/BaseQATest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/share/BaseQATest.java?rev=1444802&r1=1444801&r2=1444802&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/share/BaseQATest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/share/BaseQATest.java Mon
Feb 11 14:43:28 2013
@@ -1026,6 +1026,7 @@ abstract public class BaseQATest extends
                                " number of currently discovered lookup(s) = "
                                +discoveredCount());
                     }
+                    this.notifyAll();
                 }//end sync(this)
             } else {//(regs == null)
                 logger.log(Level.FINE, " change event received "
@@ -1036,59 +1037,14 @@ abstract public class BaseQATest extends
 
     /* Protected instance variables */
     protected volatile int testType = AUTOMATIC_LOCAL_TEST;
-
-//    protected String implClassname;
-
     protected volatile int maxSecsEventWait  = 10 * 60;
-//    protected int announceInterval  = 2 * 60 * 1000;
-//    protected int originalAnnounceInterval = 0;
-//    protected int minNAnnouncements = 2;
     protected volatile int nIntervalsToWait  = 3;
-
     protected volatile boolean delayLookupStart = false;
-    /* refactored fields */
-    
-//    private int nLookupServices          = 0;
-//    private int nAddLookupServices       = 0;
-//    
-//    private int nServices    = 0;//local/serializable test services
-//    private int nAddServices = 0;//additional local/serializable services
-//
-//
-//    /* Attributes per service */
-//    private int nAttributes    = 0;
-//    private int nAddAttributes = 0;
-//
-////    protected int nSecsLookupDiscovery  = 30;
-//    private int nSecsServiceDiscovery = 30;
-//    private int nSecsJoin             = 30;
-//
-////    protected String remoteHost = "UNKNOWN_HOST";
-//
-//    /* Data structures - lookup services */
-//    private ArrayList initLookupsToStart = new ArrayList(11);
-//    private ArrayList addLookupsToStart  = new ArrayList(11);
-//    private ArrayList allLookupsToStart  = new ArrayList(11);
-//    private ArrayList lookupsStarted     = new ArrayList(11);
-//
-////    protected ArrayList lookupList = new ArrayList(1);
-//    private HashMap genMap = new HashMap(11);
-//    protected int nStarted = 0;
-    /* Data structures - lookup discovery services */
-//    protected ArrayList initLDSToStart = new ArrayList(11);
-//    protected ArrayList addLDSToStart  = new ArrayList(11);
-//    protected ArrayList allLDSToStart  = new ArrayList(11);
-//    protected ArrayList ldsList = new ArrayList(1);
-  
-    
-    /* end refactored fields */
-//    protected Class[] serviceClasses = null;
-    private final List expectedServiceList = new CopyOnWriteArrayList();
-
     protected volatile QAConfig config = null;
     
+    /* Private state */
+    private final List expectedServiceList = new CopyOnWriteArrayList();
     private volatile boolean announcementsStopped = false;
-    
     private volatile LookupServices lookupServices;
     private volatile LookupDiscoveryServices lookupDiscoveryServices;
     private volatile LeaseRenewalServices leaseRenewalServices;



Mime
View raw message