|
50 | 50 | import java.util.Objects; |
51 | 51 | import java.util.Properties; |
52 | 52 | import java.util.regex.Matcher; |
53 | | -import java.util.regex.Pattern; |
54 | 53 | import org.junit.AfterClass; |
55 | 54 | import org.junit.BeforeClass; |
56 | 55 | import org.junit.Test; |
@@ -230,37 +229,29 @@ public void testAcceptsURL() throws SQLException { |
230 | 229 |
|
231 | 230 | @Test |
232 | 231 | public void testJdbcExternalHostFormat() { |
233 | | - Matcher matcher = |
234 | | - Pattern.compile("jdbc:\\(\\?:([a-z]+):.*").matcher(EXTERNAL_HOST_URL_PATTERN.pattern()); |
235 | | - String prefix = matcher.matches() ? matcher.group(1) : null; |
236 | 232 | Matcher matcherWithoutInstance = |
237 | | - EXTERNAL_HOST_URL_PATTERN.matcher( |
238 | | - String.format("jdbc:%s://localhost:15000/databases/test-db", prefix)); |
| 233 | + EXTERNAL_HOST_URL_PATTERN.matcher("jdbc:cloudspanner://localhost:15000/databases/test-db"); |
239 | 234 | assertTrue(matcherWithoutInstance.matches()); |
240 | 235 | assertEquals("test-db", matcherWithoutInstance.group("DATABASEGROUP")); |
241 | 236 | Matcher matcherWithProperty = |
242 | 237 | EXTERNAL_HOST_URL_PATTERN.matcher( |
243 | | - String.format( |
244 | | - "jdbc:%s://localhost:15000/instances/default/databases/singers-db?usePlainText=true", |
245 | | - prefix)); |
| 238 | + "jdbc:cloudspanner://localhost:15000/instances/default/databases/singers-db?usePlainText=true"); |
246 | 239 | assertTrue(matcherWithProperty.matches()); |
247 | 240 | assertEquals("default", matcherWithProperty.group("INSTANCEGROUP")); |
248 | 241 | assertEquals("singers-db", matcherWithProperty.group("DATABASEGROUP")); |
249 | 242 | Matcher matcherWithoutPort = |
250 | 243 | EXTERNAL_HOST_URL_PATTERN.matcher( |
251 | | - String.format("jdbc:%s://localhost/instances/default/databases/test-db", prefix)); |
| 244 | + "jdbc:cloudspanner://localhost/instances/default/databases/test-db"); |
252 | 245 | assertTrue(matcherWithoutPort.matches()); |
253 | 246 | assertEquals("default", matcherWithoutPort.group("INSTANCEGROUP")); |
254 | 247 | assertEquals("test-db", matcherWithoutPort.group("DATABASEGROUP")); |
255 | 248 | Matcher matcherWithProject = |
256 | 249 | EXTERNAL_HOST_URL_PATTERN.matcher( |
257 | | - String.format( |
258 | | - "jdbc:%s://localhost:15000/projects/default/instances/default/databases/singers-db", |
259 | | - prefix)); |
| 250 | + "jdbc:cloudspanner://localhost:15000/projects/default/instances/default/databases/singers-db"); |
260 | 251 | assertFalse(matcherWithProject.matches()); |
261 | 252 | Matcher matcherWithoutHost = |
262 | 253 | EXTERNAL_HOST_URL_PATTERN.matcher( |
263 | | - String.format("jdbc:%s:/instances/default/databases/singers-db", prefix)); |
| 254 | + "jdbc:cloudspanner:/instances/default/databases/singers-db"); |
264 | 255 | assertFalse(matcherWithoutHost.matches()); |
265 | 256 | } |
266 | 257 | } |
0 commit comments