Tidy up package structure a bit

src/test/java/org/springframework/guice/InjectorFactoryTests.java

@@ -7,8 +7,8 @@ import org.springframework.context.ApplicationContextException;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.guice.annotation.ModuleRegistryConfiguration;
-import org.springframework.guice.injector.InjectorFactory;
+import org.springframework.guice.annotation.EnableGuiceModules;
+import org.springframework.guice.annotation.InjectorFactory;
 
 import com.google.inject.Guice;
 import com.google.inject.Module;
@@ -26,7 +26,7 @@ public class InjectorFactoryTests {
 	@Test
 	public void testCustomInjectorIsCreated() {
 		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(InjectorFactoryConfig.class,
-				ModuleRegistryConfiguration.class);
+				ModulesConfig.class);
 		Mockito.verify(injectorFactory, Mockito.times(1)).createInjector(Mockito.anyListOf(Module.class));
 		context.close();
 	}
@@ -34,10 +34,15 @@ public class InjectorFactoryTests {
 	@Test(expected = ApplicationContextException.class)
 	public void testMultipleInjectorFactoriesThrowsApplicationContextException() {
 		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(InjectorFactoryConfig.class,
-				SecondInjectorFactoryConfig.class, ModuleRegistryConfiguration.class);
+				SecondInjectorFactoryConfig.class, ModulesConfig.class);
 		context.close();
 	}
 
+	@Configuration
+	@EnableGuiceModules
+	static class ModulesConfig {
+	}
+
 	@Configuration
 	static class InjectorFactoryConfig {
 		@Bean

src/test/java/org/springframework/guice/SimpleWiringTests.java

@@ -7,7 +7,8 @@ import javax.inject.Inject;
 import org.junit.Test;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
-import org.springframework.guice.annotation.ModuleRegistryConfiguration;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.guice.annotation.EnableGuiceModules;
 import org.springframework.guice.injector.SpringInjector;
 
 import com.google.inject.AbstractModule;
@@ -32,11 +33,16 @@ public class SimpleWiringTests {
 
 	@Test
 	public void hybridFoo() {
-		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(TestConfig.class, ModuleRegistryConfiguration.class);
+		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(TestConfig.class, ModulesConfig.class);
 		Injector app = new SpringInjector(context);
 		assertNotNull(app.getInstance(Foo.class));
 	}
 
+	@Configuration
+	@EnableGuiceModules
+	static class ModulesConfig {
+	}
+
 	public static class TestConfig extends AbstractModule {
 		@Override
 		protected void configure() {