Updated Branches: refs/heads/master 7dd252cd4 -> 9d628ce40
DELTASPIKE-479 workaround for the tomee-arquillian-adapter Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/9d628ce4 Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/9d628ce4 Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/9d628ce4 Branch: refs/heads/master Commit: 9d628ce40369668f6067c7094fe0463fc5f71d47 Parents: 7dd252c Author: gpetracek <[email protected]> Authored: Wed Dec 25 21:39:31 2013 +0100 Committer: gpetracek <[email protected]> Committed: Wed Dec 25 21:40:37 2013 +0100 ---------------------------------------------------------------------- .../deltaspike/test/core/api/exclude/ExcludeEarFileTest.java | 3 ++- .../api/exclude/ExcludeTestProjectStageEarFileDevelopment.java | 3 ++- .../test/core/api/provider/BeanManagerProviderEarFileTest.java | 3 ++- .../api/partialbean/uc001/PartialBeanAsInterfaceEarFileTest.java | 3 ++- .../test/scheduler/custom/CustomSchedulerEarFileTest.java | 3 ++- deltaspike/parent/code/pom.xml | 4 +--- 6 files changed, 11 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/9d628ce4/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/exclude/ExcludeEarFileTest.java ---------------------------------------------------------------------- diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/exclude/ExcludeEarFileTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/exclude/ExcludeEarFileTest.java index fe9f2df..9b85349 100644 --- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/exclude/ExcludeEarFileTest.java +++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/exclude/ExcludeEarFileTest.java @@ -36,7 +36,8 @@ public class ExcludeEarFileTest extends ExcludeTest @Deployment public static EnterpriseArchive deployEar() { - String simpleName = ExcludeEarFileTest.class.getSimpleName(); + //workaround for tomee - the ear-file needs to have the same name as the war-file + String simpleName = ExcludeWarFileTest.class.getSimpleName(); String archiveName = simpleName.substring(0, 1).toLowerCase() + simpleName.substring(1); return ShrinkWrap.create(EnterpriseArchive.class, archiveName + ".ear") http://git-wip-us.apache.org/repos/asf/deltaspike/blob/9d628ce4/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/exclude/ExcludeTestProjectStageEarFileDevelopment.java ---------------------------------------------------------------------- diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/exclude/ExcludeTestProjectStageEarFileDevelopment.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/exclude/ExcludeTestProjectStageEarFileDevelopment.java index 3944071..f165767 100644 --- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/exclude/ExcludeTestProjectStageEarFileDevelopment.java +++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/exclude/ExcludeTestProjectStageEarFileDevelopment.java @@ -42,7 +42,8 @@ public class ExcludeTestProjectStageEarFileDevelopment extends ExcludeTestProjec @Deployment public static EnterpriseArchive deployEar() { - String simpleName = ExcludeTestProjectStageEarFileDevelopment.class.getSimpleName(); + //workaround for tomee - the ear-file needs to have the same name as the war-file + String simpleName = ExcludeTestProjectStageWarFileDevelopment.class.getSimpleName(); String archiveName = simpleName.substring(0, 1).toLowerCase() + simpleName.substring(1); return ShrinkWrap.create(EnterpriseArchive.class, archiveName + ".ear") http://git-wip-us.apache.org/repos/asf/deltaspike/blob/9d628ce4/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/provider/BeanManagerProviderEarFileTest.java ---------------------------------------------------------------------- diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/provider/BeanManagerProviderEarFileTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/provider/BeanManagerProviderEarFileTest.java index 9a836c5..69f7be1 100644 --- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/provider/BeanManagerProviderEarFileTest.java +++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/provider/BeanManagerProviderEarFileTest.java @@ -36,7 +36,8 @@ public class BeanManagerProviderEarFileTest extends BeanManagerProviderTest @Deployment public static EnterpriseArchive deployEar() { - String simpleName = BeanManagerProviderEarFileTest.class.getSimpleName(); + //workaround for tomee - the ear-file needs to have the same name as the war-file + String simpleName = BeanManagerProviderWarFileTest.class.getSimpleName(); String archiveName = simpleName.substring(0, 1).toLowerCase() + simpleName.substring(1); return ShrinkWrap.create(EnterpriseArchive.class, archiveName + ".ear") http://git-wip-us.apache.org/repos/asf/deltaspike/blob/9d628ce4/deltaspike/modules/partial-bean/impl/src/test/java/org/apache/deltaspike/test/core/api/partialbean/uc001/PartialBeanAsInterfaceEarFileTest.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/partial-bean/impl/src/test/java/org/apache/deltaspike/test/core/api/partialbean/uc001/PartialBeanAsInterfaceEarFileTest.java b/deltaspike/modules/partial-bean/impl/src/test/java/org/apache/deltaspike/test/core/api/partialbean/uc001/PartialBeanAsInterfaceEarFileTest.java index 22b73c8..89b86ca 100644 --- a/deltaspike/modules/partial-bean/impl/src/test/java/org/apache/deltaspike/test/core/api/partialbean/uc001/PartialBeanAsInterfaceEarFileTest.java +++ b/deltaspike/modules/partial-bean/impl/src/test/java/org/apache/deltaspike/test/core/api/partialbean/uc001/PartialBeanAsInterfaceEarFileTest.java @@ -33,7 +33,8 @@ public class PartialBeanAsInterfaceEarFileTest extends PartialBeanAsInterfaceTes @Deployment public static EnterpriseArchive deployEar() { - String simpleName = PartialBeanAsInterfaceEarFileTest.class.getSimpleName(); + //workaround for tomee - the ear-file needs to have the same name as the war-file + String simpleName = PartialBeanAsInterfaceWarFileTest.class.getSimpleName(); String archiveName = simpleName.substring(0, 1).toLowerCase() + simpleName.substring(1); return ShrinkWrap.create(EnterpriseArchive.class, archiveName + ".ear") http://git-wip-us.apache.org/repos/asf/deltaspike/blob/9d628ce4/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/CustomSchedulerEarFileTest.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/CustomSchedulerEarFileTest.java b/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/CustomSchedulerEarFileTest.java index f6f2a98..aa0bb20 100644 --- a/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/CustomSchedulerEarFileTest.java +++ b/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/CustomSchedulerEarFileTest.java @@ -33,7 +33,8 @@ public class CustomSchedulerEarFileTest extends CustomSchedulerTest @Deployment public static EnterpriseArchive deployEar() { - String simpleName = CustomSchedulerEarFileTest.class.getSimpleName(); + //workaround for tomee - the ear-file needs to have the same name as the war-file + String simpleName = CustomSchedulerWarFileTest.class.getSimpleName(); String archiveName = simpleName.substring(0, 1).toLowerCase() + simpleName.substring(1); return ShrinkWrap.create(EnterpriseArchive.class, archiveName + ".ear") http://git-wip-us.apache.org/repos/asf/deltaspike/blob/9d628ce4/deltaspike/parent/code/pom.xml ---------------------------------------------------------------------- diff --git a/deltaspike/parent/code/pom.xml b/deltaspike/parent/code/pom.xml index adca7e9..91122ad 100644 --- a/deltaspike/parent/code/pom.xml +++ b/deltaspike/parent/code/pom.xml @@ -390,10 +390,8 @@ all tests in theory, we have to exclude some tests because there are e.g. packaging issues or there are currently issues with arquillian. if a test isn't restricted to an environment, no category is used for the test-class. --> - <!-- TODO remove EnterpriseArchiveProfileCategory asap--> <excludedGroups> - org.apache.deltaspike.test.category.SeCategory, - org.apache.deltaspike.test.category.EnterpriseArchiveProfileCategory + org.apache.deltaspike.test.category.SeCategory </excludedGroups> </configuration> </plugin>
