Fixing a bad call to setInjectionPoint() in InjectorImpl.
Also some cleanup for Asserts so assertContains is more aggressive.
git-svn-id: https://google-guice.googlecode.com/svn/trunk@506 d779f126-a31b-0410-b53b-1d3aecad763e
diff --git a/src/com/google/inject/InjectorImpl.java b/src/com/google/inject/InjectorImpl.java
index d2a8c14..c4f6b8d 100644
--- a/src/com/google/inject/InjectorImpl.java
+++ b/src/com/google/inject/InjectorImpl.java
@@ -944,7 +944,7 @@
throw new ProvisionException(runtimeException, ErrorMessages.ERROR_INJECTING_METHOD);
}
finally {
- context.setInjectionPoint(injectionPoint);
+ context.setInjectionPoint(null);
}
}
}
diff --git a/test/com/google/inject/Asserts.java b/test/com/google/inject/Asserts.java
index 507b9bc..aafa008 100644
--- a/test/com/google/inject/Asserts.java
+++ b/test/com/google/inject/Asserts.java
@@ -17,10 +17,14 @@
package com.google.inject;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.NotSerializableException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
import junit.framework.Assert;
-import java.io.*;
-
/**
* @author jessewilson@google.com (Jesse Wilson)
*/
@@ -44,8 +48,11 @@
* Fails unless {@code text} includes {@code substring}.
*/
public static void assertContains(String text, String substring) {
+ int position = text.indexOf(substring);
Assert.assertTrue(String.format("Expected \"%s\" to contain substring \"%s\"",
- text, substring), text.contains(substring));
+ text, substring), position >= 0);
+ Assert.assertTrue(String.format("Expected \"%s\" to contain substring \"%s\" only once),",
+ text, substring), text.indexOf(substring, position + 1) == -1);
}
/**
diff --git a/test/com/google/inject/ScopesTest.java b/test/com/google/inject/ScopesTest.java
index 1616b1c..eaa5921 100644
--- a/test/com/google/inject/ScopesTest.java
+++ b/test/com/google/inject/ScopesTest.java
@@ -16,19 +16,16 @@
package com.google.inject;
-import junit.framework.TestCase;
-
import java.io.IOException;
-import java.lang.annotation.Target;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.util.Map;
+import java.lang.annotation.Target;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
-import java.util.ArrayList;
-
-import com.google.inject.util.Providers;
+import java.util.Map;
+import junit.framework.TestCase;
/**
* @author crazybob@google.com (Bob Lee)
diff --git a/test/com/google/inject/commands/CommandRecorderTest.java b/test/com/google/inject/commands/CommandRecorderTest.java
index bdce190..ae20896 100644
--- a/test/com/google/inject/commands/CommandRecorderTest.java
+++ b/test/com/google/inject/commands/CommandRecorderTest.java
@@ -16,8 +16,15 @@
package com.google.inject.commands;
-import com.google.inject.*;
+import com.google.inject.AbstractModule;
import static com.google.inject.Asserts.assertContains;
+import com.google.inject.BindingAnnotation;
+import com.google.inject.Key;
+import com.google.inject.Module;
+import com.google.inject.Provider;
+import com.google.inject.Scopes;
+import com.google.inject.Singleton;
+import com.google.inject.TypeLiteral;
import com.google.inject.binder.AnnotatedBindingBuilder;
import com.google.inject.binder.AnnotatedConstantBindingBuilder;
import com.google.inject.binder.ConstantBindingBuilder;
@@ -26,17 +33,24 @@
import com.google.inject.matcher.Matchers;
import com.google.inject.name.Names;
import com.google.inject.spi.TypeConverter;
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-import org.aopalliance.intercept.MethodInterceptor;
-import org.aopalliance.intercept.MethodInvocation;
-
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
import java.util.concurrent.atomic.AtomicInteger;
+import junit.framework.AssertionFailedError;
+import junit.framework.TestCase;
+import org.aopalliance.intercept.MethodInterceptor;
+import org.aopalliance.intercept.MethodInvocation;
/**
* @author jessewilson@google.com (Jesse Wilson)
@@ -713,7 +727,7 @@
for (int i = 0; i < visitors.length; i++) {
Command.Visitor<?> visitor = visitors[i];
Command command = commands.get(i);
- assertContains(command.getSource().toString(), "CommandRecorderTest");
+ assertContains(command.getSource().toString(), "CommandRecorderTest.java");
command.acceptVisitor(visitor);
}
}
