You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by nn...@apache.org on 2018/03/14 20:40:14 UTC
[geode] branch develop updated: GEODE-4824: Categorized Session
state tests (#1599)
This is an automated email from the ASF dual-hosted git repository.
nnag pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 6630f48 GEODE-4824: Categorized Session state tests (#1599)
6630f48 is described below
commit 6630f48fe6aa39bc518883c16b5d1e535a6ca524
Author: Nabarun Nag <na...@users.noreply.github.com>
AuthorDate: Wed Mar 14 13:40:11 2018 -0700
GEODE-4824: Categorized Session state tests (#1599)
---
.../session/installer/InstallerJUnitTest.java | 4 ++-
.../SessionReplicationIntegrationJUnitTest.java | 31 +++++++++++++---------
.../filter/SessionReplicationJUnitTest.java | 3 ++-
.../SessionReplicationLocalCacheJUnitTest.java | 3 ++-
.../modules/session/Tomcat7SessionsJUnitTest.java | 3 ++-
.../Tomcat8SessionsClientServerDUnitTest.java | 10 +++----
.../modules/session/Tomcat8SessionsDUnitTest.java | 9 +++----
.../modules/session/Tomcat6SessionsJUnitTest.java | 4 +--
.../util/ClassLoaderObjectInputStreamTest.java | 4 +--
.../modules/util/ModuleFunctionsSecurityTest.java | 3 ++-
.../geode/test/junit/categories/SessionTest.java | 21 ++++-----------
gradle/test.gradle | 11 ++++++++
12 files changed, 57 insertions(+), 49 deletions(-)
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/installer/InstallerJUnitTest.java b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/installer/InstallerJUnitTest.java
index 20c5e24..6e6743d 100644
--- a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/installer/InstallerJUnitTest.java
+++ b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/installer/InstallerJUnitTest.java
@@ -29,8 +29,10 @@ import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.SessionTest;
-@Category(IntegrationTest.class)
+
+@Category({IntegrationTest.class, SessionTest.class})
public class InstallerJUnitTest {
@Rule
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/SessionReplicationIntegrationJUnitTest.java b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/SessionReplicationIntegrationJUnitTest.java
index 9e99660..a06b8e2 100644
--- a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/SessionReplicationIntegrationJUnitTest.java
+++ b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/SessionReplicationIntegrationJUnitTest.java
@@ -56,12 +56,13 @@ import org.apache.geode.modules.session.filter.SessionCachingFilter;
import org.apache.geode.modules.session.junit.PerTestClassLoaderRunner;
import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.SessionTest;
/**
* In-container testing using Jetty. This allows us to test context listener events as well as
* dispatching actions.
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, SessionTest.class})
@RunWith(PerTestClassLoaderRunner.class)
@SuppressWarnings("unchecked")
public class SessionReplicationIntegrationJUnitTest {
@@ -311,9 +312,10 @@ public class SessionReplicationIntegrationJUnitTest {
/**
* Test setting an attribute to null deletes it
*/
- @Category(FlakyTest.class) // GEODE-1015: uses Jetty HttpTester, uses static vars with class
- // loader isolation, TODO: rewrite test with JUnit 4 rules including
- // TemporaryFolder
+ @Category(FlakyTest.class) // GEODE-1015: uses Jetty HttpTester, uses static
+ // vars with class
+ // loader isolation, TODO: rewrite test with JUnit 4 rules including
+ // TemporaryFolder
@Test
public void testSetAttributeNullDeletesIt() throws Exception {
Callback c_1 = (request, response) -> request.getSession().setAttribute("foo", "bar");
@@ -396,9 +398,10 @@ public class SessionReplicationIntegrationJUnitTest {
/**
* Test that invalidating a session destroys it as well as the backend object.
*/
- @Category(FlakyTest.class) // GEODE-1015: uses Jetty HttpTester, uses static vars with class
- // loader isolation, TODO: rewrite test with JUnit 4 rules including
- // TemporaryFolder
+ @Category(FlakyTest.class) // GEODE-1015: uses Jetty HttpTester, uses static
+ // vars with class
+ // loader isolation, TODO: rewrite test with JUnit 4 rules including
+ // TemporaryFolder
@Test
public void testInvalidateSession1() throws Exception {
Callback c_1 = (request, response) -> request.getSession().setAttribute("foo", "bar");
@@ -468,9 +471,10 @@ public class SessionReplicationIntegrationJUnitTest {
/**
* Test that invalidating a session throws an exception on subsequent access.
*/
- @Category(FlakyTest.class) // GEODE-1015: uses Jetty HttpTester, uses static vars with class
- // loader isolation, TODO: rewrite test with JUnit 4 rules including
- // TemporaryFolder
+ @Category(FlakyTest.class) // GEODE-1015: uses Jetty HttpTester, uses static
+ // vars with class
+ // loader isolation, TODO: rewrite test with JUnit 4 rules including
+ // TemporaryFolder
@Test
public void testInvalidateSession3() throws Exception {
Callback c_1 = (request, response) -> {
@@ -965,9 +969,10 @@ public class SessionReplicationIntegrationJUnitTest {
/**
* Test that request forward dispatching works
*/
- @Category(FlakyTest.class) // GEODE-1015: uses Jetty HttpTester, uses static vars with class
- // loader isolation, TODO: rewrite test with JUnit 4 rules including
- // TemporaryFolder
+ @Category(FlakyTest.class) // GEODE-1015: uses Jetty HttpTester, uses static
+ // vars with class
+ // loader isolation, TODO: rewrite test with JUnit 4 rules including
+ // TemporaryFolder
@Test
public void testDispatchingForward1() throws Exception {
Callback c_1 = (request, response) -> {
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/SessionReplicationJUnitTest.java b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/SessionReplicationJUnitTest.java
index 21ec0bd..2fc37fd 100644
--- a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/SessionReplicationJUnitTest.java
+++ b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/SessionReplicationJUnitTest.java
@@ -23,11 +23,12 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.modules.session.filter.SessionCachingFilter;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.SessionTest;
/**
* This runs all tests with a local cache disabled
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, SessionTest.class})
public class SessionReplicationJUnitTest extends CommonTests {
@Before
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/SessionReplicationLocalCacheJUnitTest.java b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/SessionReplicationLocalCacheJUnitTest.java
index c7d38db..a2dc5c0 100644
--- a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/SessionReplicationLocalCacheJUnitTest.java
+++ b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/SessionReplicationLocalCacheJUnitTest.java
@@ -23,11 +23,12 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.modules.session.filter.SessionCachingFilter;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.SessionTest;
/**
* This runs all tests with a local cache enabled
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, SessionTest.class})
public class SessionReplicationLocalCacheJUnitTest extends CommonTests {
@Before
diff --git a/extensions/geode-modules-tomcat7/src/test/java/org/apache/geode/modules/session/Tomcat7SessionsJUnitTest.java b/extensions/geode-modules-tomcat7/src/test/java/org/apache/geode/modules/session/Tomcat7SessionsJUnitTest.java
index 67e505c..4d3c9cf 100644
--- a/extensions/geode-modules-tomcat7/src/test/java/org/apache/geode/modules/session/Tomcat7SessionsJUnitTest.java
+++ b/extensions/geode-modules-tomcat7/src/test/java/org/apache/geode/modules/session/Tomcat7SessionsJUnitTest.java
@@ -26,8 +26,9 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.modules.session.catalina.Tomcat7DeltaSessionManager;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.SessionTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, SessionTest.class})
public class Tomcat7SessionsJUnitTest extends TestSessionsBase {
// Set up the session manager we need
diff --git a/extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/Tomcat8SessionsClientServerDUnitTest.java b/extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/Tomcat8SessionsClientServerDUnitTest.java
index 325dc8e..e68270a 100644
--- a/extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/Tomcat8SessionsClientServerDUnitTest.java
+++ b/extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/Tomcat8SessionsClientServerDUnitTest.java
@@ -14,9 +14,9 @@
*/
package org.apache.geode.modules.session;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOG_LEVEL;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import java.util.List;
import java.util.Properties;
import org.junit.experimental.categories.Category;
@@ -24,8 +24,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.client.ClientCacheFactory;
-import org.apache.geode.cache.client.PoolFactory;
-import org.apache.geode.cache.client.PoolManager;
import org.apache.geode.cache.server.CacheServer;
import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.internal.cache.GemFireCacheImpl;
@@ -34,9 +32,9 @@ import org.apache.geode.modules.session.catalina.DeltaSessionManager;
import org.apache.geode.modules.session.catalina.Tomcat8DeltaSessionManager;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.UnitTest;
+import org.apache.geode.test.junit.categories.SessionTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, SessionTest.class})
public class Tomcat8SessionsClientServerDUnitTest extends TestSessionsTomcat8Base {
// Set up the session manager we need
diff --git a/extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/Tomcat8SessionsDUnitTest.java b/extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/Tomcat8SessionsDUnitTest.java
index 6c728f4..cf0f30a 100644
--- a/extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/Tomcat8SessionsDUnitTest.java
+++ b/extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/Tomcat8SessionsDUnitTest.java
@@ -14,11 +14,10 @@
*/
package org.apache.geode.modules.session;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOG_LEVEL;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import org.junit.AfterClass;
import org.junit.Before;
-import org.junit.BeforeClass;
import org.junit.experimental.categories.Category;
import org.apache.geode.internal.AvailablePortHelper;
@@ -26,9 +25,9 @@ import org.apache.geode.modules.session.catalina.DeltaSessionManager;
import org.apache.geode.modules.session.catalina.PeerToPeerCacheLifecycleListener;
import org.apache.geode.modules.session.catalina.Tomcat8DeltaSessionManager;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.UnitTest;
+import org.apache.geode.test.junit.categories.SessionTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, SessionTest.class})
public class Tomcat8SessionsDUnitTest extends TestSessionsTomcat8Base {
// Set up the session manager we need
diff --git a/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/Tomcat6SessionsJUnitTest.java b/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/Tomcat6SessionsJUnitTest.java
index 8ccaef6..bd6d7c8 100644
--- a/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/Tomcat6SessionsJUnitTest.java
+++ b/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/Tomcat6SessionsJUnitTest.java
@@ -19,9 +19,9 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.modules.session.catalina.Tomcat6DeltaSessionManager;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.apache.geode.test.junit.categories.UnitTest;
+import org.apache.geode.test.junit.categories.SessionTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, SessionTest.class})
public class Tomcat6SessionsJUnitTest extends TestSessionsBase {
// Set up the session manager we need
diff --git a/extensions/geode-modules/src/test/java/org/apache/geode/modules/util/ClassLoaderObjectInputStreamTest.java b/extensions/geode-modules/src/test/java/org/apache/geode/modules/util/ClassLoaderObjectInputStreamTest.java
index c567184..7243ad9 100644
--- a/extensions/geode-modules/src/test/java/org/apache/geode/modules/util/ClassLoaderObjectInputStreamTest.java
+++ b/extensions/geode-modules/src/test/java/org/apache/geode/modules/util/ClassLoaderObjectInputStreamTest.java
@@ -14,7 +14,8 @@
*/
package org.apache.geode.modules.util;
-import static org.assertj.core.api.Assertions.*;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -37,7 +38,6 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.rules.TestName;
-import org.apache.geode.internal.ClassPathLoader;
import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
diff --git a/extensions/geode-modules/src/test/java/org/apache/geode/modules/util/ModuleFunctionsSecurityTest.java b/extensions/geode-modules/src/test/java/org/apache/geode/modules/util/ModuleFunctionsSecurityTest.java
index 3f65bab..88c3772 100644
--- a/extensions/geode-modules/src/test/java/org/apache/geode/modules/util/ModuleFunctionsSecurityTest.java
+++ b/extensions/geode-modules/src/test/java/org/apache/geode/modules/util/ModuleFunctionsSecurityTest.java
@@ -30,11 +30,12 @@ import org.apache.geode.cache.execute.FunctionService;
import org.apache.geode.examples.SimpleSecurityManager;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.SecurityTest;
+import org.apache.geode.test.junit.categories.SessionTest;
import org.apache.geode.test.junit.rules.ConnectionConfiguration;
import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.rules.ServerStarterRule;
-@Category({IntegrationTest.class, SecurityTest.class})
+@Category({IntegrationTest.class, SecurityTest.class, SessionTest.class})
public class ModuleFunctionsSecurityTest {
private static final String RESULT_HEADER = "Function Execution Result";
diff --git a/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/Tomcat6SessionsJUnitTest.java b/geode-junit/src/main/java/org/apache/geode/test/junit/categories/SessionTest.java
similarity index 57%
copy from extensions/geode-modules/src/test/java/org/apache/geode/modules/session/Tomcat6SessionsJUnitTest.java
copy to geode-junit/src/main/java/org/apache/geode/test/junit/categories/SessionTest.java
index 8ccaef6..9a8d9ea 100644
--- a/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/Tomcat6SessionsJUnitTest.java
+++ b/geode-junit/src/main/java/org/apache/geode/test/junit/categories/SessionTest.java
@@ -12,21 +12,10 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.geode.modules.session;
+package org.apache.geode.test.junit.categories;
-import org.junit.BeforeClass;
-import org.junit.experimental.categories.Category;
-
-import org.apache.geode.modules.session.catalina.Tomcat6DeltaSessionManager;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.apache.geode.test.junit.categories.UnitTest;
-
-@Category(IntegrationTest.class)
-public class Tomcat6SessionsJUnitTest extends TestSessionsBase {
-
- // Set up the session manager we need
- @BeforeClass
- public static void setupClass() throws Exception {
- setupServer(new Tomcat6DeltaSessionManager());
- }
+/**
+ * JUnit Test Category that specifies a test that involves session state feature.
+ */
+public interface SessionTest {
}
diff --git a/gradle/test.gradle b/gradle/test.gradle
index cf7d8a5..4c78af1 100644
--- a/gradle/test.gradle
+++ b/gradle/test.gradle
@@ -266,6 +266,17 @@ subprojects {
}
+ task sessionTest(type:Test) {
+ useJUnit {
+ includeCategories 'org.apache.geode.test.junit.categories.SessionTest'
+ excludeCategories 'org.apache.geode.test.junit.categories.FlakyTest'
+ }
+ doFirst {
+ TestPropertiesWriter.writeTestProperties(buildDir, name)
+ }
+ reports.junitXml.destination = file "$buildDir/test-reports-session"
+ }
+
task wanTest(type:Test) {
useJUnit {
includeCategories 'org.apache.geode.test.junit.categories.WanTest'
--
To stop receiving notification emails like this one, please contact
nnag@apache.org.