You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by th...@apache.org on 2018/12/17 12:50:51 UTC

tapestry-5 git commit: Reenabling JPA tests.

Repository: tapestry-5
Updated Branches:
  refs/heads/master 94b18f6b7 -> 8a70c98a6


Reenabling JPA tests.

Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/8a70c98a
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/8a70c98a
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/8a70c98a

Branch: refs/heads/master
Commit: 8a70c98a6725ef23ba12bda5c71d5e984ceca87a
Parents: 94b18f6
Author: Thiago H. de Paula Figueiredo <th...@arsmachina.com.br>
Authored: Mon Dec 17 10:50:39 2018 -0200
Committer: Thiago H. de Paula Figueiredo <th...@arsmachina.com.br>
Committed: Mon Dec 17 10:50:39 2018 -0200

----------------------------------------------------------------------
 .../apache/tapestry5/jpa/integration/app1/JpaIntegrationTest.java  | 2 ++
 .../jpa/integration/app2/SinglePersistenceUnitIntegrationTest.java | 2 ++
 .../apache/tapestry5/jpa/integration/app3/JndiDataSourceTest.java  | 2 ++
 .../tapestry5/jpa/integration/app4/IncludeUnlistedClassesTest.java | 2 ++
 .../jpa/integration/app5/ExplicitPersistenceProviderClassTest.java | 2 ++
 .../JpaIntegrationTestWithAnnotationsInServiceImplementation.java  | 2 ++
 .../src/test/java/org/apache/tapestry5/jpa/test/JpaTestModule.java | 2 +-
 7 files changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/8a70c98a/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app1/JpaIntegrationTest.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app1/JpaIntegrationTest.java b/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app1/JpaIntegrationTest.java
index 83f9162..66dd5b9 100644
--- a/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app1/JpaIntegrationTest.java
+++ b/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app1/JpaIntegrationTest.java
@@ -16,9 +16,11 @@ package org.apache.tapestry5.jpa.integration.app1;
 
 import org.apache.tapestry5.internal.jpa.PersistedEntity;
 import org.apache.tapestry5.test.SeleniumTestCase;
+import org.apache.tapestry5.test.TapestryTestConfiguration;
 import org.example.app1.entities.User;
 import org.testng.annotations.Test;
 
+@TapestryTestConfiguration(webAppFolder = "src/test/app1")
 public class JpaIntegrationTest extends SeleniumTestCase
 {
 

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/8a70c98a/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app2/SinglePersistenceUnitIntegrationTest.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app2/SinglePersistenceUnitIntegrationTest.java b/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app2/SinglePersistenceUnitIntegrationTest.java
index fe10373..e4af879 100644
--- a/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app2/SinglePersistenceUnitIntegrationTest.java
+++ b/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app2/SinglePersistenceUnitIntegrationTest.java
@@ -15,8 +15,10 @@
 package org.apache.tapestry5.jpa.integration.app2;
 
 import org.apache.tapestry5.test.SeleniumTestCase;
+import org.apache.tapestry5.test.TapestryTestConfiguration;
 import org.testng.annotations.Test;
 
+@TapestryTestConfiguration(webAppFolder = "src/test/app2")
 public class SinglePersistenceUnitIntegrationTest extends SeleniumTestCase
 {
 

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/8a70c98a/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app3/JndiDataSourceTest.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app3/JndiDataSourceTest.java b/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app3/JndiDataSourceTest.java
index 1cec63a..a0f4b23 100644
--- a/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app3/JndiDataSourceTest.java
+++ b/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app3/JndiDataSourceTest.java
@@ -15,8 +15,10 @@
 package org.apache.tapestry5.jpa.integration.app3;
 
 import org.apache.tapestry5.test.SeleniumTestCase;
+import org.apache.tapestry5.test.TapestryTestConfiguration;
 import org.testng.annotations.Test;
 
+@TapestryTestConfiguration(webAppFolder = "src/test/app3")
 public class JndiDataSourceTest extends SeleniumTestCase
 {
     @Test

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/8a70c98a/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app4/IncludeUnlistedClassesTest.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app4/IncludeUnlistedClassesTest.java b/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app4/IncludeUnlistedClassesTest.java
index cecef95..6534a1a 100644
--- a/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app4/IncludeUnlistedClassesTest.java
+++ b/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app4/IncludeUnlistedClassesTest.java
@@ -15,8 +15,10 @@
 package org.apache.tapestry5.jpa.integration.app4;
 
 import org.apache.tapestry5.test.SeleniumTestCase;
+import org.apache.tapestry5.test.TapestryTestConfiguration;
 import org.testng.annotations.Test;
 
+@TapestryTestConfiguration(webAppFolder = "src/test/app4")
 public class IncludeUnlistedClassesTest extends SeleniumTestCase
 {
     @Test

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/8a70c98a/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app5/ExplicitPersistenceProviderClassTest.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app5/ExplicitPersistenceProviderClassTest.java b/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app5/ExplicitPersistenceProviderClassTest.java
index 3deed3c..f820fa2 100644
--- a/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app5/ExplicitPersistenceProviderClassTest.java
+++ b/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app5/ExplicitPersistenceProviderClassTest.java
@@ -15,8 +15,10 @@
 package org.apache.tapestry5.jpa.integration.app5;
 
 import org.apache.tapestry5.test.SeleniumTestCase;
+import org.apache.tapestry5.test.TapestryTestConfiguration;
 import org.testng.annotations.Test;
 
+@TapestryTestConfiguration(webAppFolder = "src/test/app5")
 public class ExplicitPersistenceProviderClassTest extends SeleniumTestCase
 {
 

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/8a70c98a/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app6/JpaIntegrationTestWithAnnotationsInServiceImplementation.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app6/JpaIntegrationTestWithAnnotationsInServiceImplementation.java b/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app6/JpaIntegrationTestWithAnnotationsInServiceImplementation.java
index ee3cd4d..f1efd76 100644
--- a/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app6/JpaIntegrationTestWithAnnotationsInServiceImplementation.java
+++ b/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app6/JpaIntegrationTestWithAnnotationsInServiceImplementation.java
@@ -16,9 +16,11 @@ package org.apache.tapestry5.jpa.integration.app6;
 
 import org.apache.tapestry5.internal.jpa.PersistedEntity;
 import org.apache.tapestry5.test.SeleniumTestCase;
+import org.apache.tapestry5.test.TapestryTestConfiguration;
 import org.example.app6.entities.User;
 import org.testng.annotations.Test;
 
+@TapestryTestConfiguration(webAppFolder = "src/test/app6")
 public class JpaIntegrationTestWithAnnotationsInServiceImplementation extends SeleniumTestCase
 {
 

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/8a70c98a/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/test/JpaTestModule.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/test/JpaTestModule.java b/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/test/JpaTestModule.java
index d70e4b8..b1ea41f 100644
--- a/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/test/JpaTestModule.java
+++ b/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/test/JpaTestModule.java
@@ -59,7 +59,7 @@ public class JpaTestModule
 
     @Contribute(EntityManagerSource.class)
     public static void configurePersistenceUnit(
-            MappedConfiguration<String, PersistenceUnitConfigurer> cfg, ObjectLocator objectLocator)
+            MappedConfiguration<String, PersistenceUnitConfigurer> cfg, final ObjectLocator objectLocator)
     {
         PersistenceUnitConfigurer configurer = new PersistenceUnitConfigurer()
         {