Updated Branches: refs/heads/master 7297d95bb -> f2d18ff53
Set WebProfileCategory for tests including a persistence unit. Can be removed once we have a proper setup for Java SE profiles (mainly OWB). Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/f2d18ff5 Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/f2d18ff5 Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/f2d18ff5 Branch: refs/heads/master Commit: f2d18ff53cb51dedec320df810d7c97fba0a511f Parents: 7297d95 Author: Thomas Hug <[email protected]> Authored: Mon Jul 1 23:35:12 2013 +0200 Committer: Thomas Hug <[email protected]> Committed: Mon Jul 1 23:38:47 2013 +0200 ---------------------------------------------------------------------- .../java/org/apache/deltaspike/data/impl/QueryResultTest.java | 3 +++ .../org/apache/deltaspike/data/impl/RepositoryExtensionTest.java | 3 +++ .../deltaspike/data/impl/audit/AuditEntityListenerTest.java | 4 +++- .../org/apache/deltaspike/data/impl/criteria/CriteriaTest.java | 3 +++ .../apache/deltaspike/data/impl/handler/EntityManagerTest.java | 3 +++ .../data/impl/handler/EntityRepositoryHandlerTest.java | 3 +++ .../apache/deltaspike/data/impl/handler/QueryHandlerTest.java | 3 +++ .../data/impl/meta/unit/OrmXmlBasedRepositoryTest.java | 3 +++ .../deltaspike/data/impl/meta/unit/PersistenceUnitsTest.java | 4 ++++ .../org/apache/deltaspike/data/impl/spi/CdiQuerySpiTest.java | 3 +++ .../org/apache/deltaspike/data/test/util/TestDeployments.java | 2 ++ 11 files changed, 33 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/f2d18ff5/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/QueryResultTest.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/QueryResultTest.java b/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/QueryResultTest.java index 98efe19..90bcc9a 100644 --- a/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/QueryResultTest.java +++ b/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/QueryResultTest.java @@ -40,11 +40,14 @@ import org.apache.deltaspike.data.test.domain.SimpleBuilder; import org.apache.deltaspike.data.test.domain.Simple_; import org.apache.deltaspike.data.test.service.SimpleRepository; import org.apache.deltaspike.data.test.util.TestDeployments; +import org.apache.deltaspike.test.category.WebProfileCategory; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.shrinkwrap.api.Archive; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; +@Category(WebProfileCategory.class) public class QueryResultTest extends TransactionalTestCase { http://git-wip-us.apache.org/repos/asf/deltaspike/blob/f2d18ff5/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/RepositoryExtensionTest.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/RepositoryExtensionTest.java b/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/RepositoryExtensionTest.java index 8a2fa18..d4328e7 100755 --- a/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/RepositoryExtensionTest.java +++ b/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/RepositoryExtensionTest.java @@ -28,13 +28,16 @@ import org.apache.deltaspike.data.test.service.ExtendedRepositoryInterface; import org.apache.deltaspike.data.test.service.RepositoryInterface; import org.apache.deltaspike.data.test.service.SimpleRepository; import org.apache.deltaspike.data.test.util.TestDeployments; +import org.apache.deltaspike.test.category.WebProfileCategory; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.junit.Arquillian; import org.jboss.shrinkwrap.api.Archive; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; @RunWith(Arquillian.class) +@Category(WebProfileCategory.class) public class RepositoryExtensionTest { http://git-wip-us.apache.org/repos/asf/deltaspike/blob/f2d18ff5/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/audit/AuditEntityListenerTest.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/audit/AuditEntityListenerTest.java b/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/audit/AuditEntityListenerTest.java index febb490..3b9efe2 100644 --- a/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/audit/AuditEntityListenerTest.java +++ b/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/audit/AuditEntityListenerTest.java @@ -27,15 +27,17 @@ import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; import org.apache.deltaspike.data.api.audit.CurrentUser; -import org.apache.deltaspike.data.impl.audit.AuditEntityListener; import org.apache.deltaspike.data.test.TransactionalTestCase; import org.apache.deltaspike.data.test.domain.AuditedEntity; import org.apache.deltaspike.data.test.domain.Principal; +import org.apache.deltaspike.test.category.WebProfileCategory; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.ArchivePaths; import org.junit.Test; +import org.junit.experimental.categories.Category; +@Category(WebProfileCategory.class) public class AuditEntityListenerTest extends TransactionalTestCase { http://git-wip-us.apache.org/repos/asf/deltaspike/blob/f2d18ff5/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/criteria/CriteriaTest.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/criteria/CriteriaTest.java b/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/criteria/CriteriaTest.java index 65ad856..02f1d23 100644 --- a/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/criteria/CriteriaTest.java +++ b/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/criteria/CriteriaTest.java @@ -38,14 +38,17 @@ import org.apache.deltaspike.data.test.service.ParentRepository; import org.apache.deltaspike.data.test.service.SimpleCriteriaRepository; import org.apache.deltaspike.data.test.service.Statistics; import org.apache.deltaspike.data.test.util.TestDeployments; +import org.apache.deltaspike.test.category.WebProfileCategory; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.shrinkwrap.api.Archive; import org.junit.Test; +import org.junit.experimental.categories.Category; /** * * @author thomashug */ +@Category(WebProfileCategory.class) public class CriteriaTest extends TransactionalTestCase { http://git-wip-us.apache.org/repos/asf/deltaspike/blob/f2d18ff5/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/handler/EntityManagerTest.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/handler/EntityManagerTest.java b/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/handler/EntityManagerTest.java index 6f40ac4..e812c8a 100644 --- a/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/handler/EntityManagerTest.java +++ b/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/handler/EntityManagerTest.java @@ -31,13 +31,16 @@ import org.apache.deltaspike.data.test.service.SimpleRepositoryWithOverriddenEnt import org.apache.deltaspike.data.test.service.Simplistic; import org.apache.deltaspike.data.test.service.SimplisticEntityManagerResolver; import org.apache.deltaspike.data.test.util.TestDeployments; +import org.apache.deltaspike.test.category.WebProfileCategory; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.junit.Arquillian; import org.jboss.shrinkwrap.api.Archive; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; @RunWith(Arquillian.class) +@Category(WebProfileCategory.class) public class EntityManagerTest { http://git-wip-us.apache.org/repos/asf/deltaspike/blob/f2d18ff5/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/handler/EntityRepositoryHandlerTest.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/handler/EntityRepositoryHandlerTest.java b/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/handler/EntityRepositoryHandlerTest.java index 79c34c0..0b45822 100644 --- a/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/handler/EntityRepositoryHandlerTest.java +++ b/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/handler/EntityRepositoryHandlerTest.java @@ -36,10 +36,13 @@ import org.apache.deltaspike.data.test.domain.Simple; import org.apache.deltaspike.data.test.domain.Simple_; import org.apache.deltaspike.data.test.service.ExtendedRepositoryInterface; import org.apache.deltaspike.data.test.util.TestDeployments; +import org.apache.deltaspike.test.category.WebProfileCategory; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.shrinkwrap.api.Archive; import org.junit.Test; +import org.junit.experimental.categories.Category; +@Category(WebProfileCategory.class) public class EntityRepositoryHandlerTest extends TransactionalTestCase { http://git-wip-us.apache.org/repos/asf/deltaspike/blob/f2d18ff5/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/handler/QueryHandlerTest.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/handler/QueryHandlerTest.java b/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/handler/QueryHandlerTest.java index 5aa48e3..b1076d0 100644 --- a/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/handler/QueryHandlerTest.java +++ b/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/handler/QueryHandlerTest.java @@ -37,11 +37,14 @@ import org.apache.deltaspike.data.test.domain.SimpleBuilder; import org.apache.deltaspike.data.test.service.Simple2Repository; import org.apache.deltaspike.data.test.service.SimpleRepository; import org.apache.deltaspike.data.test.util.TestDeployments; +import org.apache.deltaspike.test.category.WebProfileCategory; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.shrinkwrap.api.Archive; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; +@Category(WebProfileCategory.class) public class QueryHandlerTest extends TransactionalTestCase { http://git-wip-us.apache.org/repos/asf/deltaspike/blob/f2d18ff5/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/meta/unit/OrmXmlBasedRepositoryTest.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/meta/unit/OrmXmlBasedRepositoryTest.java b/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/meta/unit/OrmXmlBasedRepositoryTest.java index 3da8343..20e1568 100644 --- a/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/meta/unit/OrmXmlBasedRepositoryTest.java +++ b/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/meta/unit/OrmXmlBasedRepositoryTest.java @@ -29,13 +29,16 @@ import org.apache.deltaspike.data.test.TransactionalTestCase; import org.apache.deltaspike.data.test.domain.mapped.MappedOne; import org.apache.deltaspike.data.test.service.MappedOneRepository; import org.apache.deltaspike.data.test.util.TestDeployments; +import org.apache.deltaspike.test.category.WebProfileCategory; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.ArchivePaths; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.Test; +import org.junit.experimental.categories.Category; +@Category(WebProfileCategory.class) public class OrmXmlBasedRepositoryTest extends TransactionalTestCase { http://git-wip-us.apache.org/repos/asf/deltaspike/blob/f2d18ff5/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/meta/unit/PersistenceUnitsTest.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/meta/unit/PersistenceUnitsTest.java b/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/meta/unit/PersistenceUnitsTest.java index 40da703..a21442f 100644 --- a/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/meta/unit/PersistenceUnitsTest.java +++ b/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/meta/unit/PersistenceUnitsTest.java @@ -38,6 +38,7 @@ import org.apache.deltaspike.data.test.domain.mapped.MappedThree; import org.apache.deltaspike.data.test.domain.mapped.MappedTwo; import org.apache.deltaspike.data.test.service.MappedOneRepository; import org.apache.deltaspike.data.test.util.Logging; +import org.apache.deltaspike.test.category.WebProfileCategory; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.junit.Arquillian; import org.jboss.shrinkwrap.api.Archive; @@ -46,9 +47,11 @@ import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; @RunWith(Arquillian.class) +@Category(WebProfileCategory.class) public class PersistenceUnitsTest { @@ -58,6 +61,7 @@ public class PersistenceUnitsTest Logging.reconfigure(); return addDependencies(ShrinkWrap .create(WebArchive.class, "test.war") + .addClass(WebProfileCategory.class) .addAsLibrary(createApiArchive()) .addPackages(true, TEST_FILTER, createImplPackages()) .addPackages(true, Parent.class.getPackage()) http://git-wip-us.apache.org/repos/asf/deltaspike/blob/f2d18ff5/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/spi/CdiQuerySpiTest.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/spi/CdiQuerySpiTest.java b/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/spi/CdiQuerySpiTest.java index c679d20..32e9703 100644 --- a/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/spi/CdiQuerySpiTest.java +++ b/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/spi/CdiQuerySpiTest.java @@ -31,10 +31,13 @@ import org.apache.deltaspike.data.test.service.MyEntityRepository; import org.apache.deltaspike.data.test.service.MyEntityRepositoryDelegate; import org.apache.deltaspike.data.test.service.MySimpleRepository; import org.apache.deltaspike.data.test.util.TestDeployments; +import org.apache.deltaspike.test.category.WebProfileCategory; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.shrinkwrap.api.Archive; import org.junit.Test; +import org.junit.experimental.categories.Category; +@Category(WebProfileCategory.class) public class CdiQuerySpiTest extends TransactionalTestCase { http://git-wip-us.apache.org/repos/asf/deltaspike/blob/f2d18ff5/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/test/util/TestDeployments.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/test/util/TestDeployments.java b/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/test/util/TestDeployments.java index 2eccc3f..77431fa 100755 --- a/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/test/util/TestDeployments.java +++ b/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/test/util/TestDeployments.java @@ -50,6 +50,7 @@ import org.apache.deltaspike.data.spi.DelegateQueryHandler; import org.apache.deltaspike.data.spi.QueryInvocationContext; import org.apache.deltaspike.data.test.TransactionalTestCase; import org.apache.deltaspike.data.test.domain.AuditedEntity; +import org.apache.deltaspike.test.category.WebProfileCategory; import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.ArchivePath; import org.jboss.shrinkwrap.api.ArchivePaths; @@ -82,6 +83,7 @@ public abstract class TestDeployments WebArchive archive = ShrinkWrap .create(WebArchive.class, "test.war") .addAsLibrary(createApiArchive()) + .addClass(WebProfileCategory.class) .addClasses(RepositoryExtension.class, RepositoryDefinitionException.class) .addClasses(TransactionalTestCase.class) .addPackages(true, TEST_FILTER, createImplPackages())
