remove 8012 ping and check for rest user #1126

Author: ehennum

ml-development-tools/src/test/java/com/marklogic/client/test/dbfunction/DBFunctionTestUtil.java

@@ -37,36 +37,41 @@ private static DatabaseClient makeAdminTestClient() {
       );
    }
    private static DatabaseClient makeRestClientImpl(DatabaseClientFactory.DigestAuthContext auth) {
-      return makeClientImpl(auth, "8012");
+      return makeClientImpl(auth, "8012", false);
    }
    private static DatabaseClient makeTestClientImpl(DatabaseClientFactory.DigestAuthContext auth) {
-      return makeClientImpl(auth, "8016");
+      return makeClientImpl(auth, "8016", true);
    }
-   private static DatabaseClient makeClientImpl(DatabaseClientFactory.DigestAuthContext auth, String defaultPort) {
+   private static DatabaseClient makeClientImpl(
+           DatabaseClientFactory.DigestAuthContext auth, String defaultPort, boolean withCheck
+   ) {
       String host = System.getProperty("TEST_HOST", "localhost");
       int    port = Integer.parseInt(System.getProperty("TEST_PORT", defaultPort));
 
       DatabaseClient db = DatabaseClientFactory.newClient(host, port, auth);
 
-      try {
-         OkHttpClient client = (OkHttpClient) db.getClientImplementation();
+      if (withCheck) {
+         try {
+            OkHttpClient client = (OkHttpClient) db.getClientImplementation();
 // TODO: better alternative to ping for non-REST server
-         Response response = client.newCall(new Request.Builder().url(
-            new HttpUrl.Builder()
-               .scheme("http")
-               .host(host)
-               .port(port)
-               .encodedPath("/")
-               .build()
-            ).build()
+            Response response = client.newCall(new Request.Builder().url(
+                    new HttpUrl.Builder()
+                            .scheme("http")
+                            .host(host)
+                            .port(port)
+                            .encodedPath("/")
+                            .build()
+                    ).build()
             ).execute();
-         int statusCode = response.code();
-         if (statusCode >= 300 && statusCode != 404) {
-            throw new RuntimeException(statusCode+" "+response.message());
+            int statusCode = response.code();
+            if (statusCode >= 300 && statusCode != 404) {
+               throw new RuntimeException(statusCode+" "+response.message());
+            }
+         } catch (IOException e) {
+            throw new RuntimeException(e);
          }
-      } catch (IOException e) {
-         throw new RuntimeException(e);
       }
+
       return db;
    }
    public static URL getResource(String name) {

ml-development-tools/src/test/kotlin/com/marklogic/client/test/dbfunction/fntestconf.kt

@@ -80,14 +80,16 @@ fun setupServer(serializer: ObjectWriter) {
   }
 
   val userName = "rest-reader"
-  createEntity(
-      client, serializer, "users", "user", userName,
-      mapOf<String,Any>(
-        "user-name"        to userName,
-        "password"         to "x",
-        "role"             to listOf<String>(userName)
-        )
-  )
+  if (!existsEntity(client, "users", "user", userName)) {
+    createEntity(
+            client, serializer, "users", "user", userName,
+            mapOf<String,Any>(
+                    "user-name"        to userName,
+                    "password"         to "x",
+                    "role"             to listOf<String>(userName)
+            )
+    )
+  }
 
   createEntity(
       client, serializer, "servers?group-id=Default&server-type=http", "appserver", serverName,
@@ -102,6 +104,18 @@ fun setupServer(serializer: ObjectWriter) {
 
   dbClient.release()
 }
+fun existsEntity(client: OkHttpClient, address: String, name: String, instanceName: String) : Boolean {
+  val response = client.newCall(
+          Request.Builder()
+                  .url("""http://${host}:8002/manage/v2/${address}/${instanceName}""")
+                  .get()
+                  .build()
+  ).execute()
+  val status = response.code()
+  if (status < 400) return true
+  if (status == 404) return false
+  throw RuntimeException("""Could not create ${instanceName} ${name}: ${status}""")
+}
 fun createEntity(client: OkHttpClient, serializer: ObjectWriter, address: String, name: String,
     instanceName: String, instancedef: Map<String,Any>) {
   val response = client.newCall(