tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmannibu...@apache.org
Subject [10/50] tomee git commit: cleanup some tests
Date Sat, 03 Dec 2016 16:37:36 GMT
cleanup some tests


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/d5522107
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/d5522107
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/d5522107

Branch: refs/heads/tomee-1.7.x
Commit: d5522107219d60175f60180dc870dd2e3759e4f3
Parents: 4d3b3fb
Author: rmannibucau <rmannibucau@apache.org>
Authored: Thu Sep 29 22:56:15 2016 +0200
Committer: rmannibucau <rmannibucau@apache.org>
Committed: Thu Sep 29 22:56:15 2016 +0200

----------------------------------------------------------------------
 .../src/test/java/org/superbiz/AlternateDataSourceTest.java        | 2 +-
 .../src/test/java/org/superbiz/moviefun/MoviesEJBTest.java         | 1 -
 .../java/org/superbiz/moviefun/MoviesArquillianHtmlUnitTest.java   | 1 -
 .../src/test/java/org/superbiz/moviefun/MoviesEJBTest.java         | 1 -
 .../src/test/java/org/apache/tomee/embedded/ConfigurationTest.java | 1 -
 5 files changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/d5522107/examples/datasource-versioning/src/test/java/org/superbiz/AlternateDataSourceTest.java
----------------------------------------------------------------------
diff --git a/examples/datasource-versioning/src/test/java/org/superbiz/AlternateDataSourceTest.java
b/examples/datasource-versioning/src/test/java/org/superbiz/AlternateDataSourceTest.java
index 2877434..c7def46 100644
--- a/examples/datasource-versioning/src/test/java/org/superbiz/AlternateDataSourceTest.java
+++ b/examples/datasource-versioning/src/test/java/org/superbiz/AlternateDataSourceTest.java
@@ -41,7 +41,7 @@ public class AlternateDataSourceTest {
 
         return ShrinkWrap.create(WebArchive.class, "test.war")
                 .addClasses(DataSourceTester.class)
-                .addAsResource(new ClassLoaderAsset("META-INF/ejb-jar.xml"), "META-INF/ejb-jar.xml");
+                .addAsResource(new ClassLoaderAsset("META-INF/beans.xml"), "META-INF/beans.xml");
         //We are using src/test/conf/tomee.xml, but this also works - .addAsResource(new
ClassLoaderAsset("META-INF/resources.xml"), "META-INF/resources.xml");
         //Or even using a persistence context - .addAsResource(new ClassLoaderAsset("META-INF/persistence.xml"),
"META-INF/persistence.xml");
     }

http://git-wip-us.apache.org/repos/asf/tomee/blob/d5522107/examples/moviefun-rest/src/test/java/org/superbiz/moviefun/MoviesEJBTest.java
----------------------------------------------------------------------
diff --git a/examples/moviefun-rest/src/test/java/org/superbiz/moviefun/MoviesEJBTest.java
b/examples/moviefun-rest/src/test/java/org/superbiz/moviefun/MoviesEJBTest.java
index 15a0f22..e195c0c 100644
--- a/examples/moviefun-rest/src/test/java/org/superbiz/moviefun/MoviesEJBTest.java
+++ b/examples/moviefun-rest/src/test/java/org/superbiz/moviefun/MoviesEJBTest.java
@@ -39,7 +39,6 @@ public class MoviesEJBTest {
     public static WebArchive createDeployment() {
         return ShrinkWrap.create(WebArchive.class, "test.war")
                 .addClasses(Movie.class, MoviesBean.class, MoviesEJBTest.class)
-                .addAsResource(new ClassLoaderAsset("META-INF/ejb-jar.xml"), "META-INF/ejb-jar.xml")
                 .addAsResource(new ClassLoaderAsset("META-INF/persistence.xml"), "META-INF/persistence.xml");
     }
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/d5522107/examples/moviefun/src/test/java/org/superbiz/moviefun/MoviesArquillianHtmlUnitTest.java
----------------------------------------------------------------------
diff --git a/examples/moviefun/src/test/java/org/superbiz/moviefun/MoviesArquillianHtmlUnitTest.java
b/examples/moviefun/src/test/java/org/superbiz/moviefun/MoviesArquillianHtmlUnitTest.java
index c83cac4..6ae1dd0 100644
--- a/examples/moviefun/src/test/java/org/superbiz/moviefun/MoviesArquillianHtmlUnitTest.java
+++ b/examples/moviefun/src/test/java/org/superbiz/moviefun/MoviesArquillianHtmlUnitTest.java
@@ -61,7 +61,6 @@ public class MoviesArquillianHtmlUnitTest {
 
         WebArchive war = ShrinkWrap.create(WebArchive.class, "test.war")
                 .addClasses(Movie.class, MoviesBean.class, MoviesArquillianHtmlUnitTest.class,
ActionServlet.class)
-                .addAsResource(new ClassLoaderAsset("META-INF/ejb-jar.xml"), "META-INF/ejb-jar.xml")
                 .addAsResource(new ClassLoaderAsset("META-INF/persistence.xml"), "META-INF/persistence.xml")
                 .addAsLibraries(libs);
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/d5522107/examples/moviefun/src/test/java/org/superbiz/moviefun/MoviesEJBTest.java
----------------------------------------------------------------------
diff --git a/examples/moviefun/src/test/java/org/superbiz/moviefun/MoviesEJBTest.java b/examples/moviefun/src/test/java/org/superbiz/moviefun/MoviesEJBTest.java
index 3824df9..63a081d 100644
--- a/examples/moviefun/src/test/java/org/superbiz/moviefun/MoviesEJBTest.java
+++ b/examples/moviefun/src/test/java/org/superbiz/moviefun/MoviesEJBTest.java
@@ -39,7 +39,6 @@ public class MoviesEJBTest {
     public static WebArchive createDeployment() {
         return ShrinkWrap.create(WebArchive.class, "test.war")
                 .addClasses(Movie.class, MoviesBean.class, MoviesEJBTest.class)
-                .addAsResource(new ClassLoaderAsset("META-INF/ejb-jar.xml"), "META-INF/ejb-jar.xml")
                 .addAsResource(new ClassLoaderAsset("META-INF/persistence.xml"), "META-INF/persistence.xml");
     }
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/d5522107/tomee/tomee-embedded/src/test/java/org/apache/tomee/embedded/ConfigurationTest.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-embedded/src/test/java/org/apache/tomee/embedded/ConfigurationTest.java
b/tomee/tomee-embedded/src/test/java/org/apache/tomee/embedded/ConfigurationTest.java
index b072491..ccb9a3b 100644
--- a/tomee/tomee-embedded/src/test/java/org/apache/tomee/embedded/ConfigurationTest.java
+++ b/tomee/tomee-embedded/src/test/java/org/apache/tomee/embedded/ConfigurationTest.java
@@ -56,7 +56,6 @@ public class ConfigurationTest {
                 .p("login", "")
                 .p("login.realmName", "app")
                 .p("login.authMethod", "BASIC")
-                .p("login", "")
                 .p("securityConstraint", "")
                 .p("securityConstraint.authConstraint", "true")
                 .p("securityConstraint.authRole", "**")


Mime
View raw message