Add some sub-packages

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

@@ -62,10 +62,10 @@ public abstract class AbstractCompleteWiringTests {
 		assertNotNull(injector.getProvider(Service.class).get());
 	}
 
-	interface Service {
+	public interface Service {
 	}
 
-	protected static class MyService implements Service {
+	public static class MyService implements Service {
 	}
 
 	public static class Foo {

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

@@ -7,6 +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.guice.injector.SpringInjector;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.Guice;

src/test/java/org/springframework/guice/annotation/EnableGuiceModulesTests.java

@@ -11,7 +11,7 @@
  * specific language governing permissions and limitations under the License.
  */
 
-package org.springframework.guice;
+package org.springframework.guice.annotation;
 
 import static org.junit.Assert.assertNotNull;
 
@@ -24,6 +24,8 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.FilterType;
 import org.springframework.context.annotation.ComponentScan.Filter;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.guice.annotation.EnableGuiceModules;
+import org.springframework.guice.annotation.GuiceModule;
 
 import com.google.inject.Injector;
 

src/test/java/org/springframework/guice/annotation/GuiceModuleAnnotationTests.java

@@ -11,7 +11,7 @@
  * specific language governing permissions and limitations under the License.
  */
 
-package org.springframework.guice;
+package org.springframework.guice.annotation;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
@@ -25,6 +25,8 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan.Filter;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.FilterType;
+import org.springframework.guice.annotation.GuiceModule;
+import org.springframework.guice.module.SpringModule;
 
 import com.google.inject.ConfigurationException;
 import com.google.inject.Guice;

src/test/java/org/springframework/guice/annotation/ModuleBeanWiringTests.java

@@ -11,7 +11,7 @@
  * specific language governing permissions and limitations under the License.
  */
 
-package org.springframework.guice;
+package org.springframework.guice.annotation;
 
 import static org.junit.Assert.assertNotNull;
 
@@ -19,6 +19,8 @@ import org.junit.Test;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.guice.AbstractCompleteWiringTests;
+import org.springframework.guice.injector.SpringInjector;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.Injector;

src/test/java/org/springframework/guice/injector/SpringWiringTests.java

@@ -11,11 +11,12 @@
  * specific language governing permissions and limitations under the License.
  */
 
-package org.springframework.guice;
+package org.springframework.guice.injector;
 
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.guice.AbstractCompleteWiringTests;
 
 import com.google.inject.Injector;
 

src/test/java/org/springframework/guice/module/SpringModuleMetadataTests.java

@@ -11,7 +11,7 @@
  * specific language governing permissions and limitations under the License.
  */
 
-package org.springframework.guice;
+package org.springframework.guice.module;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
@@ -28,6 +28,8 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
 import org.springframework.core.type.filter.AnnotationTypeFilter;
 import org.springframework.core.type.filter.AssignableTypeFilter;
+import org.springframework.guice.module.GuiceModuleMetadata;
+import org.springframework.guice.module.SpringModule;
 
 import com.google.inject.ConfigurationException;
 import com.google.inject.Guice;

src/test/java/org/springframework/guice/module/SpringModuleWiringTests.java

@@ -11,13 +11,14 @@
  * specific language governing permissions and limitations under the License.
  */
 
-package org.springframework.guice;
+package org.springframework.guice.module;
 
 import org.junit.Rule;
 import org.junit.rules.ExpectedException;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.guice.AbstractCompleteWiringTests;
 
 import com.google.inject.Guice;
 import com.google.inject.Injector;