Updated Guice to use latest TCK.
git-svn-id: https://google-guice.googlecode.com/svn/trunk@1094 d779f126-a31b-0410-b53b-1d3aecad763e
diff --git a/lib/build/javax.inject-tck.jar b/lib/build/javax.inject-tck.jar
index a1e5439..01381a7 100644
--- a/lib/build/javax.inject-tck.jar
+++ b/lib/build/javax.inject-tck.jar
Binary files differ
diff --git a/test/com/googlecode/guice/GuiceTck.java b/test/com/googlecode/guice/GuiceTck.java
index 7d83e17..4b46742 100644
--- a/test/com/googlecode/guice/GuiceTck.java
+++ b/test/com/googlecode/guice/GuiceTck.java
@@ -33,10 +33,10 @@
import org.atinject.tck.auto.accessories.Cupholder;
import org.atinject.tck.auto.accessories.SpareTire;
-public class GuiceTck extends Tck {
+public class GuiceTck {
- protected Car getCar() {
- return Guice.createInjector(new AbstractModule() {
+ public static Test suite() {
+ return Tck.testsFor(Guice.createInjector(new AbstractModule() {
protected void configure() {
bind(Car.class).to(Convertible.class);
bind(Seat.class).annotatedWith(Drivers.class).to(DriversSeat.class);
@@ -46,10 +46,6 @@
bind(Tire.class);
bind(FuelTank.class);
}
- }).getInstance(Car.class);
- }
-
- public static Test suite() {
- return new GuiceTck();
+ }).getInstance(Car.class));
}
}