Fix broken Connection and Concept BDD scenarios (#227)

## What is the goal of this PR?

Doing a fresh pass over our BDD scenarios exposed a number of assorted issues, which we have now fixed.

## What are the changes implemented in this PR?

- If session fails to close, throw a `GraknClientException`
- Clean databases before running BDD, clean `sessionsParallel` after
- Fix queries not throwing when they should in BDD, by correctly awaiting them
- Make BDD steps always refer to overridden roles by their scoped label

Author: Alex Walker

.grabl/automation.yml

@@ -75,10 +75,9 @@ build:
         bazel run @graknlabs_dependencies//distribution/artifact:create-netrc
         bazel test //test/behaviour/connection/... --test_output=streamed --jobs=1
         bazel test //test/behaviour/concept/... --test_output=streamed
-        bazel test //test/behaviour/graql/language/define/... --test_output=streamed
       # TODO: delete --jobs=1 if we fix the issue with excess memory usage
       # TODO: use --config=rbe once Grakn Core runs in RBE
-      # TODO: revert above tests to //test/behaviour/...
+      # TODO: add Graql Language tests as they are implemented
     deploy-maven-snapshot:
       image: graknlabs-ubuntu-20.04
       dependencies: [build, build-dependency, test-behaviour]

dependencies/graknlabs/repositories.bzl

@@ -58,7 +58,7 @@ def graknlabs_behaviour():
     git_repository(
         name = "graknlabs_behaviour",
         remote = "https://github.com/graknlabs/behaviour",
-        commit = "b4cd87a715af84bb8ebcbc29ec10348780611165", # sync-marker: do not remove this comment, this is used for sync-dependencies by @graknlabs_behaviour
+        commit = "2279d3a284d53fdd989885c06f3c50f00f930a63", # sync-marker: do not remove this comment, this is used for sync-dependencies by @graknlabs_behaviour
     )
 
 def graknlabs_grabl_tracing():

test/behaviour/concept/thing/ThingSteps.java

@@ -50,10 +50,6 @@ public static void put(String variable, Thing thing) {
         things.put(variable, thing);
     }
 
-    public static void remove(String variable) {
-        things.remove(variable);
-    }
-
     @Then("entity/attribute/relation {var} is null: {bool}")
     public void thing_is_null(String var, boolean isNull) {
         if (isNull) assertNull(get(var));

test/behaviour/concept/type/thingtype/ThingTypeSteps.java

@@ -322,13 +322,10 @@ public void thing_type_set_plays_role_throws_exception(RootLabel rootLabel, Stri
         assertThrows(() -> get_thing_type(rootLabel, typeLabel).asRemote(tx()).setPlays(roleType));
     }
 
-    @When("{root_label}\\( ?{type_label} ?) set plays role: {scoped_label} as {type_label}")
-    public void thing_type_set_plays_role_as(RootLabel rootLabel, String typeLabel, Parameters.ScopedLabel roleLabel, String overriddenLabel) {
+    @When("{root_label}\\( ?{type_label} ?) set plays role: {scoped_label} as {scoped_label}")
+    public void thing_type_set_plays_role_as(RootLabel rootLabel, String typeLabel, Parameters.ScopedLabel roleLabel, Parameters.ScopedLabel overriddenLabel) {
         RoleType roleType = tx().concepts().getRelationType(roleLabel.scope()).asRemote(tx()).getRelates(roleLabel.role());
-        Stream<RelationType> relationType = tx().concepts().getRelationType(roleLabel.scope()).asRemote(tx()).getSupertypes()
-                .filter(Type::isRelationType).map(Type::asRelationType);
-        RoleType overriddenType = relationType
-                .flatMap(sup -> sup.asRemote(tx()).getRelates()).filter(r -> r.getLabel().equals(overriddenLabel)).findAny().get();
+        RoleType overriddenType = tx().concepts().getRelationType(overriddenLabel.scope()).asRemote(tx()).getRelates(overriddenLabel.role());
         get_thing_type(rootLabel, typeLabel).asRemote(tx()).setPlays(roleType, overriddenType);
     }
 

test/behaviour/connection/ConnectionSteps.java

@@ -35,7 +35,10 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.stream.Stream;
 
+import static java.util.Objects.isNull;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
@@ -74,14 +77,23 @@ public synchronized void before() {
         String address = GraknSingleton.getGraknRunner().address();
         assertNotNull(address);
         client = new GraknClient(address);
+        client.databases().all().forEach(database -> client.databases().delete(database));
         System.out.println("ConnectionSteps.before");
     }
 
     @After
     public synchronized void after() {
         sessions.parallelStream().forEach(Session::close);
         sessions.clear();
+
+        Stream<CompletableFuture<Void>> closures = sessionsParallel
+                .stream().map(futureSession -> futureSession.thenApplyAsync(session -> {
+                    session.close();
+                    return null;
+                }));
+        CompletableFuture.allOf(closures.toArray(CompletableFuture[]::new)).join();
         sessionsParallel.clear();
+
         sessionsToTransactions.clear();
         sessionsToTransactionsParallel.clear();
         sessionsParallelToTransactionsParallel.clear();

test/behaviour/connection/database/BUILD

@@ -58,6 +58,7 @@ grakn_java_test(
         "//test/behaviour/config:parameters",
         "//test/behaviour/connection/transaction:steps",
         "//test/behaviour/connection/session:steps",
+        "//test/behaviour/graql:steps",
     ],
     data = [
         "@graknlabs_behaviour//connection:database.feature",

test/behaviour/graql/GraqlSteps.java

@@ -75,22 +75,27 @@ public void graql_define_throws(String defineQueryStatements) {
         assertThrows(() -> graql_define(defineQueryStatements).get());
     }
 
+    @Given("graql define; throws exception containing {string}")
+    public void graql_define_throws_exception(String exception, String defineQueryStatements) {
+        assertThrowsWithMessage(() -> graql_define(defineQueryStatements).get(), exception);
+    }
+
     @Given("graql undefine")
     public QueryFuture<Void> graql_undefine(String undefineQueryStatements) {
         final GraqlUndefine graqlQuery = Graql.parseQuery(String.join("\n", undefineQueryStatements));
         return tx().query().undefine(graqlQuery);
     }
 
-    @Given("graql define; throws exception containing {string}")
-    public void graql_define_throws_exception(String exception, String defineQueryStatements) {
-        assertThrowsWithMessage(() -> graql_define(defineQueryStatements), exception);
-    }
-
     @Given("graql undefine; throws exception")
     public void graql_undefine_throws(String undefineQueryStatements) {
         assertThrows(() -> graql_undefine(undefineQueryStatements).get());
     }
 
+    @Given("graql undefine; throws exception containing {string}")
+    public void graql_undefine_throws_exception(String exception, String undefineQueryStatements) {
+        assertThrowsWithMessage(() -> graql_undefine(undefineQueryStatements).get(), exception);
+    }
+
     @Given("graql insert")
     public Stream<ConceptMap> graql_insert(String insertQueryStatements) {
         final GraqlInsert graqlQuery = Graql.parseQuery(String.join("\n", insertQueryStatements));
@@ -104,7 +109,7 @@ public void graql_insert_throws(String insertQueryStatements) {
 
     @Given("graql insert; throws exception containing {string}")
     public void graql_insert_throws_exception(String exception, String insertQueryStatements) {
-        assertThrowsWithMessage(() -> graql_insert(insertQueryStatements), exception);
+        assertThrowsWithMessage(() -> graql_insert(insertQueryStatements).iterator().next(), exception);
     }
 
     @Given("graql delete")
@@ -118,6 +123,11 @@ public void graql_delete_throws(String deleteQueryStatements) {
         assertThrows(() -> graql_delete(deleteQueryStatements).get());
     }
 
+    @Given("graql delete; throws exception containing {string}")
+    public void graql_delete_throws_exception(String exception, String deleteQueryStatements) {
+        assertThrowsWithMessage(() -> graql_delete(deleteQueryStatements).get(), exception);
+    }
+
     @When("get answers of graql insert")
     public void get_answers_of_graql_insert(String graqlQueryStatements) {
         final GraqlInsert graqlQuery = Graql.parseQuery(String.join("\n", graqlQueryStatements));