test(its): keeping naming consistent

Author: kevinkowa

discovery/src/test/java/com/ibm/watson/discovery/v1/DiscoveryServiceIT.java

@@ -147,16 +147,16 @@ public static void cleanupClass() throws Exception {
   public void setup() throws Exception {
     super.setUp();
     String apiKey = System.getenv("DISCOVERY_APIKEY");
-    String url = System.getenv("DISCOVERY_URL");
+    String serviceUrl = System.getenv("DISCOVERY_URL");
 
     if (apiKey == null) {
       apiKey = getProperty("discovery.apikey");
-      url = getProperty("discovery.url");
+      serviceUrl = getProperty("discovery.url");
     }
 
     Authenticator authenticator = new IamAuthenticator(apiKey);
     discovery = new Discovery("2019-04-30", authenticator);
-    discovery.setServiceUrl(url);
+    discovery.setServiceUrl(serviceUrl);
     discovery.setDefaultHeaders(getDefaultHeaders());
 
     uniqueName = UUID.randomUUID().toString();

discovery/src/test/java/com/ibm/watson/discovery/v2/DiscoveryIT.java

@@ -65,19 +65,19 @@ public void setUp() throws Exception {
     super.setUp();
 
     String apiKey = System.getenv("DISCOVERY_V2_APIKEY");
-    String url = System.getenv("DISCOVERY_V2_URL");
+    String serviceUrl = System.getenv("DISCOVERY_V2_URL");
 
     if (apiKey == null) {
       apiKey = getProperty("discovery_v2.apikey");
-      url = getProperty("discovery_v2.url");
+      serviceUrl = getProperty("discovery_v2.url");
     }
 
     assertNotNull("DISCOVERY_V2_APIKEY is not defined and config.properties doesn't have valid credentials.", apiKey);
 
     Authenticator authenticator = new IamAuthenticator(apiKey);
     service = new Discovery(VERSION, authenticator);
     service.setDefaultHeaders(getDefaultHeaders());
-    service.setServiceUrl(url);
+    service.setServiceUrl(serviceUrl);
 
     HttpConfigOptions configOptions =
         new HttpConfigOptions.Builder().disableSslVerification(true).build();