[webbeans-commits] Webbeans SVN: r3851 - ri/trunk.
Author: pete.muir(a)jboss.org
Date: 2009-10-05 08:23:04 -0400 (Mon, 05 Oct 2009)
New Revision: 3851
Modified:
ri/trunk/atinject-trunk.patch
Log:
remove tck modifications
Modified: ri/trunk/atinject-trunk.patch
===================================================================
--- ri/trunk/atinject-trunk.patch 2009-10-05 12:18:55 UTC (rev 3850)
+++ ri/trunk/atinject-trunk.patch 2009-10-05 12:23:04 UTC (rev 3851)
@@ -14,76 +14,6 @@
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="output" path="build/classes"/>
+</classpath>
-Index: tck/org/atinject/tck/auto/Convertible.java
-===================================================================
---- tck/org/atinject/tck/auto/Convertible.java (revision 46)
-+++ tck/org/atinject/tck/auto/Convertible.java (working copy)
-@@ -16,20 +16,21 @@
-
- package org.atinject.tck.auto;
-
-+import javax.inject.Inject;
-+import javax.inject.Named;
-+import javax.inject.Provider;
-+
- import junit.framework.TestCase;
-+
- import org.atinject.tck.auto.accessories.Cupholder;
-+import org.atinject.tck.auto.accessories.RoundThing;
- import org.atinject.tck.auto.accessories.SpareTire;
--import org.atinject.tck.auto.accessories.RoundThing;
-
--import javax.inject.Inject;
--import javax.inject.Named;
--import javax.inject.Provider;
--
- public class Convertible implements Car {
-
- @Inject @Drivers Seat driversSeatA;
- @Inject @Drivers Seat driversSeatB;
-- @Inject SpareTire spareTire;
-+ @Inject @Named("spare") Tire spareTire;
- @Inject Cupholder cupholder;
- @Inject Provider<Engine> engineProvider;
-
-@@ -177,7 +178,7 @@
-
- private final Convertible car = localConvertible.get();
- private final Cupholder cupholder = car.cupholder;
-- private final SpareTire spareTire = car.spareTire;
-+ private final Tire spareTire = car.spareTire;
- private final Tire plainTire = car.fieldPlainTire;
- private final Engine engine = car.engineProvider.get();
-
-@@ -430,7 +431,7 @@
-
- public void testOverriddingMixedWithPackagePrivate2() {
- assertTrue(spareTire.packagePrivateMethod2Injected);
-- assertTrue(((Tire) spareTire).packagePrivateMethod2Injected);
-+ assertTrue((spareTire).packagePrivateMethod2Injected);
- assertFalse(((RoundThing) spareTire).packagePrivateMethod2Injected);
-
- assertTrue(plainTire.packagePrivateMethod2Injected);
-@@ -438,8 +439,8 @@
- }
-
- public void testOverriddingMixedWithPackagePrivate3() {
-- assertFalse(spareTire.packagePrivateMethod3Injected);
-- assertTrue(((Tire) spareTire).packagePrivateMethod3Injected);
-+ assertFalse(((SpareTire) spareTire).packagePrivateMethod3Injected);
-+ assertTrue((spareTire).packagePrivateMethod3Injected);
- assertFalse(((RoundThing) spareTire).packagePrivateMethod3Injected);
-
- assertTrue(plainTire.packagePrivateMethod3Injected);
-@@ -550,7 +551,7 @@
-
- private final Convertible car = localConvertible.get();
- private final Engine engine = car.engineProvider.get();
-- private final SpareTire spareTire = car.spareTire;
-+ private final Tire spareTire = car.spareTire;
-
- public void testSupertypePrivateMethodInjected() {
- assertTrue(spareTire.superPrivateMethodInjected);
Index: .project
===================================================================
--- .project (revision 0)