You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2014/07/18 15:04:14 UTC
svn commit: r1611637 - in
/tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test:
java/org/apache/openejb/arquillian/tests/persistence/ resources/
Author: andygumbrecht
Date: Fri Jul 18 13:04:13 2014
New Revision: 1611637
URL: http://svn.apache.org/r1611637
Log:
Port ranges
Hibernate version.
Modified:
tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/persistence/ServletPersistenceInjectionTest.java
tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/arquillian.xml
tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/hibernate-pom.xml
Modified: tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/persistence/ServletPersistenceInjectionTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/persistence/ServletPersistenceInjectionTest.java?rev=1611637&r1=1611636&r2=1611637&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/persistence/ServletPersistenceInjectionTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/persistence/ServletPersistenceInjectionTest.java Fri Jul 18 13:04:13 2014
@@ -16,10 +16,6 @@
*/
package org.apache.openejb.arquillian.tests.persistence;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
import org.apache.openejb.arquillian.tests.Runner;
import org.apache.ziplock.JarLocation;
import org.jboss.arquillian.container.test.api.Deployment;
@@ -34,6 +30,11 @@ import org.jboss.shrinkwrap.descriptor.a
import org.junit.Test;
import org.junit.runner.RunWith;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
@@ -65,33 +66,32 @@ public class ServletPersistenceInjection
@Deployment(testable = false)
public static WebArchive createDeployment() {
- WebAppDescriptor descriptor = Descriptors.create(WebAppDescriptor.class)
- .version("3.0")
- .createServlet()
- .servletName("check").servletClass(PersistenceServlet.class.getName()).up()
- .createServletMapping()
- .servletName("check").urlPattern("/" + TEST_NAME).up();
-
- WebArchive archive = ShrinkWrap.create(WebArchive.class, TEST_NAME + ".war")
- .addClass(PersistenceServlet.class)
- .addClass(Address.class)
- .addClass(Runner.class)
- .addAsLibraries(JarLocation.jarLocation(Test.class))
- .addAsManifestResource("persistence.xml", ArchivePaths.create("persistence.xml"))
- .setWebXML(new StringAsset(descriptor.exportAsString()));
-
+ final WebAppDescriptor descriptor = Descriptors.create(WebAppDescriptor.class)
+ .version("3.0")
+ .createServlet()
+ .servletName("check").servletClass(PersistenceServlet.class.getName()).up()
+ .createServletMapping()
+ .servletName("check").urlPattern("/" + TEST_NAME).up();
+
+ final WebArchive archive = ShrinkWrap.create(WebArchive.class, TEST_NAME + ".war")
+ .addClass(PersistenceServlet.class)
+ .addClass(Address.class)
+ .addClass(Runner.class)
+ .addAsLibraries(JarLocation.jarLocation(Test.class))
+ .addAsManifestResource("persistence.xml", ArchivePaths.create("persistence.xml"))
+ .setWebXML(new StringAsset(descriptor.exportAsString()));
return archive;
}
- private void validateTest(String expectedOutput) throws IOException {
+ private void validateTest(final String expectedOutput) throws IOException {
final InputStream is = new URL(url.toExternalForm() + TEST_NAME).openStream();
final ByteArrayOutputStream os = new ByteArrayOutputStream();
int bytesRead;
- byte[] buffer = new byte[8192];
+ final byte[] buffer = new byte[8192];
while ((bytesRead = is.read(buffer)) > -1) {
os.write(buffer, 0, bytesRead);
}
@@ -99,7 +99,7 @@ public class ServletPersistenceInjection
is.close();
os.close();
- String output = new String(os.toByteArray(), "UTF-8");
+ final String output = new String(os.toByteArray(), "UTF-8");
assertNotNull("Response shouldn't be null", output);
assertTrue("Output should contain: " + expectedOutput, output.contains(expectedOutput));
}
Modified: tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/arquillian.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/arquillian.xml?rev=1611637&r1=1611636&r2=1611637&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/arquillian.xml (original)
+++ tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/arquillian.xml Fri Jul 18 13:04:13 2014
@@ -25,7 +25,7 @@
<property name="stopPort">-1</property>
<property name="dir">target/tomee-embedded</property>
<property name="appWorkingDir">target/arquillian-embedded-working-dir</property>
- <property name="portRange">20001-30000</property>
+ <property name="portRange">20001-23000</property>
<property name="properties">
My\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb
My\ Unmanaged\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb
@@ -42,7 +42,7 @@
<property name="stopPort">-1</property>
<property name="dir">target/tomee-remote</property>
<property name="appWorkingDir">target/arquillian-remote-working-dir</property>
- <property name="portRange">20001-30000</property>
+ <property name="portRange">23001-26000</property>
<property name="cleanOnStartUp">true</property>
<property name="properties">
My\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb
@@ -60,7 +60,7 @@
<property name="stopPort">-1</property>
<property name="dir">target/tomee-webapp</property>
<property name="appWorkingDir">target/arquillian-webapp-working-dir</property>
- <property name="portRange">20001-30000</property>
+ <property name="portRange">26001-30000</property>
<property name="properties">
My\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb
My\ Unmanaged\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb
Modified: tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/hibernate-pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/hibernate-pom.xml?rev=1611637&r1=1611636&r2=1611637&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/hibernate-pom.xml (original)
+++ tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/hibernate-pom.xml Fri Jul 18 13:04:13 2014
@@ -27,7 +27,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
- <version>4.1.6.Final</version>
+ <version>4.1.12.Final</version>
<exclusions>
<exclusion>
<groupId>org.hibernate.javax.persistence</groupId>
@@ -42,7 +42,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
- <version>4.3.0.Final</version>
+ <version>4.3.1.Final</version>
<exclusions>
<exclusion>
<groupId>javax.validation</groupId>