Made forTests() thread safe (despite JUnit).

git-svn-id: https://atinject.googlecode.com/svn/trunk@37 3bc8319c-20ab-11de-9edc-3f40a397ab60

2 files changed, 10 insertions, 12 deletions

diff --git a/tck/org/atinject/tck/Tck.java b/tck/org/atinject/tck/Tck.java
index 1642a7a..23cda5c 100644
--- a/tck/org/atinject/tck/Tck.java
+++ b/tck/org/atinject/tck/Tck.java
@@ -38,8 +38,6 @@ import junit.framework.TestSuite;
  * <pre>
  * java junit.textui.TestRunner MyTck
  * </pre>
- *
- * @deprecated
  */
 public class Tck {
 
@@ -67,9 +65,6 @@ public class Tck {
      * Convertible}, {@link org.atinject.tck.auto.Tire Tire}, and {@link
      * org.atinject.tck.auto.accessories.SpareTire SpareTire}.
      *
-     * <p><b>Note:</b> Due to limitations of JUnit, you must create and run
-     * only one test instance at a time.
-     *
      * @throws NullPointerException if car is null
      * @throws ClassCastException if car doesn't extend Convertible
      */
@@ -82,7 +77,11 @@ public class Tck {
             throw new ClassCastException("car doesn't implement Convertible");
         }
 
-        Convertible.Tests.car = (Convertible) car;
-        return new TestSuite(Convertible.Tests.class);
+        Convertible.Tests.localConvertible.set((Convertible) car);
+        try {
+            return new TestSuite(Convertible.Tests.class);
+        } finally {
+            Convertible.Tests.localConvertible.remove();
+        }
     }
 }
diff --git a/tck/org/atinject/tck/auto/Convertible.java b/tck/org/atinject/tck/auto/Convertible.java
index 79f5777..06b8b1b 100644
--- a/tck/org/atinject/tck/auto/Convertible.java
+++ b/tck/org/atinject/tck/auto/Convertible.java
@@ -266,11 +266,10 @@ public class Convertible implements Car {
      */
     public static class Tests extends TestCase {
 
-        /**
-         * The instance to test. Making it static isn't ideal, but it saves
-         * us from having to repeat a boatload of JUnit code.
-         */
-        public static Convertible car;
+        public static ThreadLocal<Convertible> localConvertible
+                = new ThreadLocal<Convertible>();
+
+        private final Car car = localConvertible.get();
 
         public void testAll() {
             Tester tester = new Tester();