Added unit tests that require a running server

Author: gmfeinberg

README.md

@@ -11,6 +11,11 @@
   <version>5.2.24-SNAPSHOT</version>
   <packaging>jar</packaging>
 
+  <organization>
+    <name>Oracle Corporation</name>
+    <url>http://www.oracle.com/</url>
+  </organization>
+
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.source>1.8</maven.compiler.source>
@@ -32,14 +37,43 @@
 
   <profiles>
 
-    <!-- test profiles used with the test target -->
+    <!-- test profiles used with the test target
+         Running tests requires a running on-premise service and httpproxy
+         or a running cloud simulator. Required information:
+            o endpoint
+         Examples:
+           mvn -Ptest-cloudsim test -DargLine="test.endpoint=http://localhost:8080"
+           mvn -Ptest-onprem test -DargLine="test.endpoint=http://localhost:8090"
+
+        These tests are not designed to work directly against the cloud service
+        as they require a high rate of DDL operations and generally use more
+        resource than a user might want to use in the cloud.
+
+        A secure, onprem configuration requires more information:
+          1. user name and password
+          2. trust store and optional password for the SSL certificate to use to
+          communicate with the proxy
+        These are also passed as system properties, e.g.:
+          mvn -Ptest-onprem-secure test -DargLine="-Dtest.endpoint=<secure-endpoint> -Dtest.user=<username> -Dtest.password=<user-password> -Dtest.trust=<path-to-trust-store> -Dtest.trust.password=<trust-store-password>"
+
+        Individual test methods can be traced by adding "-Dtest.trace=true" to
+        the argLine string
+    -->
     <profile>
       <id>test-cloudsim</id>
       <properties>
         <maven.test.skip>false</maven.test.skip>
         <secure>false</secure>
         <onprem>false</onprem>
         <serverType>cloudsim</serverType>
+        <!-- exclude non-server tests and on-premise tests -->
+        <excluded.tests>
+          StoreAccessTokenProviderTest.java, ResourcePrincipalProviderTest.java,
+          ConfigFileTest.java, SignatureProviderTest.java,
+          UserProfileProviderTest.java, InstancePrincipalsProviderTest.java,
+          HandleConfigTest.java, JsonTest.java, ValueTest.java,
+          OnPremiseTest.java
+        </excluded.tests>
       </properties>
     </profile>
 
@@ -50,6 +84,13 @@
         <secure>false</secure>
         <onprem>true</onprem>
         <serverType>onprem</serverType>
+        <!-- exclude non-server tests -->
+        <excluded.tests>
+          StoreAccessTokenProviderTest.java, ResourcePrincipalProviderTest.java,
+          ConfigFileTest.java, SignatureProviderTest.java,
+          UserProfileProviderTest.java, InstancePrincipalsProviderTest.java,
+          HandleConfigTest.java, JsonTest.java, ValueTest.java
+        </excluded.tests>
       </properties>
     </profile>
 
@@ -60,6 +101,13 @@
         <secure>true</secure>
         <onprem>true</onprem>
         <serverType>onprem</serverType>
+        <!-- exclude non-server tests -->
+        <excluded.tests>
+          StoreAccessTokenProviderTest.java, ResourcePrincipalProviderTest.java,
+          ConfigFileTest.java, SignatureProviderTest.java,
+          UserProfileProviderTest.java, InstancePrincipalsProviderTest.java,
+          HandleConfigTest.java, JsonTest.java, ValueTest.java
+        </excluded.tests>
       </properties>
     </profile>
 
@@ -188,6 +236,9 @@
           <includes>
             <include>${included.tests}</include>
           </includes>
+          <excludes>
+            <exclude>${excluded.tests}</exclude>
+          </excludes>
         </configuration>
       </plugin>
       <plugin>

driver/pom.xml

@@ -28,7 +28,6 @@
 import io.netty.channel.ChannelFutureListener;
 import io.netty.channel.ChannelOption;
 import io.netty.channel.nio.NioEventLoopGroup;
-import io.netty.channel.pool.ChannelPool;
 import io.netty.channel.pool.FixedChannelPool;
 import io.netty.channel.socket.nio.NioSocketChannel;
 import io.netty.handler.codec.http.HttpRequest;
@@ -204,6 +203,11 @@ public HttpClient(String host,
         poolHandler =
             new HttpClientChannelPoolHandler(this);
 
+        /*
+         * TODO: FixedChannelPool has a method to return the number of
+         * channels it has -- acquiredChannelCount(). Look at exposing
+         * this somehow.
+         */
         pool = new FixedChannelPool(b,
                                     poolHandler, /* pool handler */
                                     poolHandler, /* health checker */
@@ -214,10 +218,6 @@ public HttpClient(String host,
                                     true); /* do health check on release */
     }
 
-    ChannelPool getPool() {
-        return pool;
-    }
-
     SslContext getSslContext() {
         return sslCtx;
     }
@@ -285,7 +285,6 @@ public int getProxyPort() {
      */
     public void shutdown() {
         pool.close();
-        poolHandler.close();
         workerGroup.shutdownGracefully().syncUninterruptibly();
     }
 

driver/src/main/java/oracle/nosql/driver/httpclient/HttpClient.java

@@ -10,8 +10,6 @@
 import static oracle.nosql.driver.util.LogUtil.logFine;
 import static oracle.nosql.driver.util.LogUtil.logInfo;
 import java.net.InetSocketAddress;
-import java.util.concurrent.atomic.AtomicInteger;
-
 import javax.net.ssl.SSLEngine;
 import javax.net.ssl.SSLParameters;
 
@@ -42,13 +40,6 @@ public class HttpClientChannelPoolHandler implements ChannelPoolHandler,
 
     private final HttpClient client;
 
-    /*
-     * Debugging -- use these to ensure proper acquire/release calls.
-     * TODO: keep these or not?
-     */
-    private final AtomicInteger count = new AtomicInteger(0);
-    private final AtomicInteger createCount = new AtomicInteger(0);
-
     /**
      * Creates an instance of this object
      *
@@ -59,12 +50,6 @@ public class HttpClientChannelPoolHandler implements ChannelPoolHandler,
         this.client = client;
     }
 
-    @Override
-    public void channelAcquired(Channel ch) {
-        //logFine(client.getLogger(), "Channel acquired: " + ch);
-        count.incrementAndGet();
-    }
-
     /**
      * Initialize a channel with handlers that:
      * 1 -- handle and HTTP
@@ -105,53 +90,14 @@ public void channelCreated(Channel ch) {
                            client.getProxyUsername(),
                            client.getProxyPassword()));
         }
-        count.incrementAndGet();
-        createCount.incrementAndGet();
     }
 
     @Override
-    public void channelReleased(Channel ch) {
-        /*
-         * no need to log this -- it happens on every release. What would be
-         * nice is to log when a channel is destroyed, but that doesn't seem
-         * possible
-         */
-        //logFine(client.getLogger(), "Channel release: " + ch);
-        count.decrementAndGet();
-    }
-
-    /*
-     * Maybe remove the count-based debugging
-     */
-    void close() {
-        int chCount = count.get();
-        logInfo(client.getLogger(),
-                "HttpClient " + client.getName() +
-                ", close pool handler, create count, ref count: "
-                + createCount.get() + ", " + chCount);
-        if (chCount > 0) {
-            logInfo(client.getLogger(),
-                    "HttpClient " + client.getName() +
-                    ", possible channel leak, count is non-zero: " + chCount);
-        }
-    }
-
-    /**
-     * Returns the number of channels that are in active use. Note that this is
-     * less than or equal to the number of channels currently in the pool.
-     */
-    int getCount() {
-        return count.get();
+    public void channelAcquired(Channel ch) {
     }
 
-    /**
-     * Returns the total number of channels that were created over the lifetime
-     * of the pool. This could be greater than the max number of connections
-     * configured for the pool if unhealthy connections are replaced with new
-     * healthy ones.
-     */
-    int getCreateCount() {
-        return createCount.get();
+    @Override
+    public void channelReleased(Channel ch) {
     }
 
     /**