fix cluster test

neo4j · Dec 15, 2022 · cff9027 · cff9027
1 parent 32a4b30
commit cff9027
Showing 1 changed file with 5 additions and 28 deletions.
diff --git a/core/src/test/java/apoc/trigger/TriggerClusterRoutingTest.java b/core/src/test/java/apoc/trigger/TriggerClusterRoutingTest.java
@@ -44,10 +44,6 @@ public static void bringDownCluster() {
             cluster.close();
         }
     }
-
-    // TODO: making sure that a session against "system" can install triggers
-
-    // TODO: making sure that a session against "system" can drop triggers
 
     // TODO: fabric tests
 
@@ -80,38 +76,19 @@ private static void triggerInSysWriterMemberCommon(String query, String triggerN
         assertEquals(4, members.size());
         int errorCounter = 0;
         for (Neo4jContainerExtension container: members) {
-            // we skip READ_REPLICA members
-            final String readReplica = TestcontainersCausalCluster.ClusterInstanceType.READ_REPLICA.toString();
             final Driver driver = container.getDriver();
-            if (readReplica.equals(container.getEnvMap().get("NEO4J_dbms_mode")) || driver == null) {
-                continue;
-            }
             Session session = driver.session(SessionConfig.forDatabase(dbName));
-            final String address = container.getEnvMap().get("NEO4J_dbms_connector_bolt_advertised__address");
             final String name = UUID.randomUUID().toString();
-            if (dbName.equals(SYSTEM_DATABASE_NAME) && dbIsWriter(session, dbName, address)) {
+            try {
                 testCall( session, query,
                         Map.of("name", name),
                         row -> assertEquals(name, row.get("name")) );
-            } else {
-                try {
-                    testCall( session, query,
-                            Map.of("name", name),
-                            row -> assertEquals(name, row.get("name")) );
-                } catch (Exception e) {
-                    errorCounter++;
-                    String errorMsg = e.getMessage();
-                    assertTrue("The actual message is: " + errorMsg, errorMsg.contains(triggerNotRoutedError));
-                }
+            } catch (Exception e) {
+                errorCounter++;
+                String errorMsg = e.getMessage();
+                assertTrue("The actual message is: " + errorMsg, errorMsg.contains(triggerNotRoutedError));
             }
         }
         assertEquals(1, errorCounter);
     }
-
-    private static boolean dbIsWriter(Session session, String dbName, String address) {
-        return session.run( "SHOW DATABASE $dbName WHERE address = $address", 
-                        Map.of("dbName", dbName, "address", address) )
-                .single().get("writer")
-                .asBoolean();
-    }
 }