[jboss-svn-commits] JBoss Common SVN: r4791 - in arquillian/trunk/extensions/performance/src: test/java/org/jboss/arquillian/performance/cdi and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: stalep
Date: 2010-07-21 18:28:54 -0400 (Wed, 21 Jul 2010)
New Revision: 4791

Modified:
   arquillian/trunk/extensions/performance/src/main/java/org/jboss/arquillian/performance/event/TestPerformanceVerifier.java
   arquillian/trunk/extensions/performance/src/test/java/org/jboss/arquillian/performance/cdi/HardWorker.java
   arquillian/trunk/extensions/performance/src/test/java/org/jboss/arquillian/performance/cdi/WorkHardCdiTestCase.java
Log:
[ARQ-147]
changed test to not inject before being called (thanks aslak :)
should work as expected now (just not for @Before/@After thingys)


Modified: arquillian/trunk/extensions/performance/src/main/java/org/jboss/arquillian/performance/event/TestPerformanceVerifier.java
===================================================================
--- arquillian/trunk/extensions/performance/src/main/java/org/jboss/arquillian/performance/event/TestPerformanceVerifier.java	2010-07-21 09:02:18 UTC (rev 4790)
+++ arquillian/trunk/extensions/performance/src/main/java/org/jboss/arquillian/performance/event/TestPerformanceVerifier.java	2010-07-21 22:28:54 UTC (rev 4791)
@@ -20,7 +20,6 @@
 
 import org.jboss.arquillian.performance.annotation.Performance;
 import org.jboss.arquillian.performance.exception.PerformanceException;
-import org.jboss.arquillian.performance.meta.PerformanceClassResult;
 import org.jboss.arquillian.performance.meta.PerformanceMethodResult;
 import org.jboss.arquillian.performance.meta.PerformanceSuiteResult;
 import org.jboss.arquillian.spi.Context;
@@ -64,7 +63,6 @@
                      new PerformanceException("The test didnt finish within the specified time: "
                            +performance.time()+"ms, it took "+(result.getEnd()-result.getStart())+"ms."));
             }
-            System.out.println("The test took "+(result.getEnd()-result.getStart())+"ms.");
             
             // fetch suiteResult, get the correct classResult and append the test to that
             // classResult.

Modified: arquillian/trunk/extensions/performance/src/test/java/org/jboss/arquillian/performance/cdi/HardWorker.java
===================================================================
--- arquillian/trunk/extensions/performance/src/test/java/org/jboss/arquillian/performance/cdi/HardWorker.java	2010-07-21 09:02:18 UTC (rev 4790)
+++ arquillian/trunk/extensions/performance/src/test/java/org/jboss/arquillian/performance/cdi/HardWorker.java	2010-07-21 22:28:54 UTC (rev 4791)
@@ -1,31 +1,16 @@
 package org.jboss.arquillian.performance.cdi;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import javax.inject.Named;
-
- at ApplicationScoped
 public class HardWorker
 {
-
-   @Produces @Named @WorkHard double workingHard()
-   {
-      
-      Exception e = new RuntimeException();
-      System.out.println("stacktrace before sleeping");
-      e.printStackTrace();
+   public double workingHard()
+   { 
       try
       {
-         long time = System.currentTimeMillis();
-         System.out.println("current time before sleep: "+System.currentTimeMillis());
-         Thread.currentThread().sleep(2000);
-         System.out.println("slept for: "+(System.currentTimeMillis()-time));
-         System.out.println("current time after sleep: "+System.currentTimeMillis());
+         Thread.currentThread().sleep(10);
       }
       catch (InterruptedException ie)
       {
-         // TODO Auto-generated catch block
-         e.printStackTrace();
+         ie.printStackTrace();
       }
       return 21;
    }

Modified: arquillian/trunk/extensions/performance/src/test/java/org/jboss/arquillian/performance/cdi/WorkHardCdiTestCase.java
===================================================================
--- arquillian/trunk/extensions/performance/src/test/java/org/jboss/arquillian/performance/cdi/WorkHardCdiTestCase.java	2010-07-21 09:02:18 UTC (rev 4790)
+++ arquillian/trunk/extensions/performance/src/test/java/org/jboss/arquillian/performance/cdi/WorkHardCdiTestCase.java	2010-07-21 22:28:54 UTC (rev 4791)
@@ -30,24 +30,24 @@
                        ArchivePaths.create("beans.xml"));
    }
    
-   @Inject @WorkHard double hardWorker;
+   @Inject HardWorker worker;
    
    @Test
    @Performance(time=20)
    public void doHardWork() throws Exception 
    {
-      Assert.assertEquals(21, hardWorker, 0d);
+      Assert.assertEquals(21, worker.workingHard(), 0d);
    }
    
    /**
-    * This method is supposed to fail with @Performance(time=1)
+    * This method is supposed to fail with @Performance(time=9)
     * 
     * @throws Exception
     */
    @Test
-   @Performance(time=1)
+   @Performance(time=9)
    public void doHardWorkThatFails() throws Exception
    {
-      Assert.assertEquals(21, hardWorker, 0d);
+      Assert.assertEquals(21, worker.workingHard(), 0d);
    }
 }