add tests for basic connector functionality

Added tests for connector API.
Fixed involuntary re-connects issue.

Closes #51

Author: ztarvos

.travis.yml

@@ -12,5 +12,5 @@ before_script:
   - src/test/travis.pre.sh
 
 script:
-  - mvn test
+  - mvn verify
   - sudo cat /var/log/tarantool/jdk-testing.log

pom.xml

@@ -50,6 +50,19 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>2.22.0</version>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <version>2.22.0</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>integration-test</goal>
+                            <goal>verify</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
@@ -66,6 +79,12 @@
             <version>1.9.5</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.yaml</groupId>
+            <artifactId>snakeyaml</artifactId>
+            <version>1.23</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <parent>

src/main/java/org/tarantool/TarantoolClientImpl.java

@@ -63,7 +63,11 @@ public class TarantoolClientImpl extends TarantoolBase<Future<List<?>>> implemen
         @Override
         public void run() {
             while (!Thread.currentThread().isInterrupted()) {
-                reconnect(0, thumbstone);
+                // Since LockSupport.park() can return at any time for no reason,
+                // we need to check if conditions are right to re-connect.
+                if (thumbstone != null) {
+                    reconnect(0, thumbstone);
+                }
                 LockSupport.park();
             }
         }
@@ -103,7 +107,8 @@ public TarantoolClientImpl(SocketChannelProvider socketProvider, TarantoolClient
 
     protected void reconnect(int retry, Throwable lastError) {
         SocketChannel channel;
-        while (!Thread.interrupted()) {
+        // Thread.interrupted() clears the flag, prefer isInterrupted().
+        while (!Thread.currentThread().isInterrupted()) {
             channel = socketProvider.get(retry++, lastError == NOT_INIT_EXCEPTION ? null : lastError);
             try {
                 connect(channel);
@@ -503,7 +508,7 @@ public List exec(Code code, Object... args) {
 
         @Override
         public void close() {
-            throw new IllegalStateException("You should close TarantoolClient to make this");
+            throw new IllegalStateException("You should close TarantoolClient instead.");
         }
     }
 
@@ -525,7 +530,7 @@ public Long exec(Code code, Object... args) {
 
         @Override
         public void close() {
-            throw new IllegalStateException("You should close TarantoolClient to make this");
+            throw new IllegalStateException("You should close TarantoolClient instead.");
         }
     }
 

src/test/instance.lua

@@ -16,7 +16,12 @@ box.once('init', function()
     box.schema.user.create('test_ordin', { password = '2HWRXHfa' })
     box.schema.user.create('test_admin', { password = '4pWBZmLEgkmKK5WP' })
 
-    box.schema.user.grant('test_ordin', 'read,write', 'user')
-    box.schema.user.grant('test_admin', 'execute',    'super')
+    box.schema.user.grant('test_ordin', 'read,write', 'space', 'user')
+    box.schema.user.grant('test_admin', 'super')
 end)
 
+-- Java has no internal support for unix domain sockets,
+-- so we will use tcp for console communication.
+console = require('console')
+console.listen(3313)
+console.start()

src/test/java/org/tarantool/AbstractTarantoolConnectorIT.java

@@ -0,0 +1,254 @@
+package org.tarantool;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+import java.nio.channels.SocketChannel;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * Abstract test. Provides environment control and frequently used functions.
+ */
+public abstract class AbstractTarantoolConnectorIT {
+    protected static final String host = System.getProperty("tntHost", "localhost");
+    protected static final int port = Integer.parseInt(System.getProperty("tntPort", "3301"));
+    protected static final int consolePort = Integer.parseInt(System.getProperty("tntConsolePort", "3313"));
+    protected static final int tntCtlPort = Integer.parseInt(System.getProperty("tntCtlPort", "3000"));
+    protected static final String username = System.getProperty("tntUser", "test_admin");
+    protected static final String password = System.getProperty("tntPass", "4pWBZmLEgkmKK5WP");
+
+    protected static final SocketChannelProvider socketChannelProvider = new TestSocketChannelProvider(host, port);
+
+    protected static final int TIMEOUT = 500;
+    protected static final int RESTART_TIMEOUT = 2000;
+
+    protected static TarantoolConsole console;
+
+    protected static final String SPACE_NAME = "basic_test";
+    protected static final String MULTIPART_SPACE_NAME = "multipart_test";
+
+    protected static int SPACE_ID;
+    protected static int MULTI_PART_SPACE_ID;
+
+    protected static int PK_INDEX_ID;
+    protected static int MPK_INDEX_ID;
+    protected static int VIDX_INDEX_ID;
+
+    private static final String[] setupScript = new String[] {
+        "box.schema.space.create('basic_test', { format = " +
+            "{{name = 'id', type = 'integer'}," +
+            " {name = 'val', type = 'string'} } })",
+
+        "box.space.basic_test:create_index('pk', { type = 'TREE', parts = {'id'} } )",
+        "box.space.basic_test:create_index('vidx', { type = 'TREE', unique = false, parts = {'val'} } )",
+
+        "box.space.basic_test:replace{1, 'one'}",
+        "box.space.basic_test:replace{2, 'two'}",
+        "box.space.basic_test:replace{3, 'three'}",
+
+        "box.schema.space.create('multipart_test', { format = " +
+            "{{name = 'id1', type = 'integer'}," +
+            " {name = 'id2', type = 'string'}," +
+            " {name = 'val1', type = 'string'} } })",
+
+        "box.space.multipart_test:create_index('pk', { type = 'TREE', parts = {'id1', 'id2'} })",
+        "box.space.multipart_test:create_index('vidx', { type = 'TREE', unique = false, parts = {'val1'} })",
+
+        "box.space.multipart_test:replace{1, 'one', 'o n e'}",
+        "box.space.multipart_test:replace{2, 'two', 't w o'}",
+        "box.space.multipart_test:replace{3, 'three', 't h r e e'}",
+
+        "function echo(...) return ... end"
+    };
+
+    private static final String[] cleanScript = new String[] {
+        "box.space.basic_test and box.space.basic_test:drop()",
+        "box.space.multipart_test and box.space.multipart_test:drop()"
+    };
+
+    @BeforeAll
+    public static void setupEnv() {
+        executeLua(cleanScript);
+        executeLua(setupScript);
+
+        console = getConsole();
+
+        SPACE_ID = console.eval("box.space.basic_test.id");
+        PK_INDEX_ID = console.eval("box.space.basic_test.index.pk.id");
+        VIDX_INDEX_ID = console.eval("box.space.basic_test.index.vidx.id");
+
+        MULTI_PART_SPACE_ID = console.eval("box.space.multipart_test.id");
+        MPK_INDEX_ID = console.eval("box.space.multipart_test.index.pk.id");
+    }
+
+    @AfterAll
+    public static void cleanupEnv() {
+        console.close();
+
+        executeLua(cleanScript);
+    }
+
+    private static void executeLua(String[] exprs) {
+        TarantoolConsole conn = getConsole();
+        try {
+            for (String expr : exprs)
+                conn.exec(expr);
+        } finally {
+            conn.close();
+        }
+    }
+
+    protected void checkTupleResult(Object res, List tuple) {
+        assertNotNull(res);
+        assertTrue(List.class.isAssignableFrom(res.getClass()));
+        List list = (List)res;
+        assertEquals(1, list.size());
+        assertNotNull(list.get(0));
+        assertTrue(List.class.isAssignableFrom(list.get(0).getClass()));
+        assertEquals(tuple, list.get(0));
+    }
+
+    protected TarantoolClient getClient() {
+        TarantoolClientConfig config = new TarantoolClientConfig();
+        config.username = username;
+        config.password = password;
+        config.initTimeoutMillis = 1000;
+        config.sharedBufferSize = 128;
+
+        return new TarantoolClientImpl(socketChannelProvider, config);
+    }
+
+    protected static TarantoolConsole getConsole() {
+        return TarantoolConsole.open(host, consolePort);
+    }
+
+    protected static TarantoolConsole getConsole(String instance) {
+        return TarantoolConsole.open(host, tntCtlPort, instance);
+    }
+
+    protected TarantoolConnection getConnection() {
+        Socket socket = new Socket();
+        try {
+            socket.connect(new InetSocketAddress(host, port));
+        } catch (IOException e) {
+            throw new RuntimeException("Test failed due to invalid environment.", e);
+        }
+        try {
+            return new TarantoolConnection(username, password, socket);
+        } catch (Exception e) {
+            try {
+                socket.close();
+            } catch (IOException ignored) {
+                // No-op.
+            }
+            throw new RuntimeException(e);
+        }
+    }
+
+    protected List<?> consoleSelect(String spaceName, Object key) {
+        StringBuilder sb = new StringBuilder("box.space.");
+        sb.append(spaceName);
+        sb.append(":select{");
+        if (List.class.isAssignableFrom(key.getClass())) {
+            List parts = (List)key;
+            for (int i = 0; i < parts.size(); i++) {
+                if (i != 0)
+                    sb.append(", ");
+                Object k = parts.get(i);
+                if (k.getClass().isAssignableFrom(String.class)) {
+                    sb.append('\'');
+                    sb.append(k);
+                    sb.append('\'');
+                } else {
+                    sb.append(k);
+                }
+            }
+        } else {
+            sb.append(key);
+        }
+        sb.append("}");
+        return console.eval(sb.toString());
+    }
+
+    protected void stopTarantool(String instance) {
+        tarantoolControl("stop", instance);
+    }
+
+    protected void startTarantool(String instance) {
+        tarantoolControl("start", instance);
+    }
+
+    /**
+     * Control the given tarantool instance via tarantoolctl utility network endpoint.
+     *
+     * @param command A tarantoolctl utility command.
+     * @param instanceName Name of tarantool instance to control.
+     */
+    private void tarantoolControl(String command, String instanceName) {
+        int timeout = RESTART_TIMEOUT;
+        Socket socket = new Socket();
+        try {
+            socket.connect(new InetSocketAddress(host, tntCtlPort), timeout);
+            socket.setSoTimeout(timeout);
+            OutputStreamWriter writer = new OutputStreamWriter(socket.getOutputStream());
+            writer.write(command + " " + instanceName + "\n");
+            writer.flush();
+            BufferedReader rdr = new BufferedReader(new InputStreamReader(socket.getInputStream()));
+            String line;
+            while ((line = rdr.readLine()) != null)
+                System.out.println(line);
+        } catch (Exception e) {
+            throw new RuntimeException("Test failed due to environment control failure.", e);
+        } finally {
+            try {
+                socket.close();
+            } catch (Exception e) {
+                // No-op.
+            }
+        }
+    }
+
+    /**
+     * Socket channel provider to be used throughout the tests.
+     */
+    public static class TestSocketChannelProvider implements SocketChannelProvider {
+        String host;
+        int port;
+
+        public TestSocketChannelProvider(String host, int port) {
+            this.host = host;
+            this.port = port;
+        }
+
+        @Override
+        public SocketChannel get(int retryNumber, Throwable lastError) {
+            long budget = System.currentTimeMillis() + RESTART_TIMEOUT;
+            while (!Thread.currentThread().isInterrupted()) {
+                try {
+                    return SocketChannel.open(new InetSocketAddress(host, port));
+                } catch (Exception e) {
+                    if (budget < System.currentTimeMillis())
+                        throw new RuntimeException(e);
+                    try {
+                        Thread.sleep(100);
+                    } catch (InterruptedException ex) {
+                        // No-op.
+                        Thread.currentThread().interrupt();
+                    }
+                }
+            }
+            throw new RuntimeException("Test failure due to invalid environment. " +
+                "Timeout connecting to " + host + ":" + port);
+        }
+    }
+}