Permalink
Browse files

Removed server.type parameter

Spymemcached is only meant to work against memcached now so we
don't need the ability to include/exclude tests.

Change-Id: I816a86405c4d0d4d696f72bcf115e98b1e8632aa
Reviewed-on: http://review.couchbase.org/12141
Reviewed-by: Matt Ingenthron <matt@couchbase.com>
Tested-by: Michael Wiederhold <mike@couchbase.com>
  • Loading branch information...
1 parent 055f40c commit 406f5d947b1a1e006695e65b3d4541f67f5eebbb Mike Wiederhold committed with mikewied Jan 6, 2012
Showing with 4 additions and 29 deletions.
  1. +2 −9 README.markdown
  2. +0 −2 build.xml
  3. +2 −18 src/test/java/net/spy/memcached/TestConfig.java
View
11 README.markdown
@@ -22,15 +22,8 @@ use the following command:
# Testing
The latest version of spymemcached has a set of command line arguments
-that can be used to configure the location and type of your testing
-server. The arguments are listed below.
-
- -Dserver.type=server_type
-
-This argument is used to specify the type of testing server you are
-using. By default this argument is set to memcached. It can be set to
-either "memcached", "membase" or "couchbase". Invalid testing server
-types will default to memcached.
+that can be used to configure the location of your testing server. The
+arguments are listed below.
-Dserver.address_v4=ipv4_address_of_testing_server
View
2 build.xml
@@ -111,7 +111,6 @@
<!--test related properties -->
<property name="server.address_v4" value="127.0.0.1"/>
<property name="server.address_v6" value="::1"/>
- <property name="server.type" value="memcached"/>
<property name="server.port_number" value="11211"/>
<property name="test.type" value="unit"/>
@@ -253,7 +252,6 @@
<sysproperty key="server.address_v4" value="${server.address_v4}"/>
<sysproperty key="server.address_v6" value="${server.address_v6}"/>
<sysproperty key="server.port_number" value="${server.port_number}"/>
- <sysproperty key="server.type" value="${server.type}"/>
<sysproperty key="test.type" value="${test.type}"/>
<formatter type="plain" usefile="false" />
<classpath refid="test.classpath" />
View
20 src/test/java/net/spy/memcached/TestConfig.java
@@ -28,22 +28,18 @@
public final class TestConfig {
public static final String IPV4_PROP = "server.address_v4";
public static final String IPV6_PROP = "server.address_v6";
- public static final String TYPE_PROP = "server.type";
public static final String TEST_PROP = "test.type";
public static final String PORT_PROP = "server.port_number";
- public static final String TYPE_MEMCACHED = "memcached";
- public static final String TYPE_MEMBASE = "membase";
- public static final String TYPE_COUCHBASE = "couchbase";
public static final String TYPE_TEST_UNIT = "unit";
public static final String TYPE_TEST_CI = "ci";
public static final String IPV4_ADDR = System.getProperty(IPV4_PROP,
"127.0.0.1");
public static final String IPV6_ADDR = resolveIpv6Addr();
+
public static final int PORT_NUMBER =
Integer.parseInt(System.getProperty(PORT_PROP, "11211"));
- public static final String TYPE = System.getProperty(TYPE_PROP,
- TYPE_MEMCACHED).toLowerCase();
+
public static final String TEST_TYPE = System.getProperty(TEST_PROP,
TYPE_TEST_UNIT).toLowerCase();
@@ -69,18 +65,6 @@ public static boolean defaultToIPV4() {
return false;
}
- public static boolean isMemcached() {
- return TYPE.equals(TYPE_MEMCACHED);
- }
-
- public static boolean isMembase() {
- return TYPE.equals(TYPE_MEMBASE);
- }
-
- public static boolean isCouchbase() {
- return TYPE.equals(TYPE_COUCHBASE);
- }
-
public static boolean isCITest() {
return TEST_TYPE.equals(TYPE_TEST_CI);
}

0 comments on commit 406f5d9

Please sign in to comment.