diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..e0f434f3 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,15 @@ +language: java + +sudo: required +dist: trusty + +jdk: + - oraclejdk10 + - openjdk10 + +before_script: + - src/test/travis.pre.sh + +script: + - mvn test + - sudo cat /var/log/tarantool/jdk-testing.log diff --git a/pom.xml b/pom.xml index b878af75..fcabe720 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,8 @@ 1.8.jdbc-SNAPSHOT jar - UTF-8 + UTF-8 + 5.3.0 Tarantool Connector for Java https://github.com/tarantool/tarantool-java @@ -24,6 +25,7 @@ scm:git:git://github.com/tarantool/tarantool-java.git scm:git:git@github.com:tarantool/tarantool-java.git + Dmitry Grytsovets @@ -32,6 +34,7 @@ http://tarantool.org/ + @@ -43,8 +46,13 @@ 1.6 + + maven-surefire-plugin + 2.22.0 + + junit @@ -52,6 +60,30 @@ 4.12 test + + org.junit.jupiter + junit-jupiter-api + ${junit.jupiter.version} + test + + + org.junit.jupiter + junit-jupiter-engine + ${junit.jupiter.version} + test + + + org.junit.vintage + junit-vintage-engine + ${junit.jupiter.version} + test + + + org.mockito + mockito-all + 1.9.5 + test + diff --git a/src/test/instance.lua b/src/test/instance.lua new file mode 100644 index 00000000..fe8a80bc --- /dev/null +++ b/src/test/instance.lua @@ -0,0 +1,22 @@ +time = require('clock').time + +box.cfg { + listen = '0.0.0.0:3301', +} + +box.once('init', function() + local sp = box.schema.space.create('user', { format = { + { name = 'id', type = 'integer' }, + { name = 'name', type = 'string' }, + { name = 'privs', type = 'any' }, + { name = 'value', type = 'integer' }, + } }) + sp:create_index('primary', { sequence = true, parts = { 'id' } }) + + 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') +end) + diff --git a/src/test/travis.pre.sh b/src/test/travis.pre.sh new file mode 100755 index 00000000..86ecdd3b --- /dev/null +++ b/src/test/travis.pre.sh @@ -0,0 +1,19 @@ +#!/bin/bash + +set -e + +curl http://download.tarantool.org/tarantool/1.9/gpgkey | sudo apt-key add - +release=`lsb_release -c -s` + +sudo rm -f /etc/apt/sources.list.d/*tarantool*.list +sudo tee /etc/apt/sources.list.d/tarantool_1.9.list <<- EOF +deb http://download.tarantool.org/tarantool/1.9/ubuntu/ $release main +deb-src http://download.tarantool.org/tarantool/1.9/ubuntu/ $release main +EOF + +sudo apt-get update +sudo apt-get -y install tarantool tarantool-common + +sudo cp src/test/instance.lua /etc/tarantool/instances.enabled/jdk-testing.lua +sudo tarantoolctl stop example +sudo tarantoolctl start jdk-testing