Author: peteroyle Date: 2009-12-11 03:16:06 -0500 (Fri, 11 Dec 2009) New Revision: 5269 Added: java-se/trunk/src/test/java/org/jboss/weld/environment/se/test/beans/threading/ThreadRunner.java Removed: java-se/trunk/src/test/java/org/jboss/weld/environment/se/test/ThreadRunner.java Modified: java-se/trunk/src/test/java/org/jboss/weld/environment/se/test/ThreadContextTest.java Log: WELDX-19: refactor Modified: java-se/trunk/src/test/java/org/jboss/weld/environment/se/test/ThreadContextTest.java =================================================================== --- java-se/trunk/src/test/java/org/jboss/weld/environment/se/test/ThreadContextTest.java 2009-12-11 00:09:09 UTC (rev 5268) +++ java-se/trunk/src/test/java/org/jboss/weld/environment/se/test/ThreadContextTest.java 2009-12-11 08:16:06 UTC (rev 5269) @@ -16,6 +16,7 @@ */ package org.jboss.weld.environment.se.test; +import org.jboss.weld.environment.se.test.beans.threading.ThreadRunner; import java.util.ArrayList; import java.util.List; @@ -34,8 +35,8 @@ public class ThreadContextTest { - static final int NUM_THREADS = 10; - static final int NUM_LOOPS = 10; + public static final int NUM_THREADS = 10; + public static final int NUM_LOOPS = 10; @Test public void testThreadContext() Deleted: java-se/trunk/src/test/java/org/jboss/weld/environment/se/test/ThreadRunner.java =================================================================== --- java-se/trunk/src/test/java/org/jboss/weld/environment/se/test/ThreadRunner.java 2009-12-11 00:09:09 UTC (rev 5268) +++ java-se/trunk/src/test/java/org/jboss/weld/environment/se/test/ThreadRunner.java 2009-12-11 08:16:06 UTC (rev 5269) @@ -1,87 +0,0 @@ -/** - * JBoss, Home of Professional Open Source - * Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual - * contributors by the @authors tag. See the copyright.txt in the - * distribution for a full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.weld.environment.se.test; - -import java.util.ArrayList; -import java.util.List; -import javax.inject.Inject; -import org.jboss.weld.environment.se.test.beans.threading.SingletonCounter; -import org.jboss.weld.environment.se.test.beans.threading.ThreadCounter; - -import static org.testng.Assert.assertEquals; - -/** - * An bean which implements Runnable and therefore can be run in a separate thread. - * All such beans, when passed to Thread.start(), will be decorated by the - * RunnableDecorator which will take care of making ThreadContext available to - * that thread for resolution of @ThreadScoped beans. - * @author Peter Royle - */ -public class ThreadRunner implements Runnable -{ - - // an application scoped counter - @Inject private SingletonCounter appCounter; - // a thread scoped counter - @Inject private ThreadCounter threadCounter; - // a name for logging - private String name = "Unnamed"; - // gather exceptions encountered for re-throwing in the test class - private List<Exception> exceptions = new ArrayList<Exception>(); - - /** - * Run a loop, incrementing both the thread-scoped and application scoped - * counters with each iteration. - */ - public void run() - { - try - { - - // Thread scoped counter should start at zero ... - assertEquals(0, threadCounter.getCount()); - - for (int loop = 1; loop <= ThreadContextTest.NUM_LOOPS; loop++) - { - final int appCount = appCounter.increment(); - final int threadCount = threadCounter.increment(); - System.out.println(name + " : " + appCount + ", " + threadCount); - assertEquals(loop, threadCount); - } - // ... and end at the number of loops - assertEquals(ThreadContextTest.NUM_LOOPS, threadCounter.getCount()); - } catch (Exception e) - { - this.exceptions.add(e); - } - } - - public String getName() - { - return name; - } - - public void setName(String name) - { - this.name = name; - } - - public List<Exception> getExceptions() - { - return exceptions; - } -} Copied: java-se/trunk/src/test/java/org/jboss/weld/environment/se/test/beans/threading/ThreadRunner.java (from rev 5267, java-se/trunk/src/test/java/org/jboss/weld/environment/se/test/ThreadRunner.java) =================================================================== --- java-se/trunk/src/test/java/org/jboss/weld/environment/se/test/beans/threading/ThreadRunner.java (rev 0) +++ java-se/trunk/src/test/java/org/jboss/weld/environment/se/test/beans/threading/ThreadRunner.java 2009-12-11 08:16:06 UTC (rev 5269) @@ -0,0 +1,86 @@ +/** + * JBoss, Home of Professional Open Source + * Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual + * contributors by the @authors tag. See the copyright.txt in the + * distribution for a full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.weld.environment.se.test.beans.threading; + +import org.jboss.weld.environment.se.test.*; +import java.util.ArrayList; +import java.util.List; +import javax.inject.Inject; + +import static org.testng.Assert.assertEquals; + +/** + * An bean which implements Runnable and therefore can be run in a separate thread. + * All such beans, when passed to Thread.start(), will be decorated by the + * RunnableDecorator which will take care of making ThreadContext available to + * that thread for resolution of @ThreadScoped beans. + * @author Peter Royle + */ +public class ThreadRunner implements Runnable +{ + + // an application scoped counter + @Inject private SingletonCounter appCounter; + // a thread scoped counter + @Inject private ThreadCounter threadCounter; + // a name for logging + private String name = "Unnamed"; + // gather exceptions encountered for re-throwing in the test class + private List<Exception> exceptions = new ArrayList<Exception>(); + + /** + * Run a loop, incrementing both the thread-scoped and application scoped + * counters with each iteration. + */ + public void run() + { + try + { + + // Thread scoped counter should start at zero ... + assertEquals(0, threadCounter.getCount()); + + for (int loop = 1; loop <= ThreadContextTest.NUM_LOOPS; loop++) + { + final int appCount = appCounter.increment(); + final int threadCount = threadCounter.increment(); + System.out.println(name + " : " + appCount + ", " + threadCount); + assertEquals(loop, threadCount); + } + // ... and end at the number of loops + assertEquals(ThreadContextTest.NUM_LOOPS, threadCounter.getCount()); + } catch (Exception e) + { + this.exceptions.add(e); + } + } + + public String getName() + { + return name; + } + + public void setName(String name) + { + this.name = name; + } + + public List<Exception> getExceptions() + { + return exceptions; + } +}