Author: rmannibucau Date: Tue Jan 29 10:49:08 2013 New Revision: 1439824 URL: http://svn.apache.org/viewvc?rev=1439824&view=rev Log: ensuring our beandiscoverer is not excluded
Modified: tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java tomee/tomee/trunk/arquillian/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/TomEEContainerTest.java Modified: tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java?rev=1439824&r1=1439823&r2=1439824&view=diff ============================================================================== --- tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java (original) +++ tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java Tue Jan 29 10:49:08 2013 @@ -46,7 +46,7 @@ import java.util.logging.Logger; */ public class Setup { private static final Logger LOGGER = Logger.getLogger(Setup.class.getName()); // JUL is used by arquillian so that's fine - public static final String TOMEE_BEAN_DISCOVERER_JAR = "lib" + File.separator + "arquillian-tomee-bean-discoverer.jar"; + public static final String TOMEE_BEAN_DISCOVERER_JAR = "lib" + File.separator + "xx-arquillian-tomee-bean-discoverer.jar"; // starts with xx to not be filtered private static final String DEFAULT_MEM_CONFIG = "-Xmx512m -Xms256m -XX:PermSize=64m -XX:MaxPermSize=256m -XX:ReservedCodeCacheSize=64m"; public static void exportProperties(final File tomeeHome, final TomEEConfiguration c, final boolean defaultMem) { Modified: tomee/tomee/trunk/arquillian/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/TomEEContainerTest.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/TomEEContainerTest.java?rev=1439824&r1=1439823&r2=1439824&view=diff ============================================================================== --- tomee/tomee/trunk/arquillian/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/TomEEContainerTest.java (original) +++ tomee/tomee/trunk/arquillian/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/TomEEContainerTest.java Tue Jan 29 10:49:08 2013 @@ -20,7 +20,6 @@ import java.io.ByteArrayOutputStream; import java.io.InputStream; import java.net.URL; import javax.ejb.EJB; -import junit.framework.Assert; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.junit.Arquillian; import org.jboss.shrinkwrap.api.ShrinkWrap; @@ -31,6 +30,9 @@ import org.jboss.shrinkwrap.descriptor.a import org.junit.Test; import org.junit.runner.RunWith; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + @RunWith(Arquillian.class) public class TomEEContainerTest { @@ -48,7 +50,7 @@ public class TomEEContainerTest { @Test public void testEjbIsNotNull() throws Exception { - Assert.assertNotNull(ejb); + assertNotNull(ejb); } @Test @@ -69,7 +71,7 @@ public class TomEEContainerTest { os.close(); String output = new String(os.toByteArray(), "UTF-8"); - Assert.assertTrue(output.contains("Hello, OpenEJB")); + assertTrue(output.contains("Hello, OpenEJB")); } }