diff options
author | Bob Lee <crazybob@crazybob.org> | 2009-09-28 22:11:46 +0000 |
---|---|---|
committer | Bob Lee <crazybob@crazybob.org> | 2009-09-28 22:11:46 +0000 |
commit | ac33410aa28c4351064ae3b4fcec6d645d6dabe5 (patch) | |
tree | e52d1ebccfc42a73e9a1ab75343ceab301953b40 | |
parent | 70a11775e3d9e102aaed58c6bd1f73782560246e (diff) | |
download | platform_external_jsr330-ac33410aa28c4351064ae3b4fcec6d645d6dabe5.tar.gz platform_external_jsr330-ac33410aa28c4351064ae3b4fcec6d645d6dabe5.tar.bz2 platform_external_jsr330-ac33410aa28c4351064ae3b4fcec6d645d6dabe5.zip |
Repackaged TCK.
git-svn-id: https://atinject.googlecode.com/svn/trunk@35 3bc8319c-20ab-11de-9edc-3f40a397ab60
-rw-r--r-- | tck/org/atinject/tck/CarWontStart.java | 31 | ||||
-rw-r--r-- | tck/org/atinject/tck/Tck.java (renamed from tck/com/googlecode/atinject/Tck.java) | 64 | ||||
-rw-r--r-- | tck/org/atinject/tck/Tester.java (renamed from tck/com/googlecode/atinject/Tester.java) | 4 | ||||
-rw-r--r-- | tck/org/atinject/tck/auto/Car.java (renamed from tck/com/googlecode/atinject/auto/Car.java) | 4 | ||||
-rw-r--r-- | tck/org/atinject/tck/auto/Convertible.java (renamed from tck/com/googlecode/atinject/auto/Convertible.java) | 15 | ||||
-rw-r--r-- | tck/org/atinject/tck/auto/Drivers.java (renamed from tck/com/googlecode/atinject/auto/Drivers.java) | 2 | ||||
-rw-r--r-- | tck/org/atinject/tck/auto/DriversSeat.java (renamed from tck/com/googlecode/atinject/auto/DriversSeat.java) | 4 | ||||
-rw-r--r-- | tck/org/atinject/tck/auto/Engine.java (renamed from tck/com/googlecode/atinject/auto/Engine.java) | 10 | ||||
-rw-r--r-- | tck/org/atinject/tck/auto/FuelTank.java (renamed from tck/com/googlecode/atinject/auto/FuelTank.java) | 2 | ||||
-rw-r--r-- | tck/org/atinject/tck/auto/GasEngine.java (renamed from tck/com/googlecode/atinject/auto/GasEngine.java) | 2 | ||||
-rw-r--r-- | tck/org/atinject/tck/auto/Seat.java (renamed from tck/com/googlecode/atinject/auto/Seat.java) | 4 | ||||
-rw-r--r-- | tck/org/atinject/tck/auto/Seatbelt.java (renamed from tck/com/googlecode/atinject/auto/Seatbelt.java) | 2 | ||||
-rw-r--r-- | tck/org/atinject/tck/auto/Tire.java (renamed from tck/com/googlecode/atinject/auto/Tire.java) | 4 | ||||
-rw-r--r-- | tck/org/atinject/tck/auto/V8Engine.java (renamed from tck/com/googlecode/atinject/auto/V8Engine.java) | 6 | ||||
-rw-r--r-- | tck/org/atinject/tck/auto/accessories/Cupholder.java (renamed from tck/com/googlecode/atinject/auto/accessories/Cupholder.java) | 8 | ||||
-rw-r--r-- | tck/org/atinject/tck/auto/accessories/SpareTire.java (renamed from tck/com/googlecode/atinject/auto/accessories/SpareTire.java) | 8 | ||||
-rw-r--r-- | tck/org/atinject/tck/meta/BrokenGetCar.java (renamed from tck/com/googlecode/atinject/meta/BrokenGetCar.java) | 28 |
17 files changed, 111 insertions, 87 deletions
diff --git a/tck/org/atinject/tck/CarWontStart.java b/tck/org/atinject/tck/CarWontStart.java new file mode 100644 index 0000000..0f2eac8 --- /dev/null +++ b/tck/org/atinject/tck/CarWontStart.java @@ -0,0 +1,31 @@ +package org.atinject.tck; + +import junit.framework.TestCase; +import junit.framework.TestResult; + +/** + * Used when we can't even get a Car to test against. + */ +class CarWontStart extends TestCase { + /* + * We have to extend TestCase instead of implementing Test so we + * can set the name. JUnit sucks (or at least the tools do). + */ + + final Throwable t; + + CarWontStart(String name, Throwable t) { + setName(name); + this.t = t; + } + + @Override public int countTestCases() { + return 1; + } + + @Override public void run(TestResult result) { + result.startTest(this); + result.addError(this, t); + result.endTest(this); + } +} diff --git a/tck/com/googlecode/atinject/Tck.java b/tck/org/atinject/tck/Tck.java index 6aa86ac..89dd13a 100644 --- a/tck/com/googlecode/atinject/Tck.java +++ b/tck/org/atinject/tck/Tck.java @@ -14,15 +14,14 @@ * limitations under the License. */ -package com.googlecode.atinject; +package org.atinject.tck; -import com.googlecode.atinject.auto.Car; -import com.googlecode.atinject.auto.Convertible; +import org.atinject.tck.auto.Car; +import org.atinject.tck.auto.Convertible; import junit.framework.Test; import junit.framework.TestResult; import junit.framework.TestSuite; -import junit.framework.TestCase; /** * Extend this class, implement {@link #getCar()}, and declare a static @@ -54,18 +53,18 @@ public abstract class Tck implements Test { try { car = getCar(); } catch (Throwable t) { - delegate = new Failure("getCar() threw an exception", t); + delegate = new CarWontStart("getCar() threw an exception", t); return; } if (car == null) { - delegate = new Failure("getCar() returned null", - new NullPointerException()); + delegate = new CarWontStart("getCar() returned null", + new NullPointerException("getCar() returned null")); return; } if (!(car instanceof Convertible)) { - delegate = new Failure( + delegate = new CarWontStart( "getCar() did not return an instance of Convertible", new ClassCastException("Expected Convertible, got " + car.getClass().getName())); @@ -85,47 +84,26 @@ public abstract class Tck implements Test { } /** - * Returns a {@link com.googlecode.atinject.auto.Car} constructed by an + * Returns a {@link org.atinject.tck.auto.Car} constructed by an * injector with the following configuration: * * <ul> - * <li>{@link com.googlecode.atinject.auto.Car} is implemented by - * {@link com.googlecode.atinject.auto.Convertible Convertible}. - * <li>{@link com.googlecode.atinject.auto.Drivers @Drivers} {@link com.googlecode.atinject.auto.Seat Seat} is - * implemented by {@link com.googlecode.atinject.auto.DriversSeat DriversSeat}. - * <li>{@link com.googlecode.atinject.auto.Engine Engine} is implemented by - * {@link com.googlecode.atinject.auto.V8Engine V8Engine}. - * <li>{@link javax.inject.Named @Named("spare")} {@link com.googlecode.atinject.auto.Tire Tire} is implemented by - * {@link com.googlecode.atinject.auto.accessories.SpareTire SpareTire}. - * <li>The following concrete classes may also be injected: {@link com.googlecode.atinject.auto.accessories.Cupholder - * Cupholder}, {@link com.googlecode.atinject.auto.Tire Tire} and {@link com.googlecode.atinject.auto.FuelTank + * <li>{@link org.atinject.tck.auto.Car} is implemented by + * {@link org.atinject.tck.auto.Convertible Convertible}. + * <li>{@link org.atinject.tck.auto.Drivers @Drivers} {@link org.atinject.tck.auto.Seat Seat} is + * implemented by {@link org.atinject.tck.auto.DriversSeat DriversSeat}. + * <li>{@link org.atinject.tck.auto.Engine Engine} is implemented by + * {@link org.atinject.tck.auto.V8Engine V8Engine}. + * <li>{@link javax.inject.Named @Named("spare")} {@link org.atinject.tck.auto.Tire Tire} is implemented by + * {@link org.atinject.tck.auto.accessories.SpareTire SpareTire}. + * <li>The following concrete classes may also be injected: {@link org.atinject.tck.auto.accessories.Cupholder + * Cupholder}, {@link org.atinject.tck.auto.Tire Tire} and {@link org.atinject.tck.auto.FuelTank * FuelTank}. * </ul> * - * <p>The static members of the following types shall also be injected: {@link com.googlecode.atinject.auto.Convertible - * Convertible}, {@link com.googlecode.atinject.auto.Tire Tire}, and {@link - * com.googlecode.atinject.auto.accessories.SpareTire SpareTire}. + * <p>The static members of the following types shall also be injected: {@link org.atinject.tck.auto.Convertible + * Convertible}, {@link org.atinject.tck.auto.Tire Tire}, and {@link + * org.atinject.tck.auto.accessories.SpareTire SpareTire}. */ protected abstract Car getCar(); - - static class Failure extends TestCase { - /* - * We have to extend TestCase instead of implementing Test so we - * can set the name. - */ - - final Throwable t; - Failure(String name, Throwable t) { - setName(name); - this.t = t; - } - @Override public int countTestCases() { - return 1; - } - @Override public void run(TestResult result) { - result.startTest(this); - result.addError(this, t); - result.endTest(this); - } - } } diff --git a/tck/com/googlecode/atinject/Tester.java b/tck/org/atinject/tck/Tester.java index 0f37e6e..c989c22 100644 --- a/tck/com/googlecode/atinject/Tester.java +++ b/tck/org/atinject/tck/Tester.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.googlecode.atinject; +package org.atinject.tck; import java.util.List; import java.util.ArrayList; @@ -32,7 +32,7 @@ public class Tester { /** * Adds a problem if {@code condition} is not true. - * + * * @param problem a brief description of what went wrong. */ public void test(boolean condition, String problem) { diff --git a/tck/com/googlecode/atinject/auto/Car.java b/tck/org/atinject/tck/auto/Car.java index c3832da..7441fc1 100644 --- a/tck/com/googlecode/atinject/auto/Car.java +++ b/tck/org/atinject/tck/auto/Car.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.googlecode.atinject.auto; +package org.atinject.tck.auto; -import com.googlecode.atinject.Tester; +import org.atinject.tck.Tester; public interface Car { diff --git a/tck/com/googlecode/atinject/auto/Convertible.java b/tck/org/atinject/tck/auto/Convertible.java index 87ae97d..aad4eb1 100644 --- a/tck/com/googlecode/atinject/auto/Convertible.java +++ b/tck/org/atinject/tck/auto/Convertible.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.googlecode.atinject.auto; +package org.atinject.tck.auto; -import com.googlecode.atinject.Tester; -import com.googlecode.atinject.auto.accessories.SpareTire; -import com.googlecode.atinject.auto.accessories.Cupholder; +import org.atinject.tck.Tester; +import org.atinject.tck.auto.accessories.SpareTire; +import org.atinject.tck.auto.accessories.Cupholder; import junit.framework.TestCase; @@ -273,5 +273,12 @@ public class Convertible implements Car { * us from having to repeat a boatload of JUnit code. */ public static Convertible car; + + public void testAll() { + Tester tester = new Tester(); + car.check(tester); + assertFalse(tester.problems().toString(), + tester.problems().iterator().hasNext()); + } } } diff --git a/tck/com/googlecode/atinject/auto/Drivers.java b/tck/org/atinject/tck/auto/Drivers.java index fded2bb..53a2dc0 100644 --- a/tck/com/googlecode/atinject/auto/Drivers.java +++ b/tck/org/atinject/tck/auto/Drivers.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.googlecode.atinject.auto; +package org.atinject.tck.auto; import javax.inject.Qualifier; import java.lang.annotation.Retention; diff --git a/tck/com/googlecode/atinject/auto/DriversSeat.java b/tck/org/atinject/tck/auto/DriversSeat.java index d8bffd5..3ba90d9 100644 --- a/tck/com/googlecode/atinject/auto/DriversSeat.java +++ b/tck/org/atinject/tck/auto/DriversSeat.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.googlecode.atinject.auto; +package org.atinject.tck.auto; -import com.googlecode.atinject.auto.accessories.Cupholder; +import org.atinject.tck.auto.accessories.Cupholder; import javax.inject.Inject; diff --git a/tck/com/googlecode/atinject/auto/Engine.java b/tck/org/atinject/tck/auto/Engine.java index 4ee0902..64ce6fe 100644 --- a/tck/com/googlecode/atinject/auto/Engine.java +++ b/tck/org/atinject/tck/auto/Engine.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.googlecode.atinject.auto; +package org.atinject.tck.auto; -import com.googlecode.atinject.auto.accessories.SpareTire; -import com.googlecode.atinject.Tester; +import org.atinject.tck.auto.accessories.SpareTire; +import org.atinject.tck.Tester; import javax.inject.Inject; import javax.inject.Named; @@ -25,7 +25,7 @@ import java.util.List; import java.util.ArrayList; public abstract class Engine { - + protected final List<String> moreProblems = new ArrayList<String>(); protected boolean publicNoArgsConstructorInjected; @@ -48,7 +48,7 @@ public abstract class Engine { moreProblems.add("Unexpected call to supertype package private method"); } - @Inject public void injectQualifiers(@Drivers Seat seatA, Seat seatB, + @Inject public void injectQualifiers(@Drivers Seat seatA, Seat seatB, @Named("spare") Tire tireA, Tire tireB) { if (!(seatA instanceof DriversSeat) || (seatB instanceof DriversSeat) diff --git a/tck/com/googlecode/atinject/auto/FuelTank.java b/tck/org/atinject/tck/auto/FuelTank.java index 19a00a6..37d5199 100644 --- a/tck/com/googlecode/atinject/auto/FuelTank.java +++ b/tck/org/atinject/tck/auto/FuelTank.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.googlecode.atinject.auto; +package org.atinject.tck.auto; public class FuelTank { diff --git a/tck/com/googlecode/atinject/auto/GasEngine.java b/tck/org/atinject/tck/auto/GasEngine.java index 951c4ca..6f7edf1 100644 --- a/tck/com/googlecode/atinject/auto/GasEngine.java +++ b/tck/org/atinject/tck/auto/GasEngine.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.googlecode.atinject.auto; +package org.atinject.tck.auto; import javax.inject.Inject; diff --git a/tck/com/googlecode/atinject/auto/Seat.java b/tck/org/atinject/tck/auto/Seat.java index ac23b78..26fa5fe 100644 --- a/tck/com/googlecode/atinject/auto/Seat.java +++ b/tck/org/atinject/tck/auto/Seat.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.googlecode.atinject.auto; +package org.atinject.tck.auto; -import com.googlecode.atinject.auto.accessories.Cupholder; +import org.atinject.tck.auto.accessories.Cupholder; import javax.inject.Singleton; import javax.inject.Inject; diff --git a/tck/com/googlecode/atinject/auto/Seatbelt.java b/tck/org/atinject/tck/auto/Seatbelt.java index 885cf4e..c6329dd 100644 --- a/tck/com/googlecode/atinject/auto/Seatbelt.java +++ b/tck/org/atinject/tck/auto/Seatbelt.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.googlecode.atinject.auto; +package org.atinject.tck.auto; public class Seatbelt { } diff --git a/tck/com/googlecode/atinject/auto/Tire.java b/tck/org/atinject/tck/auto/Tire.java index 74dca17..2110e82 100644 --- a/tck/com/googlecode/atinject/auto/Tire.java +++ b/tck/org/atinject/tck/auto/Tire.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.googlecode.atinject.auto; +package org.atinject.tck.auto; -import com.googlecode.atinject.auto.accessories.SpareTire; +import org.atinject.tck.auto.accessories.SpareTire; import javax.inject.Inject; import java.util.LinkedHashSet; diff --git a/tck/com/googlecode/atinject/auto/V8Engine.java b/tck/org/atinject/tck/auto/V8Engine.java index 17e9ed4..a721cf9 100644 --- a/tck/com/googlecode/atinject/auto/V8Engine.java +++ b/tck/org/atinject/tck/auto/V8Engine.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.googlecode.atinject.auto; +package org.atinject.tck.auto; -import com.googlecode.atinject.Tester; -import com.googlecode.atinject.auto.accessories.SpareTire; +import org.atinject.tck.Tester; +import org.atinject.tck.auto.accessories.SpareTire; import javax.inject.Inject; import javax.inject.Named; diff --git a/tck/com/googlecode/atinject/auto/accessories/Cupholder.java b/tck/org/atinject/tck/auto/accessories/Cupholder.java index 22dbd0d..1a2ca6d 100644 --- a/tck/com/googlecode/atinject/auto/accessories/Cupholder.java +++ b/tck/org/atinject/tck/auto/accessories/Cupholder.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.googlecode.atinject.auto.accessories; +package org.atinject.tck.auto.accessories; -import com.googlecode.atinject.auto.Seat; -import com.googlecode.atinject.Tester; +import org.atinject.tck.auto.Seat; +import org.atinject.tck.Tester; import javax.inject.Singleton; import javax.inject.Provider; @@ -27,7 +27,7 @@ import java.util.ArrayList; @Singleton public class Cupholder { - + protected final List<String> moreProblems = new ArrayList<String>(); private final Provider<Seat> seatProvider; diff --git a/tck/com/googlecode/atinject/auto/accessories/SpareTire.java b/tck/org/atinject/tck/auto/accessories/SpareTire.java index 71848c3..998574f 100644 --- a/tck/com/googlecode/atinject/auto/accessories/SpareTire.java +++ b/tck/org/atinject/tck/auto/accessories/SpareTire.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.googlecode.atinject.auto.accessories; +package org.atinject.tck.auto.accessories; -import com.googlecode.atinject.Tester; -import com.googlecode.atinject.auto.FuelTank; -import com.googlecode.atinject.auto.Tire; +import org.atinject.tck.Tester; +import org.atinject.tck.auto.FuelTank; +import org.atinject.tck.auto.Tire; import javax.inject.Inject; diff --git a/tck/com/googlecode/atinject/meta/BrokenGetCar.java b/tck/org/atinject/tck/meta/BrokenGetCar.java index 689bc95..c6b2ce9 100644 --- a/tck/com/googlecode/atinject/meta/BrokenGetCar.java +++ b/tck/org/atinject/tck/meta/BrokenGetCar.java @@ -1,12 +1,15 @@ -package com.googlecode.atinject.meta; +package org.atinject.tck.meta; -import com.googlecode.atinject.Tck; -import com.googlecode.atinject.Tester; -import com.googlecode.atinject.auto.Car; +import org.atinject.tck.Tck; +import org.atinject.tck.Tester; +import org.atinject.tck.auto.Car; import junit.framework.Test; -import junit.framework.TestSuite; +import junit.framework.TestResult; +/** + * We expect these tests to fail. + */ public class BrokenGetCar { static class ThrowsException extends Tck { @@ -32,10 +35,15 @@ public class BrokenGetCar { } public static Test suite() { - TestSuite suite = new TestSuite(); - suite.addTest(new ThrowsException()); - suite.addTest(new ReturnsNull()); - suite.addTest(new WrongType()); - return suite; + return new Test() { + public int countTestCases() { + return 3; + } + public void run(TestResult result) { + new ThrowsException().run(result); + new ReturnsNull().run(result); + new WrongType().run(result); + } + }; } } |