You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by gp...@apache.org on 2013/12/06 13:09:19 UTC
git commit: DELTASPIKE-342 tests restricted to se-category
Updated Branches:
refs/heads/master 5d60fd432 -> 804d3bce8
DELTASPIKE-342 tests restricted to se-category
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/804d3bce
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/804d3bce
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/804d3bce
Branch: refs/heads/master
Commit: 804d3bce815ea02cf3315de651b4fbe74dce7106
Parents: 5d60fd4
Author: gpetracek <gp...@apache.org>
Authored: Fri Dec 6 13:08:12 2013 +0100
Committer: gpetracek <gp...@apache.org>
Committed: Fri Dec 6 13:08:12 2013 +0100
----------------------------------------------------------------------
.../uc001/RequestAndSessionScopePerTestMethodTest.java | 7 +++++++
.../test/testcontrol/uc002/SessionScopePerTestClassTest.java | 7 +++++++
.../uc003/RequestAndSessionScopePerTestMethodTest.java | 7 +++++++
.../test/testcontrol/uc003/SessionScopePerTestClassTest.java | 7 +++++++
.../apache/deltaspike/test/testcontrol/uc003/TestSuite.java | 7 +++++++
.../test/testcontrol/uc004/ProjectStageTestControlTest.java | 7 +++++++
6 files changed, 42 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/804d3bce/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/uc001/RequestAndSessionScopePerTestMethodTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/uc001/RequestAndSessionScopePerTestMethodTest.java b/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/uc001/RequestAndSessionScopePerTestMethodTest.java
index 05b65d8..710ab21 100644
--- a/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/uc001/RequestAndSessionScopePerTestMethodTest.java
+++ b/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/uc001/RequestAndSessionScopePerTestMethodTest.java
@@ -19,11 +19,13 @@
package org.apache.deltaspike.test.testcontrol.uc001;
import org.apache.deltaspike.core.api.provider.BeanProvider;
+import org.apache.deltaspike.test.category.SeCategory;
import org.apache.deltaspike.testcontrol.api.junit.CdiTestRunner;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.apache.deltaspike.test.testcontrol.shared.ApplicationScopedBean;
import org.apache.deltaspike.test.testcontrol.shared.RequestScopedBean;
@@ -32,6 +34,11 @@ import org.apache.deltaspike.test.testcontrol.shared.TestUtils;
import javax.inject.Inject;
+//Usually NOT needed! Currently only needed due to our arquillian-setup
+@Category(SeCategory.class)
+
+
+
@RunWith(CdiTestRunner.class) //starts container once and one session + request per test-method
//implicitly annotated with @TestControl without the default-scope settings
public class RequestAndSessionScopePerTestMethodTest
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/804d3bce/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/uc002/SessionScopePerTestClassTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/uc002/SessionScopePerTestClassTest.java b/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/uc002/SessionScopePerTestClassTest.java
index f365a54..c156987 100644
--- a/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/uc002/SessionScopePerTestClassTest.java
+++ b/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/uc002/SessionScopePerTestClassTest.java
@@ -19,12 +19,14 @@
package org.apache.deltaspike.test.testcontrol.uc002;
import org.apache.deltaspike.core.api.provider.BeanProvider;
+import org.apache.deltaspike.test.category.SeCategory;
import org.apache.deltaspike.testcontrol.api.TestControl;
import org.apache.deltaspike.testcontrol.api.junit.CdiTestRunner;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.apache.deltaspike.test.testcontrol.shared.ApplicationScopedBean;
import org.apache.deltaspike.test.testcontrol.shared.RequestScopedBean;
@@ -34,6 +36,11 @@ import org.apache.deltaspike.test.testcontrol.shared.TestUtils;
import javax.enterprise.context.SessionScoped;
import javax.inject.Inject;
+//Usually NOT needed! Currently only needed due to our arquillian-setup
+@Category(SeCategory.class)
+
+
+
@RunWith(CdiTestRunner.class) //starts container and session once and one request per test-method
@TestControl(startScopes = SessionScoped.class)
public class SessionScopePerTestClassTest
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/804d3bce/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/uc003/RequestAndSessionScopePerTestMethodTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/uc003/RequestAndSessionScopePerTestMethodTest.java b/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/uc003/RequestAndSessionScopePerTestMethodTest.java
index 4623e44..d9b4616 100644
--- a/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/uc003/RequestAndSessionScopePerTestMethodTest.java
+++ b/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/uc003/RequestAndSessionScopePerTestMethodTest.java
@@ -18,9 +18,11 @@
*/
package org.apache.deltaspike.test.testcontrol.uc003;
+import org.apache.deltaspike.test.category.SeCategory;
import org.apache.deltaspike.testcontrol.api.junit.CdiTestRunner;
import org.junit.Assert;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.apache.deltaspike.test.testcontrol.shared.ApplicationScopedBean;
import org.apache.deltaspike.test.testcontrol.shared.RequestScopedBean;
@@ -28,6 +30,11 @@ import org.apache.deltaspike.test.testcontrol.shared.SessionScopedBean;
import javax.inject.Inject;
+//Usually NOT needed! Currently only needed due to our arquillian-setup
+@Category(SeCategory.class)
+
+
+
@RunWith(CdiTestRunner.class) //starts container once and one session + request per test-method
//implicitly annotated with @TestControl without the default-scope settings
public class RequestAndSessionScopePerTestMethodTest
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/804d3bce/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/uc003/SessionScopePerTestClassTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/uc003/SessionScopePerTestClassTest.java b/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/uc003/SessionScopePerTestClassTest.java
index f1f9e1e..bd0b3f6 100644
--- a/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/uc003/SessionScopePerTestClassTest.java
+++ b/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/uc003/SessionScopePerTestClassTest.java
@@ -18,10 +18,12 @@
*/
package org.apache.deltaspike.test.testcontrol.uc003;
+import org.apache.deltaspike.test.category.SeCategory;
import org.apache.deltaspike.testcontrol.api.TestControl;
import org.apache.deltaspike.testcontrol.api.junit.CdiTestRunner;
import org.junit.Assert;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.apache.deltaspike.test.testcontrol.shared.ApplicationScopedBean;
import org.apache.deltaspike.test.testcontrol.shared.RequestScopedBean;
@@ -30,6 +32,11 @@ import org.apache.deltaspike.test.testcontrol.shared.SessionScopedBean;
import javax.enterprise.context.SessionScoped;
import javax.inject.Inject;
+//Usually NOT needed! Currently only needed due to our arquillian-setup
+@Category(SeCategory.class)
+
+
+
@RunWith(CdiTestRunner.class) //starts container and session once and one request per test-method
@TestControl(startScopes = SessionScoped.class)
public class SessionScopePerTestClassTest
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/804d3bce/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/uc003/TestSuite.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/uc003/TestSuite.java b/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/uc003/TestSuite.java
index 048d6fb..65e5015 100644
--- a/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/uc003/TestSuite.java
+++ b/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/uc003/TestSuite.java
@@ -18,13 +18,20 @@
*/
package org.apache.deltaspike.test.testcontrol.uc003;
+import org.apache.deltaspike.test.category.SeCategory;
import org.apache.deltaspike.testcontrol.api.junit.CdiTestSuiteRunner;
import org.junit.AfterClass;
import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import org.apache.deltaspike.test.testcontrol.shared.ApplicationScopedBean;
+//Usually NOT needed! Currently only needed due to our arquillian-setup
+@Category(SeCategory.class)
+
+
+
@RunWith(CdiTestSuiteRunner.class) //starts container once (for the whole suite)
@Suite.SuiteClasses({
RequestAndSessionScopePerTestMethodTest.class,
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/804d3bce/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/uc004/ProjectStageTestControlTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/uc004/ProjectStageTestControlTest.java b/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/uc004/ProjectStageTestControlTest.java
index db1997f..53d98b0 100644
--- a/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/uc004/ProjectStageTestControlTest.java
+++ b/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/uc004/ProjectStageTestControlTest.java
@@ -19,16 +19,23 @@
package org.apache.deltaspike.test.testcontrol.uc004;
import org.apache.deltaspike.core.api.projectstage.ProjectStage;
+import org.apache.deltaspike.test.category.SeCategory;
import org.apache.deltaspike.test.testcontrol.uc001.RequestAndSessionScopePerTestMethodTest;
import org.apache.deltaspike.testcontrol.api.TestControl;
import org.apache.deltaspike.testcontrol.api.junit.CdiTestRunner;
import org.junit.Assert;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import javax.enterprise.inject.Typed;
import javax.inject.Inject;
+//Usually NOT needed! Currently only needed due to our arquillian-setup
+@Category(SeCategory.class)
+
+
+
@RunWith(CdiTestRunner.class)
@TestControl(projectStage = ProjectStage.Development.class) //can be a custom stage
@Typed() //needed due to RequestAndSessionScopePerTestMethodTest