You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2016/02/09 02:30:32 UTC
[39/50] [abbrv] incubator-geode git commit: GEODE-14: Minor tweaks to
tests to add correct categories
GEODE-14: Minor tweaks to tests to add correct categories
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/c3b91bcf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/c3b91bcf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/c3b91bcf
Branch: refs/heads/feature/GEODE-268
Commit: c3b91bcf9098f4a89ff8c9aadb96d0df0c478c54
Parents: 83affd2
Author: Jens Deppe <jd...@pivotal.io>
Authored: Tue Feb 2 14:58:39 2016 -0800
Committer: Jens Deppe <jd...@pivotal.io>
Committed: Mon Feb 8 07:06:26 2016 -0800
----------------------------------------------------------------------
extensions/gemfire-modules-hibernate/build.gradle | 2 +-
.../test/java/com/gemstone/gemfire/modules/SecondVMTest.java | 5 +++++
extensions/gemfire-modules-session/build.gradle | 3 ++-
extensions/gemfire-modules/build.gradle | 2 +-
.../modules/session/catalina/PeerToPeerSessionCache.java | 2 +-
.../com/gemstone/gemfire/modules/session/DualCacheTest.java | 3 +++
6 files changed, 13 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c3b91bcf/extensions/gemfire-modules-hibernate/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/gemfire-modules-hibernate/build.gradle b/extensions/gemfire-modules-hibernate/build.gradle
index 0fbf80f..7681301 100644
--- a/extensions/gemfire-modules-hibernate/build.gradle
+++ b/extensions/gemfire-modules-hibernate/build.gradle
@@ -33,5 +33,5 @@ dependencies {
testRuntime 'org.hsqldb:hsqldb:' + project.'hsqldb.version'
testRuntime 'org.javassist:javassist:' + project.'javassist.version'
- provided project(path: ':gemfire-junit', configuration: 'testOutput')
+ provided project(path: ':gemfire-junit')
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c3b91bcf/extensions/gemfire-modules-hibernate/src/test/java/com/gemstone/gemfire/modules/SecondVMTest.java
----------------------------------------------------------------------
diff --git a/extensions/gemfire-modules-hibernate/src/test/java/com/gemstone/gemfire/modules/SecondVMTest.java b/extensions/gemfire-modules-hibernate/src/test/java/com/gemstone/gemfire/modules/SecondVMTest.java
index 9459acc..e3b6480 100644
--- a/extensions/gemfire-modules-hibernate/src/test/java/com/gemstone/gemfire/modules/SecondVMTest.java
+++ b/extensions/gemfire-modules-hibernate/src/test/java/com/gemstone/gemfire/modules/SecondVMTest.java
@@ -21,9 +21,12 @@ import java.util.Iterator;
import java.util.Properties;
import java.util.logging.Level;
+import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
import junit.framework.TestCase;
import org.hibernate.Session;
+import org.junit.Ignore;
+import org.junit.experimental.categories.Category;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -34,6 +37,8 @@ import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.Region.Entry;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
+@Ignore("Can this test be deleted?")
+@Category(IntegrationTest.class)
public class SecondVMTest extends TestCase {
private Logger log = LoggerFactory.getLogger(getClass());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c3b91bcf/extensions/gemfire-modules-session/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/gemfire-modules-session/build.gradle b/extensions/gemfire-modules-session/build.gradle
index d6f12c9..7435d37 100644
--- a/extensions/gemfire-modules-session/build.gradle
+++ b/extensions/gemfire-modules-session/build.gradle
@@ -26,8 +26,9 @@ dependencies {
}
testCompile(group: 'org.eclipse.jetty', name: 'jetty-http', version: project.'jetty.version', classifier: 'tests')
testCompile(group: 'org.eclipse.jetty', name: 'jetty-servlet', version: project.'jetty.version', classifier: 'tests')
+// testCompile 'org.apache.tomcat:jasper:6.0.29'
- provided project(path: ':gemfire-junit', configuration: 'testOutput')
+ provided project(path: ':gemfire-junit')
}
jar {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c3b91bcf/extensions/gemfire-modules/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/gemfire-modules/build.gradle b/extensions/gemfire-modules/build.gradle
index 1d45ab8..5b452b7 100644
--- a/extensions/gemfire-modules/build.gradle
+++ b/extensions/gemfire-modules/build.gradle
@@ -38,5 +38,5 @@ dependencies {
testCompile 'org.httpunit:httpunit:' + project.'httpunit.version'
testRuntime 'org.apache.tomcat:coyote:' + project.'tomcat6.version'
- provided project(path: ':gemfire-junit', configuration: 'testOutput')
+ provided project(path: ':gemfire-junit')
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c3b91bcf/extensions/gemfire-modules/src/main/java/com/gemstone/gemfire/modules/session/catalina/PeerToPeerSessionCache.java
----------------------------------------------------------------------
diff --git a/extensions/gemfire-modules/src/main/java/com/gemstone/gemfire/modules/session/catalina/PeerToPeerSessionCache.java b/extensions/gemfire-modules/src/main/java/com/gemstone/gemfire/modules/session/catalina/PeerToPeerSessionCache.java
index 75b5d41..2c76ca5 100644
--- a/extensions/gemfire-modules/src/main/java/com/gemstone/gemfire/modules/session/catalina/PeerToPeerSessionCache.java
+++ b/extensions/gemfire-modules/src/main/java/com/gemstone/gemfire/modules/session/catalina/PeerToPeerSessionCache.java
@@ -133,7 +133,7 @@ public class PeerToPeerSessionCache extends AbstractSessionCache {
/**
* For peer-to-peer the backing cache *is* what's embedded in tomcat so it's always available
*
- * @return
+ * @return boolean indicating whether a backing cache is available
*/
@Override
public boolean isBackingCacheAvailable() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c3b91bcf/extensions/gemfire-modules/src/test/java/com/gemstone/gemfire/modules/session/DualCacheTest.java
----------------------------------------------------------------------
diff --git a/extensions/gemfire-modules/src/test/java/com/gemstone/gemfire/modules/session/DualCacheTest.java b/extensions/gemfire-modules/src/test/java/com/gemstone/gemfire/modules/session/DualCacheTest.java
index f3927a8..220b614 100644
--- a/extensions/gemfire-modules/src/test/java/com/gemstone/gemfire/modules/session/DualCacheTest.java
+++ b/extensions/gemfire-modules/src/test/java/com/gemstone/gemfire/modules/session/DualCacheTest.java
@@ -21,15 +21,18 @@
package com.gemstone.gemfire.modules.session;
+import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
import com.meterware.httpunit.GetMethodWebRequest;
import com.meterware.httpunit.WebConversation;
import com.meterware.httpunit.WebRequest;
import com.meterware.httpunit.WebResponse;
import junit.framework.TestCase;
+import org.junit.experimental.categories.Category;
/**
*
*/
+@Category(IntegrationTest.class)
public class DualCacheTest extends TestCase {
/**