[webbeans-commits] Webbeans SVN: r2851 - in tck/trunk: xml/src/main/java/org/jboss/jsr299/tck/literals and 1 other directory.
Author: dallen6
Date: 2009-06-18 19:50:24 -0400 (Thu, 18 Jun 2009)
New Revision: 2851
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java
tck/trunk/xml/src/main/java/org/jboss/jsr299/tck/literals/CurrentLiteral.java
Log:
Put AbstractJSR299Test back to the way it was yesterday with new test harness changes
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java 2009-06-18
22:21:14 UTC (rev 2850)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java 2009-06-18
23:50:24 UTC (rev 2851)
@@ -197,14 +197,14 @@
getCurrentConfiguration().getBeans().destroyAndRemoveBeanInstance(bean, instance);
}
- //@Override
- protected static boolean isThrowablePresent(Class<? extends Throwable>
throwableType, Throwable throwable)
+ @Override
+ protected boolean isThrowablePresent(Class<? extends Throwable> throwableType,
Throwable throwable)
{
- if (throwableType.equals(DefinitionError.class) &&
JSR299ConfigurationImpl.get().getManagers().isDefinitionError(throwable))
+ if (throwableType.equals(DefinitionError.class) &&
getCurrentConfiguration().getManagers().isDefinitionError(throwable))
{
return true;
}
-
- return org.jboss.testharness.AbstractTest.isThrowablePresent(throwableType,
throwable);
+
+ return super.isThrowablePresent(throwableType, throwable);
}
}
Modified: tck/trunk/xml/src/main/java/org/jboss/jsr299/tck/literals/CurrentLiteral.java
===================================================================
---
tck/trunk/xml/src/main/java/org/jboss/jsr299/tck/literals/CurrentLiteral.java 2009-06-18
22:21:14 UTC (rev 2850)
+++
tck/trunk/xml/src/main/java/org/jboss/jsr299/tck/literals/CurrentLiteral.java 2009-06-18
23:50:24 UTC (rev 2851)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.literals;
-import javax.inject.AnnotationLiteral;
-import javax.inject.Current;
+import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.inject.Current;
/**
* Annotation literal for @Current