Skip to content

Commit 5cb64bc

Browse files
committed
modified unit test
1 parent 77ebbfa commit 5cb64bc

File tree

2 files changed

+6
-15
lines changed

2 files changed

+6
-15
lines changed

src/main/java/com/google/cloud/spanner/jdbc/JdbcDriver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ private String appendPropertiesToUrl(String url, Properties info) {
271271

272272
@Override
273273
public boolean acceptsURL(String url) {
274-
return URL_PATTERN.matcher(url).matches();
274+
return URL_PATTERN.matcher(url).matches() || EXTERNAL_HOST_URL_PATTERN.matcher(url).matches();
275275
}
276276

277277
@Override

src/test/java/com/google/cloud/spanner/jdbc/JdbcDriverTest.java

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
import java.util.Objects;
5151
import java.util.Properties;
5252
import java.util.regex.Matcher;
53-
import java.util.regex.Pattern;
5453
import org.junit.AfterClass;
5554
import org.junit.BeforeClass;
5655
import org.junit.Test;
@@ -230,37 +229,29 @@ public void testAcceptsURL() throws SQLException {
230229

231230
@Test
232231
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;
236232
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");
239234
assertTrue(matcherWithoutInstance.matches());
240235
assertEquals("test-db", matcherWithoutInstance.group("DATABASEGROUP"));
241236
Matcher matcherWithProperty =
242237
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");
246239
assertTrue(matcherWithProperty.matches());
247240
assertEquals("default", matcherWithProperty.group("INSTANCEGROUP"));
248241
assertEquals("singers-db", matcherWithProperty.group("DATABASEGROUP"));
249242
Matcher matcherWithoutPort =
250243
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");
252245
assertTrue(matcherWithoutPort.matches());
253246
assertEquals("default", matcherWithoutPort.group("INSTANCEGROUP"));
254247
assertEquals("test-db", matcherWithoutPort.group("DATABASEGROUP"));
255248
Matcher matcherWithProject =
256249
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");
260251
assertFalse(matcherWithProject.matches());
261252
Matcher matcherWithoutHost =
262253
EXTERNAL_HOST_URL_PATTERN.matcher(
263-
String.format("jdbc:%s:/instances/default/databases/singers-db", prefix));
254+
"jdbc:cloudspanner:/instances/default/databases/singers-db");
264255
assertFalse(matcherWithoutHost.matches());
265256
}
266257
}

0 commit comments

Comments
 (0)