Renamed test properties and fields

ricellis · ricellis · commit 8f015c3da539 · 2019-05-22T14:37:59.000+01:00
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -112,11 +112,11 @@ CouchDB. To run tests with a remote CouchDB or Cloudant, you need set the
 details of this CouchDB server, including access credentials:
 
 ```
-systemProp.test.couch.username=yourUsername
-systemProp.test.couch.password=yourPassword
-systemProp.test.couch.host=couchdbHost # default localhost
-systemProp.test.couch.port=couchdbPort # default 5984
-systemProp.test.couch.http=[http|https] # default http
+systemProp.test.server.user=yourUsername
+systemProp.test.server.password=yourPassword
+systemProp.test.server.host=couchdborcloudanthost # default localhost
+systemProp.test.server.port=5984 # default 5984
+systemProp.test.server.protocol=[http|https] # default http
 ```
 Alternatively, provide a URL containing all the above information:
 ```
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -29,7 +29,7 @@ def runTests(testEnv, isServiceTests) {
         withEnv(testEnv) {
             withCredentials([(env.CREDS_ID.contains('iam')) ? string(credentialsId: env.CREDS_ID, variable: 'IAM_API_KEY') : usernamePassword(credentialsId: env.CREDS_ID, usernameVariable: 'DB_USER', passwordVariable: 'DB_PASSWORD')]) {
                 try {
-                    sh "./gradlew ${(env.DB_USER?.trim()) ? '-Dtest.couch.username=$DB_USER -Dtest.couch.password=$DB_PASSWORD' : ''} -Dtest.couch.host=\$DB_HOST -Dtest.couch.port=\$DB_PORT -Dtest.couch.http=\$DB_HTTP \$GRADLE_TARGET"
+                    sh "./gradlew ${(env.DB_USER?.trim()) ? '-Dtest.server.user=$DB_USER -Dtest.server.password=$DB_PASSWORD' : ''} -Dtest.server.host=\$DB_HOST -Dtest.server.port=\$DB_PORT -Dtest.server.protocol=\$DB_HTTP \$GRADLE_TARGET"
                 } finally {
                     junit '**/build/test-results/**/*.xml'
                 }
diff --git a/cloudant-client/build.gradle b/cloudant-client/build.gradle
@@ -110,9 +110,9 @@ task cloudantServiceTest(type: Test) {
 
 task integrationTest(type: Test) {
     // Special environment variables for integration tests
-    [SERVER_URL:'test.couch.url',
-     SERVER_USER:'test.couch.username',
-     SERVER_PASSWORD:'test.couch.password',
+    [SERVER_URL:'test.server.url',
+     SERVER_USER:'test.server.user',
+     SERVER_PASSWORD:'test.server.password',
      TEST_REPLICATION_SOURCE_URL:'test.replication.source.url'].each { k,v ->
         def e = System.getenv(k)
         if (e) {
diff --git a/cloudant-client/src/test/java/com/cloudant/tests/CloudFoundryServiceTest.java b/cloudant-client/src/test/java/com/cloudant/tests/CloudFoundryServiceTest.java
@@ -252,7 +252,7 @@ public void vcapSingleServiceEmptyCredentials() {
             public void execute() throws Throwable {
                 VCAPGenerator vcap = new CloudFoundryServiceTest.VCAPGenerator();
                 vcap.createNewLegacyServiceWithEmptyCredentials("test_bluemix_service_1",
-                        CloudantClientHelper.COUCH_HOST);
+                        CloudantClientHelper.SERVER_HOST);
                 ClientBuilder.bluemix(vcap.toJson(), "test_bluemix_service_1");
             }
         });
@@ -277,7 +277,7 @@ public void vcapSingleServiceEmptyIAM() {
             public void execute() throws Throwable {
                 VCAPGenerator vcap = new CloudFoundryServiceTest.VCAPGenerator();
                 vcap.createNewServiceWithEmptyIAM("test_bluemix_service_1",
-                        CloudantClientHelper.COUCH_HOST);
+                        CloudantClientHelper.SERVER_HOST);
                 ClientBuilder.bluemix(vcap.toJson(), "test_bluemix_service_1");
             }
         });
@@ -382,7 +382,7 @@ public void execute() throws Throwable {
                 vcap.createNewLegacyService("test_bluemix_service_2", "foo2.bar", "admin2",
                         "pass2");
                 vcap.createNewLegacyServiceWithEmptyCredentials("test_bluemix_service_3",
-                        CloudantClientHelper.COUCH_HOST);
+                        CloudantClientHelper.SERVER_HOST);
                 ClientBuilder.bluemix(vcap.toJson(), "test_bluemix_service_3");
             }
         });
@@ -397,7 +397,7 @@ public void execute() throws Throwable {
                 vcap.createNewService("test_bluemix_service_1", "admin1", "apikey1");
                 vcap.createNewService("test_bluemix_service_2", "admin2", "apikey2");
                 vcap.createNewServiceWithEmptyIAM("test_bluemix_service_3",
-                        CloudantClientHelper.COUCH_HOST);
+                        CloudantClientHelper.SERVER_HOST);
                 ClientBuilder.bluemix(vcap.toJson(), "test_bluemix_service_3");
             }
         });
diff --git a/cloudant-client/src/test/java/com/cloudant/tests/CloudantClientHelper.java b/cloudant-client/src/test/java/com/cloudant/tests/CloudantClientHelper.java
@@ -33,54 +33,54 @@ public abstract class CloudantClientHelper {
     //some tests need access to the URI with user info (e.g. replication)
     public static final String SERVER_URI_WITH_USER_INFO;
     //some tests need access to the credentials (e.g. auth interceptors, vcap)
-    static final String COUCH_USERNAME;
-    static final String COUCH_PASSWORD;
-    static final String COUCH_HOST;
+    static final String SERVER_USER;
+    static final String SERVER_PASSWORD;
+    static final String SERVER_HOST;
 
     private static final CloudantClient CLIENT_INSTANCE;
 
-    private static final String COUCH_PORT;
-    private static final String HTTP_PROTOCOL;
+    private static final String SERVER_PORT;
+    private static final String SERVER_PROTOCOL;
     private static final URL SERVER_URL;
 
     static {
 
         try {
             //a URL might be supplied, otherwise use the separate properties
-            String URL = System.getProperty("test.couch.url");
+            String URL = System.getProperty("test.server.url");
             if (URL != null) {
                 URL couch = new URL(URL);
-                HTTP_PROTOCOL = couch.getProtocol();
-                COUCH_HOST = couch.getHost();
-                COUCH_PORT = (couch.getPort() < 0) ? null : Integer.toString(couch.getPort());
+                SERVER_PROTOCOL = couch.getProtocol();
+                SERVER_HOST = couch.getHost();
+                SERVER_PORT = (couch.getPort() < 0) ? null : Integer.toString(couch.getPort());
                 String userInfo = couch.getUserInfo();
                 if (userInfo != null) {
-                    COUCH_USERNAME = userInfo.substring(0, userInfo.indexOf(":"));
-                    COUCH_PASSWORD = userInfo.substring(userInfo.indexOf(":") + 1);
+                    SERVER_USER = userInfo.substring(0, userInfo.indexOf(":"));
+                    SERVER_PASSWORD = userInfo.substring(userInfo.indexOf(":") + 1);
                 } else {
-                    COUCH_USERNAME = System.getProperty("test.couch.username");
-                    COUCH_PASSWORD = System.getProperty("test.couch.password");
+                    SERVER_USER = System.getProperty("test.server.user");
+                    SERVER_PASSWORD = System.getProperty("test.server.password");
                 }
             } else {
-                COUCH_USERNAME = System.getProperty("test.couch.username");
-                COUCH_PASSWORD = System.getProperty("test.couch.password");
-                COUCH_HOST = System.getProperty("test.couch.host", "localhost");
-                COUCH_PORT = System.getProperty("test.couch.port", "5984");
-                HTTP_PROTOCOL = System.getProperty("test.couch.http", "http"); //should either be
+                SERVER_USER = System.getProperty("test.server.user");
+                SERVER_PASSWORD = System.getProperty("test.server.password");
+                SERVER_HOST = System.getProperty("test.server.host", "localhost");
+                SERVER_PORT = System.getProperty("test.server.port", "5984");
+                SERVER_PROTOCOL = System.getProperty("test.server.protocol", "http"); //should either be
                 // http or https
             }
 
             //now build the URLs
-            SERVER_URL = new URL(HTTP_PROTOCOL + "://"
-                    + COUCH_HOST
-                    + ((COUCH_PORT != null) ? ":" + COUCH_PORT : "")); //port if supplied
+            SERVER_URL = new URL(SERVER_PROTOCOL + "://"
+                    + SERVER_HOST
+                    + ((SERVER_PORT != null) ? ":" + SERVER_PORT : "")); //port if supplied
 
             // Ensure username and password are correctly URL encoded when included in the URI
-            SERVER_URI_WITH_USER_INFO = HTTP_PROTOCOL + "://"
-                    + ((!IamAuthCondition.IS_IAM_ENABLED && COUCH_USERNAME != null) ?
-                    URLEncoder.encode(COUCH_USERNAME, "UTF-8") +
-                    ":" + URLEncoder.encode(COUCH_PASSWORD, "UTF-8") + "@" : "") + COUCH_HOST + (
-                    (COUCH_PORT != null) ? ":" + COUCH_PORT : ""); //port if supplied
+            SERVER_URI_WITH_USER_INFO = SERVER_PROTOCOL + "://"
+                    + ((!IamAuthCondition.IS_IAM_ENABLED && SERVER_USER != null) ?
+                    URLEncoder.encode(SERVER_USER, "UTF-8") +
+                    ":" + URLEncoder.encode(SERVER_PASSWORD, "UTF-8") + "@" : "") + SERVER_HOST + (
+                    (SERVER_PORT != null) ? ":" + SERVER_PORT : ""); //port if supplied
         } catch (Throwable t) {
             throw new RuntimeException(t);
         }
@@ -122,8 +122,8 @@ public static ClientBuilder getClientBuilder() {
         if (IamAuthCondition.IS_IAM_ENABLED) {
             builder.iamApiKey(IamAuthCondition.IAM_API_KEY);
         } else {
-            builder.username(COUCH_USERNAME)
-                    .password(COUCH_PASSWORD);
+            builder.username(SERVER_USER)
+                    .password(SERVER_PASSWORD);
         }
         return builder;
     }
diff --git a/cloudant-client/src/test/java/com/cloudant/tests/CloudantClientTests.java b/cloudant-client/src/test/java/com/cloudant/tests/CloudantClientTests.java
@@ -497,10 +497,10 @@ public void sessionDeleteOnShutdown() throws Exception {
     @RequiresCloudant
     public void testBasicAuth() throws IOException {
         BasicAuthInterceptor interceptor =
-                new BasicAuthInterceptor(CloudantClientHelper.COUCH_USERNAME
-                        + ":" + CloudantClientHelper.COUCH_PASSWORD);
+                new BasicAuthInterceptor(CloudantClientHelper.SERVER_USER
+                        + ":" + CloudantClientHelper.SERVER_PASSWORD);
 
-        CloudantClient client = ClientBuilder.account(CloudantClientHelper.COUCH_USERNAME)
+        CloudantClient client = ClientBuilder.account(CloudantClientHelper.SERVER_USER)
                 .interceptors(interceptor).build();
 
         // Test passes if there are no exceptions
diff --git a/cloudant-client/src/test/java/com/cloudant/tests/HttpTest.java b/cloudant-client/src/test/java/com/cloudant/tests/HttpTest.java
@@ -226,8 +226,8 @@ public void testReadBeforeExecute() throws Exception {
     @DisabledWithIam
     @RequiresCloudant
     public void testCookieAuthWithoutRetry() throws IOException {
-        CookieInterceptor interceptor = new CookieInterceptor(CloudantClientHelper.COUCH_USERNAME,
-                CloudantClientHelper.COUCH_PASSWORD, clientResource.get().getBaseUri().toString());
+        CookieInterceptor interceptor = new CookieInterceptor(CloudantClientHelper.SERVER_USER,
+                CloudantClientHelper.SERVER_PASSWORD, clientResource.get().getBaseUri().toString());
 
         HttpConnection conn = new HttpConnection("POST", dbResource.get().getDBUri().toURL(),
                 "application/json");
@@ -285,8 +285,8 @@ public void testCookieAuthWithPath() throws Exception {
     @RequiresCloudant
     public void testBasicAuth() throws IOException {
         BasicAuthInterceptor interceptor =
-                new BasicAuthInterceptor(CloudantClientHelper.COUCH_USERNAME
-                        + ":" + CloudantClientHelper.COUCH_PASSWORD);
+                new BasicAuthInterceptor(CloudantClientHelper.SERVER_USER
+                        + ":" + CloudantClientHelper.SERVER_PASSWORD);
 
         HttpConnection conn = new HttpConnection("POST", dbResource.get().getDBUri().toURL(),
                 "application/json");

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ def runTests(testEnv, isServiceTests) {`
`29`	`29`	`withEnv(testEnv) {`
`30`	`30`	`withCredentials([(env.CREDS_ID.contains('iam')) ? string(credentialsId: env.CREDS_ID, variable: 'IAM_API_KEY') : usernamePassword(credentialsId: env.CREDS_ID, usernameVariable: 'DB_USER', passwordVariable: 'DB_PASSWORD')]) {`
`31`	`31`	`try {`
`32`		`- sh "./gradlew ${(env.DB_USER?.trim()) ? '-Dtest.couch.username=$DB_USER -Dtest.couch.password=$DB_PASSWORD' : ''} -Dtest.couch.host=\$DB_HOST -Dtest.couch.port=\$DB_PORT -Dtest.couch.http=\$DB_HTTP \$GRADLE_TARGET"`
	`32`	`+ sh "./gradlew ${(env.DB_USER?.trim()) ? '-Dtest.server.user=$DB_USER -Dtest.server.password=$DB_PASSWORD' : ''} -Dtest.server.host=\$DB_HOST -Dtest.server.port=\$DB_PORT -Dtest.server.protocol=\$DB_HTTP \$GRADLE_TARGET"`
`33`	`33`	`} finally {`
`34`	`34`	`junit '/build/test-results//*.xml'`
`35`	`35`	`}`