Bolt V4.x accepts database name

bigmontz · bigmontz · commit 9e21647ba212 · 2020-09-25T14:56:19.000+02:00
diff --git a/driver/src/test/java/org/neo4j/driver/internal/messaging/v4/BoltProtocolV4Test.java b/driver/src/test/java/org/neo4j/driver/internal/messaging/v4/BoltProtocolV4Test.java
@@ -306,23 +306,19 @@ void databaseNameForAutoCommitTransactions()
     }
 
     @Test
-    @Disabled("Inspect why it's failing")
-    void shouldNotSupportDatabaseNameInBeginTransaction()
+    void shouldSupportDatabaseNameInBeginTransaction()
     {
         CompletionStage<Void> txStage = protocol.beginTransaction( connectionMock( "foo", protocol ), InternalBookmark.empty(), TransactionConfig.empty() );
 
-        ClientException e = assertThrows( ClientException.class, () -> await( txStage ) );
-        assertThat( e.getMessage(), startsWith( "Database name parameter for selecting database is not supported" ) );
+        assertDoesNotThrow( () -> await( txStage ) );
     }
 
     @Test
-    @Disabled("Inspect why it's failing")
     void shouldNotSupportDatabaseNameForAutoCommitTransactions()
     {
-        ClientException e = assertThrows( ClientException.class,
+        assertDoesNotThrow(
                 () -> protocol.runInAutoCommitTransaction( connectionMock( "foo", protocol ),
                         new Query( "RETURN 1" ), BookmarkHolder.NO_OP, TransactionConfig.empty(), true, UNLIMITED_FETCH_SIZE ) );
-        assertThat( e.getMessage(), startsWith( "Database name parameter for selecting database is not supported" ) );
     }
 
     private BoltProtocol createProtocol()
diff --git a/driver/src/test/java/org/neo4j/driver/internal/messaging/v41/BoltProtocolV41Test.java b/driver/src/test/java/org/neo4j/driver/internal/messaging/v41/BoltProtocolV41Test.java
@@ -311,23 +311,19 @@ void databaseNameForAutoCommitTransactions()
     }
 
     @Test
-    @Disabled("Inspect why it's failing")
-    void shouldNotSupportDatabaseNameInBeginTransaction()
+    void shouldSupportDatabaseNameInBeginTransaction()
     {
         CompletionStage<Void> txStage = protocol.beginTransaction( connectionMock( "foo", protocol ), InternalBookmark.empty(), TransactionConfig.empty() );
 
-        ClientException e = assertThrows( ClientException.class, () -> await( txStage ) );
-        assertThat( e.getMessage(), startsWith( "Database name parameter for selecting database is not supported" ) );
+        assertDoesNotThrow( () -> await( txStage ) );
     }
 
     @Test
-    @Disabled("Inspect why it's failing")
     void shouldNotSupportDatabaseNameForAutoCommitTransactions()
     {
-        ClientException e = assertThrows( ClientException.class,
+        assertDoesNotThrow(
                 () -> protocol.runInAutoCommitTransaction( connectionMock( "foo", protocol ),
-                        new Query( "RETURN 1" ), BookmarkHolder.NO_OP, TransactionConfig.empty(), true, UNLIMITED_FETCH_SIZE ) );
-        assertThat( e.getMessage(), startsWith( "Database name parameter for selecting database is not supported" ) );
+                                                           new Query( "RETURN 1" ), BookmarkHolder.NO_OP, TransactionConfig.empty(), true, UNLIMITED_FETCH_SIZE ) );
     }
 
     private Class<? extends MessageFormat> expectedMessageFormatType()
diff --git a/driver/src/test/java/org/neo4j/driver/internal/messaging/v42/BoltProtocolV42Test.java b/driver/src/test/java/org/neo4j/driver/internal/messaging/v42/BoltProtocolV42Test.java
@@ -312,23 +312,19 @@ void databaseNameForAutoCommitTransactions()
     }
 
     @Test
-    @Disabled("Inspect why it's failing")
-    void shouldNotSupportDatabaseNameInBeginTransaction()
+    void shouldSupportDatabaseNameInBeginTransaction()
     {
         CompletionStage<Void> txStage = protocol.beginTransaction( connectionMock( "foo", protocol ), InternalBookmark.empty(), TransactionConfig.empty() );
 
-        ClientException e = assertThrows( ClientException.class, () -> await( txStage ) );
-        assertThat( e.getMessage(), startsWith( "Database name parameter for selecting database is not supported" ) );
+        assertDoesNotThrow( () -> await( txStage ) );
     }
 
     @Test
-    @Disabled("Inspect why it's failing")
     void shouldNotSupportDatabaseNameForAutoCommitTransactions()
     {
-        ClientException e = assertThrows( ClientException.class,
+        assertDoesNotThrow(
                 () -> protocol.runInAutoCommitTransaction( connectionMock( "foo", protocol ),
-                        new Query( "RETURN 1" ), BookmarkHolder.NO_OP, TransactionConfig.empty(), true, UNLIMITED_FETCH_SIZE ) );
-        assertThat( e.getMessage(), startsWith( "Database name parameter for selecting database is not supported" ) );
+                                                           new Query( "RETURN 1" ), BookmarkHolder.NO_OP, TransactionConfig.empty(), true, UNLIMITED_FETCH_SIZE ) );
     }
 
     private Class<? extends MessageFormat> expectedMessageFormatType()

Original file line number	Diff line number	Diff line change
`@@ -306,23 +306,19 @@ void databaseNameForAutoCommitTransactions()`
`306`	`306`	`}`
`307`	`307`
`308`	`308`	`@Test`
`309`		`- @Disabled("Inspect why it's failing")`
`310`		`- void shouldNotSupportDatabaseNameInBeginTransaction()`
	`309`	`+ void shouldSupportDatabaseNameInBeginTransaction()`
`311`	`310`	`{`
`312`	`311`	`CompletionStage<Void> txStage = protocol.beginTransaction( connectionMock( "foo", protocol ), InternalBookmark.empty(), TransactionConfig.empty() );`
`313`	`312`
`314`		`- ClientException e = assertThrows( ClientException.class, () -> await( txStage ) );`
`315`		`- assertThat( e.getMessage(), startsWith( "Database name parameter for selecting database is not supported" ) );`
	`313`	`+ assertDoesNotThrow( () -> await( txStage ) );`
`316`	`314`	`}`
`317`	`315`
`318`	`316`	`@Test`
`319`		`- @Disabled("Inspect why it's failing")`
`320`	`317`	`void shouldNotSupportDatabaseNameForAutoCommitTransactions()`
`321`	`318`	`{`
`322`		`- ClientException e = assertThrows( ClientException.class,`
	`319`	`+ assertDoesNotThrow(`
`323`	`320`	`() -> protocol.runInAutoCommitTransaction( connectionMock( "foo", protocol ),`
`324`	`321`	`new Query( "RETURN 1" ), BookmarkHolder.NO_OP, TransactionConfig.empty(), true, UNLIMITED_FETCH_SIZE ) );`
`325`		`- assertThat( e.getMessage(), startsWith( "Database name parameter for selecting database is not supported" ) );`
`326`	`322`	`}`
`327`	`323`
`328`	`324`	`private BoltProtocol createProtocol()`
Original file line number	Diff line number	Diff line change
`@@ -311,23 +311,19 @@ void databaseNameForAutoCommitTransactions()`
`311`	`311`	`}`
`312`	`312`
`313`	`313`	`@Test`
`314`		`- @Disabled("Inspect why it's failing")`
`315`		`- void shouldNotSupportDatabaseNameInBeginTransaction()`
	`314`	`+ void shouldSupportDatabaseNameInBeginTransaction()`
`316`	`315`	`{`
`317`	`316`	`CompletionStage<Void> txStage = protocol.beginTransaction( connectionMock( "foo", protocol ), InternalBookmark.empty(), TransactionConfig.empty() );`
`318`	`317`
`319`		`- ClientException e = assertThrows( ClientException.class, () -> await( txStage ) );`
`320`		`- assertThat( e.getMessage(), startsWith( "Database name parameter for selecting database is not supported" ) );`
	`318`	`+ assertDoesNotThrow( () -> await( txStage ) );`
`321`	`319`	`}`
`322`	`320`
`323`	`321`	`@Test`
`324`		`- @Disabled("Inspect why it's failing")`
`325`	`322`	`void shouldNotSupportDatabaseNameForAutoCommitTransactions()`
`326`	`323`	`{`
`327`		`- ClientException e = assertThrows( ClientException.class,`
	`324`	`+ assertDoesNotThrow(`
`328`	`325`	`() -> protocol.runInAutoCommitTransaction( connectionMock( "foo", protocol ),`
`329`		`- new Query( "RETURN 1" ), BookmarkHolder.NO_OP, TransactionConfig.empty(), true, UNLIMITED_FETCH_SIZE ) );`
`330`		`- assertThat( e.getMessage(), startsWith( "Database name parameter for selecting database is not supported" ) );`
	`326`	`+ new Query( "RETURN 1" ), BookmarkHolder.NO_OP, TransactionConfig.empty(), true, UNLIMITED_FETCH_SIZE ) );`
`331`	`327`	`}`
`332`	`328`
`333`	`329`	`private Class<? extends MessageFormat> expectedMessageFormatType()`
Original file line number	Diff line number	Diff line change
`@@ -312,23 +312,19 @@ void databaseNameForAutoCommitTransactions()`
`312`	`312`	`}`
`313`	`313`
`314`	`314`	`@Test`
`315`		`- @Disabled("Inspect why it's failing")`
`316`		`- void shouldNotSupportDatabaseNameInBeginTransaction()`
	`315`	`+ void shouldSupportDatabaseNameInBeginTransaction()`
`317`	`316`	`{`
`318`	`317`	`CompletionStage<Void> txStage = protocol.beginTransaction( connectionMock( "foo", protocol ), InternalBookmark.empty(), TransactionConfig.empty() );`
`319`	`318`
`320`		`- ClientException e = assertThrows( ClientException.class, () -> await( txStage ) );`
`321`		`- assertThat( e.getMessage(), startsWith( "Database name parameter for selecting database is not supported" ) );`
	`319`	`+ assertDoesNotThrow( () -> await( txStage ) );`
`322`	`320`	`}`
`323`	`321`
`324`	`322`	`@Test`
`325`		`- @Disabled("Inspect why it's failing")`
`326`	`323`	`void shouldNotSupportDatabaseNameForAutoCommitTransactions()`
`327`	`324`	`{`
`328`		`- ClientException e = assertThrows( ClientException.class,`
	`325`	`+ assertDoesNotThrow(`
`329`	`326`	`() -> protocol.runInAutoCommitTransaction( connectionMock( "foo", protocol ),`
`330`		`- new Query( "RETURN 1" ), BookmarkHolder.NO_OP, TransactionConfig.empty(), true, UNLIMITED_FETCH_SIZE ) );`
`331`		`- assertThat( e.getMessage(), startsWith( "Database name parameter for selecting database is not supported" ) );`
	`327`	`+ new Query( "RETURN 1" ), BookmarkHolder.NO_OP, TransactionConfig.empty(), true, UNLIMITED_FETCH_SIZE ) );`
`332`	`328`	`}`
`333`	`329`
`334`	`330`	`private Class<? extends MessageFormat> expectedMessageFormatType()`