Author: jsong Date: Fri Jan 21 10:03:01 2005 New Revision: 125948 URL: http://svn.apache.org/viewcvs?view=rev&rev=125948 Log: Update control threading tests.
Modified: incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/threading/MultiThreadControlImpl.jcs incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/threading/SingleThreadControl.java incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/threading/SingleThreadControlImpl.jcs incubator/beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/threading/DriveMultiThread.java incubator/beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/threading/DriveSingleThread.java incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/threading/MultiThreadTest.java incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/threading/SingleThreadTest.java Modified: incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/threading/MultiThreadControlImpl.jcs Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/threading/MultiThreadControlImpl.jcs?view=diff&rev=125948&p1=incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/threading/MultiThreadControlImpl.jcs&r1=125947&p2=incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/threading/MultiThreadControlImpl.jcs&r2=125948 ============================================================================== --- incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/threading/MultiThreadControlImpl.jcs (original) +++ incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/threading/MultiThreadControlImpl.jcs Fri Jan 21 10:03:01 2005 @@ -36,6 +36,7 @@ Date nowAgain=new Date(); long l=nowAgain.getTime()-lastAccess; + lastAccess=nowAgain.getTime(); return l; } @@ -54,6 +55,7 @@ Date nowAgain=new Date(); long l=nowAgain.getTime()-lastAccess; + lastAccess=nowAgain.getTime(); return l; } Modified: incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/threading/SingleThreadControl.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/threading/SingleThreadControl.java?view=diff&rev=125948&p1=incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/threading/SingleThreadControl.java&r1=125947&p2=incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/threading/SingleThreadControl.java&r2=125948 ============================================================================== --- incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/threading/SingleThreadControl.java (original) +++ incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/threading/SingleThreadControl.java Fri Jan 21 10:03:01 2005 @@ -13,7 +13,7 @@ { public final static String METHOD1="method1"; public final static String METHOD2="method2"; - public final static long EXPECTED_DELAY=10; + public final static long EXPECTED_DELAY=100; public long method1(); public long method2(); Modified: incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/threading/SingleThreadControlImpl.jcs Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/threading/SingleThreadControlImpl.jcs?view=diff&rev=125948&p1=incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/threading/SingleThreadControlImpl.jcs&r1=125947&p2=incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/threading/SingleThreadControlImpl.jcs&r2=125948 ============================================================================== --- incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/threading/SingleThreadControlImpl.jcs (original) +++ incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/threading/SingleThreadControlImpl.jcs Fri Jan 21 10:03:01 2005 @@ -29,11 +29,13 @@ Thread.sleep(SingleThreadControl.EXPECTED_DELAY); } catch(InterruptedException e){ + e.printStackTrace(); } Date nowAgain=new Date(); long l=nowAgain.getTime()-lastAccess; + lastAccess=nowAgain.getTime(); return l; } @@ -47,11 +49,13 @@ Thread.sleep(SingleThreadControl.EXPECTED_DELAY); } catch(InterruptedException e){ + e.printStackTrace(); } Date nowAgain=new Date(); long l=nowAgain.getTime()-lastAccess; + lastAccess=nowAgain.getTime(); return l; } Modified: incubator/beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/threading/DriveMultiThread.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/threading/DriveMultiThread.java?view=diff&rev=125948&p1=incubator/beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/threading/DriveMultiThread.java&r1=125947&p2=incubator/beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/threading/DriveMultiThread.java&r2=125948 ============================================================================== --- incubator/beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/threading/DriveMultiThread.java (original) +++ incubator/beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/threading/DriveMultiThread.java Fri Jan 21 10:03:01 2005 @@ -28,7 +28,7 @@ } public void run() { - //System.out.println("DONE! " + getName()); + for(int i=0;i<LOOPS;i++){ if(method2invoke.equals(MultiThreadControl.METHOD1)) records[i]=myControl.method1(); @@ -43,6 +43,7 @@ Report report=new Report(); report.setStatus(Report.FAIL); for(int i=0;i<LOOPS;i++){ + System.out.println(getName()+"<<<<<<<<"+records[i]); if (records[i]<MultiThreadControl.EXPECTED_DELAY){ report.setStatus(Report.PASS); } Modified: incubator/beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/threading/DriveSingleThread.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/threading/DriveSingleThread.java?view=diff&rev=125948&p1=incubator/beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/threading/DriveSingleThread.java&r1=125947&p2=incubator/beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/threading/DriveSingleThread.java&r2=125948 ============================================================================== --- incubator/beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/threading/DriveSingleThread.java (original) +++ incubator/beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/threading/DriveSingleThread.java Fri Jan 21 10:03:01 2005 @@ -9,7 +9,7 @@ public class DriveSingleThread extends Thread { - public final static int LOOPS=4; + public final static int LOOPS=10; private SingleThreadControlBean myControl; private String method2invoke=""; private long records[]=new long[LOOPS]; @@ -43,6 +43,7 @@ Report report=new Report(); report.setStatus(Report.PASS); for(int i=0;i<LOOPS;i++){ + System.out.println(getName()+">>>>>>>>>>"+records[i]); if (records[i]<SingleThreadControl.EXPECTED_DELAY){ report.setStatus(Report.FAIL); } Modified: incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/threading/MultiThreadTest.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/threading/MultiThreadTest.java?view=diff&rev=125948&p1=incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/threading/MultiThreadTest.java&r1=125947&p2=incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/threading/MultiThreadTest.java&r2=125948 ============================================================================== --- incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/threading/MultiThreadTest.java (original) +++ incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/threading/MultiThreadTest.java Fri Jan 21 10:03:01 2005 @@ -21,7 +21,7 @@ [EMAIL PROTECTED]("checkin") [EMAIL PROTECTED]("detailed") public class MultiThreadTest extends TestCase { public MultiThreadTest( String s ) { super( s ); } @@ -33,7 +33,7 @@ * Makes an instance of a single threaded control, passes it to two different * threads and run both threads. */ - @Freq("checkin") + @Freq("detailed") public void testMultiThread() throws Exception { @@ -41,10 +41,10 @@ Thread.currentThread().getContextClassLoader() , "org.apache.beehive.controls.test.controls.threading.MultiThreadControlBean"); - DriveMultiThread driver1=new DriveMultiThread("driver1"); + DriveMultiThread driver1=new DriveMultiThread("MultiThread-driver1"); driver1.setControl(sBean); driver1.setMethod(MultiThreadControl.METHOD1); - DriveMultiThread driver2=new DriveMultiThread("driver2"); + DriveMultiThread driver2=new DriveMultiThread("MultiThread-driver2"); driver2.setControl(sBean); driver2.setMethod(MultiThreadControl.METHOD2); Modified: incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/threading/SingleThreadTest.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/threading/SingleThreadTest.java?view=diff&rev=125948&p1=incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/threading/SingleThreadTest.java&r1=125947&p2=incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/threading/SingleThreadTest.java&r2=125948 ============================================================================== --- incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/threading/SingleThreadTest.java (original) +++ incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/threading/SingleThreadTest.java Fri Jan 21 10:03:01 2005 @@ -21,7 +21,7 @@ [EMAIL PROTECTED]("checkin") [EMAIL PROTECTED]("detailed") public class SingleThreadTest extends TestCase { public SingleThreadTest( String s ) { super( s ); } @@ -33,7 +33,7 @@ * Makes an instance of a single threaded control, passes it to two different * threads and run both threads. */ - @Freq("checkin") + @Freq("detailed") public void testSingleThread() throws Exception { @@ -41,17 +41,17 @@ Thread.currentThread().getContextClassLoader() , "org.apache.beehive.controls.test.controls.threading.SingleThreadControlBean"); - DriveSingleThread driver1=new DriveSingleThread("driver1"); + DriveSingleThread driver1=new DriveSingleThread("SigleThread-driver1"); driver1.setControl(sBean); driver1.setMethod(SingleThreadControl.METHOD1); - DriveSingleThread driver2=new DriveSingleThread("driver2"); + DriveSingleThread driver2=new DriveSingleThread("SingleThread-driver2"); driver2.setControl(sBean); driver2.setMethod(SingleThreadControl.METHOD2); driver1.start(); driver2.start(); - try{Thread.sleep(SingleThreadControl.EXPECTED_DELAY*10);} + try{Thread.sleep(SingleThreadControl.EXPECTED_DELAY*DriveSingleThread.LOOPS*3);} catch(InterruptedException e){} Report report1=driver1.analyseRecord();
