Author: limpbizkit
Date: Tue Dec 9 10:45:13 2008
New Revision: 728
Modified:
trunk/extensions/assistedinject/src/com/google/inject/assistedinject/FactoryProvider.java
trunk/test/com/google/inject/AllTests.java
trunk/test/com/google/inject/BinderTestSuite.java
trunk/test/com/google/inject/RequestInjectionTest.java
trunk/test/com/google/inject/TypeLiteralInjectionTest.java
Log:
Applying Daniel Martin's fixes for our test cases.
Modified:
trunk/extensions/assistedinject/src/com/google/inject/assistedinject/FactoryProvider.java
==============================================================================
---
trunk/extensions/assistedinject/src/com/google/inject/assistedinject/FactoryProvider.java
(original)
+++
trunk/extensions/assistedinject/src/com/google/inject/assistedinject/FactoryProvider.java
Tue Dec 9 10:45:13 2008
@@ -68,7 +68,7 @@
* <h3>Configuring factories</h3>
* In your [EMAIL PROTECTED] com.google.inject.Module module}, bind the
factory
interface to the returned
* factory:
- * <pre>bind(PaymentFactory.class).toInstance(
+ * <pre>bind(PaymentFactory.class).toProvider(
* FactoryProvider.newFactory(PaymentFactory.class,
RealPayment.class));</pre>
* As a side-effect of this binding, Guice will inject the factory to
initialize it for use. The
* factory cannot be used until the injector has been initialized.
Modified: trunk/test/com/google/inject/AllTests.java
==============================================================================
--- trunk/test/com/google/inject/AllTests.java (original)
+++ trunk/test/com/google/inject/AllTests.java Tue Dec 9 10:45:13 2008
@@ -23,6 +23,7 @@
import com.google.inject.internal.ReferenceMapTestSuite;
import com.google.inject.internal.UniqueAnnotationsTest;
import com.google.inject.matcher.MatcherTest;
+import com.google.inject.name.NamesTest;
import com.google.inject.spi.ElementsTest;
import com.google.inject.spi.InjectionPointTest;
import com.google.inject.spi.ModuleRewriterTest;
@@ -53,6 +54,7 @@
suite.addTestSuite(CircularDependencyTest.class);
suite.addTestSuite(TypeConversionTest.class);
// suite.addTestSuite(ErrorHandlingTest.class); not a testcase
+ suite.addTestSuite(EagerSingletonTest.class);
suite.addTestSuite(GenericInjectionTest.class);
suite.addTestSuite(ImplicitBindingTest.class);
suite.addTestSuite(InjectionPointTest.class);
@@ -78,6 +80,7 @@
suite.addTestSuite(SerializationTest.class);
suite.addTestSuite(RequestInjectionTest.class);
suite.addTestSuite(SuperclassTest.class);
+ suite.addTestSuite(TypeLiteralInjectionTest.class);
suite.addTestSuite(TypeLiteralTest.class);
suite.addTestSuite(TypeLiteralTypeResolutionTest.class);
@@ -99,6 +102,9 @@
// matcher
suite.addTestSuite(MatcherTest.class);
+ // names
+ suite.addTestSuite(NamesTest.class);
+
// tools
// suite.addTestSuite(JmxTest.class); not a testcase
Modified: trunk/test/com/google/inject/BinderTestSuite.java
==============================================================================
--- trunk/test/com/google/inject/BinderTestSuite.java (original)
+++ trunk/test/com/google/inject/BinderTestSuite.java Tue Dec 9 10:45:13
2008
@@ -419,7 +419,8 @@
injector = newInjector();
nextId.set(201);
for (Object value : expectedValues) {
- assertEquals(value, injector.getInstance(injectsKey).value);
+ Injectable instance = injector.getInstance(injectsKey);
+ assertEquals(value, instance.value);
}
injector = newInjector();
Modified: trunk/test/com/google/inject/RequestInjectionTest.java
==============================================================================
--- trunk/test/com/google/inject/RequestInjectionTest.java (original)
+++ trunk/test/com/google/inject/RequestInjectionTest.java Tue Dec 9
10:45:13 2008
@@ -130,7 +130,7 @@
fail();
} catch (CreationException expected) {
assertContains(expected.getMessage(),
- "1) Error injecting method,
java.lang.UnsupportedOperationException: Pop\n",
+ "1) Error injecting method,
java.lang.UnsupportedOperationException: Pop",
"at " + BlowsUpOnInject.class.getName()
+ ".injectInstance(RequestInjectionTest.java:");
}
}
Modified: trunk/test/com/google/inject/TypeLiteralInjectionTest.java
==============================================================================
--- trunk/test/com/google/inject/TypeLiteralInjectionTest.java (original)
+++ trunk/test/com/google/inject/TypeLiteralInjectionTest.java Tue Dec 9
10:45:13 2008
@@ -19,7 +19,6 @@
import static com.google.inject.Asserts.assertContains;
import com.google.inject.util.Types;
import static com.google.inject.util.Types.listOf;
-import java.lang.reflect.Type;
import java.util.List;
import junit.framework.TestCase;
@@ -60,19 +59,16 @@
}
public void testInjectTypeLiteralWithRawTypes() {
- Type t = A.class.getTypeParameters()[0];
-
- A a = Guice.createInjector().getInstance(A.class);
- assertEquals(TypeLiteral.get(String.class), a.string);
- assertEquals(TypeLiteral.get(listOf(t)), a.listOfT);
- assertEquals(TypeLiteral.get(listOf(Types.subtypeOf(t))),
a.listOfWildcardT);
+ C c = Guice.createInjector().getInstance(C.class);
+ assertEquals(TypeLiteral.get(String.class), c.string);
+ assertEquals(TypeLiteral.get(A.class), c.a);
try {
Guice.createInjector().getInstance(B.class);
fail();
} catch (ConfigurationException expected) {
- assertContains(expected.getMessage(), "Cannot inject a TypeLiteral
of T",
- "while locating com.google.inject.TypeLiteral<T>");
+ assertContains(expected.getMessage(), TypeLiteral.class.getName()
+ "<java.util.List<T>> "
+ + "cannot be used as a key; It is not fully specified.");
}
}
@@ -102,5 +98,11 @@
static class B<T> extends A<T> {
@Inject TypeLiteral<T> t;
+ }
+
+ static class C<T> {
+ @Inject TypeLiteral<String> string;
+ @Inject TypeLiteral<A> a;
+ T t;
}
}
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"google-guice-dev" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/google-guice-dev?hl=en
-~----------~----~----~----~------~----~------~--~---
