[picocontainer-scm] [scm-git][1/1] Move test case where it belongs :(

commit f28936e6960bef4a12eae45fee737a1d829bf989
Author:     Michael Rimov <[email protected]>
AuthorDate: Wed, 6 Mar 2013 12:18:27 -0800
Commit:     Michael Rimov <[email protected]>
CommitDate: Wed, 6 Mar 2013 12:18:27 -0800

    Move test case where it belongs :(

diff --git a/pico/container/src/java/org/picocontainer/parameters/JSR330ComponentParameterTestCase.java b/pico/container/src/java/org/picocontainer/parameters/JSR330ComponentParameterTestCase.java
deleted file mode 100644
index 17670fc..0000000
--- a/pico/container/src/java/org/picocontainer/parameters/JSR330ComponentParameterTestCase.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package org.picocontainer.parameters;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import javax.inject.Provider;
-
-import org.junit.Test;
-import org.picocontainer.MutablePicoContainer;
-import org.picocontainer.Parameter;
-import org.picocontainer.PicoBuilder;
-import org.picocontainer.containers.JSRPicoContainer;
-import org.picocontainer.injectors.AbstractInjector.AmbiguousComponentResolutionException;
-
-public class JSR330ComponentParameterTestCase {
-
-
-	public static class A {
-		public String value;
-	}
-	
-	
-	public static class AmbiguousTest {
-		public A value;
-		
-		public AmbiguousTest(A value) {
-			this.value = value;
-		}
-	}
-	
-	public static class Provider1 implements Provider<A> {
-		public A get() {
-			A returnValue = new A();
-			returnValue.value = "Test";
-			return returnValue;
-		}
-	}
-	
-	public static class Provider2 implements Provider<A> {
-		public A get() {
-			A returnValue = new A();
-			returnValue.value = "Test 2";
-			return returnValue;
-		}
-	}
-	
-	public static class Provider3 implements Provider<A> {
-		public A get() {
-			A returnValue = new A();
-			returnValue.value = "Test3";
-			return returnValue;
-		}
-	}
-	
-	
-	@Test
-	public void testHappyPathTrimmingOfMatches() {
-		MutablePicoContainer pico = new JSRPicoContainer(new PicoBuilder().build());
-		pico.addComponent(AmbiguousTest.class, AmbiguousTest.class, new JSR330ComponentParameter())
-			.addProvider("test", new Provider1()) // <-- Should be skipped
-			.addProvider("test2", new Provider2()) // <-- Should be skipped
-			.addProvider(new Provider3());  	//<-- Should be chosen
-		
-		AmbiguousTest result = pico.getComponent(AmbiguousTest.class);
-		assertEquals("Test3", result.value.value);
-	}
-	
-	
-	@Test(expected=AmbiguousComponentResolutionException.class)
-	public void testMoreThanOnePossibleResultAmbiguousComponentResolutionException() {
-		MutablePicoContainer pico = new JSRPicoContainer(new PicoBuilder().build());
-		pico.addComponent(AmbiguousTest.class, AmbiguousTest.class, new JSR330ComponentParameter())
-			.addProvider("test", new Provider1())
-			.addProvider("test2", new Provider2())
-			.addProvider("test3", new Provider3());
-		
-		AmbiguousTest test = pico.getComponent(AmbiguousTest.class);
-		assertNotNull(test);
-	}
-	
-}
diff --git a/pico/container/src/test/org/picocontainer/parameters/JSR330ComponentParameterTestCase.java b/pico/container/src/test/org/picocontainer/parameters/JSR330ComponentParameterTestCase.java
new file mode 100644
index 0000000..17670fc
--- /dev/null
+++ b/pico/container/src/test/org/picocontainer/parameters/JSR330ComponentParameterTestCase.java
@@ -0,0 +1,86 @@
+package org.picocontainer.parameters;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import javax.inject.Provider;
+
+import org.junit.Test;
+import org.picocontainer.MutablePicoContainer;
+import org.picocontainer.Parameter;
+import org.picocontainer.PicoBuilder;
+import org.picocontainer.containers.JSRPicoContainer;
+import org.picocontainer.injectors.AbstractInjector.AmbiguousComponentResolutionException;
+
+public class JSR330ComponentParameterTestCase {
+
+
+	public static class A {
+		public String value;
+	}
+	
+	
+	public static class AmbiguousTest {
+		public A value;
+		
+		public AmbiguousTest(A value) {
+			this.value = value;
+		}
+	}
+	
+	public static class Provider1 implements Provider<A> {
+		public A get() {
+			A returnValue = new A();
+			returnValue.value = "Test";
+			return returnValue;
+		}
+	}
+	
+	public static class Provider2 implements Provider<A> {
+		public A get() {
+			A returnValue = new A();
+			returnValue.value = "Test 2";
+			return returnValue;
+		}
+	}
+	
+	public static class Provider3 implements Provider<A> {
+		public A get() {
+			A returnValue = new A();
+			returnValue.value = "Test3";
+			return returnValue;
+		}
+	}
+	
+	
+	@Test
+	public void testHappyPathTrimmingOfMatches() {
+		MutablePicoContainer pico = new JSRPicoContainer(new PicoBuilder().build());
+		pico.addComponent(AmbiguousTest.class, AmbiguousTest.class, new JSR330ComponentParameter())
+			.addProvider("test", new Provider1()) // <-- Should be skipped
+			.addProvider("test2", new Provider2()) // <-- Should be skipped
+			.addProvider(new Provider3());  	//<-- Should be chosen
+		
+		AmbiguousTest result = pico.getComponent(AmbiguousTest.class);
+		assertEquals("Test3", result.value.value);
+	}
+	
+	
+	@Test(expected=AmbiguousComponentResolutionException.class)
+	public void testMoreThanOnePossibleResultAmbiguousComponentResolutionException() {
+		MutablePicoContainer pico = new JSRPicoContainer(new PicoBuilder().build());
+		pico.addComponent(AmbiguousTest.class, AmbiguousTest.class, new JSR330ComponentParameter())
+			.addProvider("test", new Provider1())
+			.addProvider("test2", new Provider2())
+			.addProvider("test3", new Provider3());
+		
+		AmbiguousTest test = pico.getComponent(AmbiguousTest.class);
+		assertNotNull(test);
+	}
+	
+}