Skip to content

Commit 3447893

Browse files
authored
randomize test table name (#2236)
1 parent 3a7daf3 commit 3447893

File tree

1 file changed

+26
-24
lines changed

1 file changed

+26
-24
lines changed

src/test/java/com/microsoft/sqlserver/jdbc/resiliency/ResultSetsWithResiliencyTest.java

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import java.sql.CallableStatement;
1313
import java.sql.Connection;
1414
import java.sql.DriverManager;
15-
import java.sql.PreparedStatement;
1615
import java.sql.ResultSet;
1716
import java.sql.SQLException;
1817
import java.sql.Statement;
@@ -36,19 +35,26 @@
3635
@Tag(Constants.xSQLv11)
3736
@Tag(Constants.xAzureSQLDW)
3837
public class ResultSetsWithResiliencyTest extends AbstractTest {
39-
static String tableName = AbstractSQLGenerator.escapeIdentifier("resilencyTestTable");
38+
static String tableName = AbstractSQLGenerator.escapeIdentifier(RandomUtil.getIdentifier("resiliencyTestTable"));
4039
static int numberOfRows = 10;
4140

42-
private static String callableStatementICROnDoneTestSp = AbstractSQLGenerator.escapeIdentifier(RandomUtil.getIdentifier("CallableStatement_ICROnDoneTest_SP"));
43-
private static String callableStatementICROnDoneErrorTestSp = AbstractSQLGenerator.escapeIdentifier(RandomUtil.getIdentifier("CallableStatement_ICROnDoneErrorTest_SP"));
41+
private static String callableStatementICROnDoneTestSp = AbstractSQLGenerator
42+
.escapeIdentifier(RandomUtil.getIdentifier("CallableStatement_ICROnDoneTest_SP"));
43+
private static String callableStatementICROnDoneErrorTestSp = AbstractSQLGenerator
44+
.escapeIdentifier(RandomUtil.getIdentifier("CallableStatement_ICROnDoneErrorTest_SP"));
4445
private static String createClientCursorInitTableQuery = "create table %s (col1 int, col2 varchar(8000), col3 int identity(1,1))";
4546
private static String createFetchBufferTableQuery = "create table %s (col1 int not null)";
4647
private static String insertIntoFetchBufferTableQuery = "insert into %s (col1) values (%s);";
47-
private static final String clientCursorInitTable1 = AbstractSQLGenerator.escapeIdentifier(RandomUtil.getIdentifier("clientCursorInitTable1"));
48-
private static final String clientCursorInitTable2 = AbstractSQLGenerator.escapeIdentifier(RandomUtil.getIdentifier("clientCursorInitTable2"));
49-
private static final String clientCursorInitTable3 = AbstractSQLGenerator.escapeIdentifier(RandomUtil.getIdentifier("clientCursorInitTable3"));
50-
private static final String fetchBufferTestTable1 = AbstractSQLGenerator.escapeIdentifier(RandomUtil.getIdentifier("fetchBufferTestTable1"));
51-
private static final String fetchBufferTestTable2 = AbstractSQLGenerator.escapeIdentifier(RandomUtil.getIdentifier("fetchBufferTestTable2"));
48+
private static final String clientCursorInitTable1 = AbstractSQLGenerator
49+
.escapeIdentifier(RandomUtil.getIdentifier("clientCursorInitTable1"));
50+
private static final String clientCursorInitTable2 = AbstractSQLGenerator
51+
.escapeIdentifier(RandomUtil.getIdentifier("clientCursorInitTable2"));
52+
private static final String clientCursorInitTable3 = AbstractSQLGenerator
53+
.escapeIdentifier(RandomUtil.getIdentifier("clientCursorInitTable3"));
54+
private static final String fetchBufferTestTable1 = AbstractSQLGenerator
55+
.escapeIdentifier(RandomUtil.getIdentifier("fetchBufferTestTable1"));
56+
private static final String fetchBufferTestTable2 = AbstractSQLGenerator
57+
.escapeIdentifier(RandomUtil.getIdentifier("fetchBufferTestTable2"));
5258
private static final String clientCursorInitTableQuery1 = "select * from " + clientCursorInitTable1;
5359
private static final String clientCursorInitTableQuery2 = "select * from " + clientCursorInitTable2;
5460
private static final String clientCursorInitTableQuery3 = "select * from " + clientCursorInitTable3;
@@ -169,18 +175,17 @@ public void testAdaptiveBufferingWithPartiallyBufferedResultSet() throws SQLExce
169175
public void testResultSetClientCursorInitializerOnDone() throws SQLException {
170176
try (Connection con = ResiliencyUtils.getConnection(connectionString); Statement stmt = con.createStatement()) {
171177

172-
boolean hasResults = stmt.execute(clientCursorInitTableQuery1+ "; " + clientCursorInitTableQuery2);
173-
while(hasResults) {
178+
boolean hasResults = stmt.execute(clientCursorInitTableQuery1 + "; " + clientCursorInitTableQuery2);
179+
while (hasResults) {
174180
ResultSet rs = stmt.getResultSet();
175181
while (rs.next()) {}
176182
hasResults = stmt.getMoreResults();
177183
}
178184

179185
ResiliencyUtils.killConnection(con, connectionString, 1);
180186

181-
try (ResultSet rs = con.createStatement()
182-
.executeQuery(clientCursorInitTableQuery3)) {
183-
while(rs.next()) {}
187+
try (ResultSet rs = con.createStatement().executeQuery(clientCursorInitTableQuery3)) {
188+
while (rs.next()) {}
184189
}
185190
}
186191
}
@@ -191,7 +196,7 @@ public void testResultSetErrorClientCursorInitializerOnDone() throws SQLExceptio
191196

192197
try {
193198
boolean hasResults = stmt.execute(clientCursorInitTableQuery1 + "; " + errorQuery);
194-
while(hasResults) {
199+
while (hasResults) {
195200
ResultSet rs = stmt.getResultSet();
196201
while (rs.next()) {}
197202
hasResults = stmt.getMoreResults();
@@ -205,8 +210,7 @@ public void testResultSetErrorClientCursorInitializerOnDone() throws SQLExceptio
205210

206211
ResiliencyUtils.killConnection(con, connectionString, 1);
207212

208-
try (ResultSet rs = con.createStatement()
209-
.executeQuery(clientCursorInitTableQuery3)) {
213+
try (ResultSet rs = con.createStatement().executeQuery(clientCursorInitTableQuery3)) {
210214
while (rs.next()) {}
211215
}
212216
}
@@ -238,10 +242,8 @@ public void testCallableStatementOnDone() throws SQLException {
238242

239243
@Test
240244
public void testCallableStatementErrorOnDone() throws SQLException {
241-
String errorCallableStmt = "{CALL "
242-
+ callableStatementICROnDoneErrorTestSp + " (?, ?)}";
243-
String validCallableStmt = "{CALL "
244-
+ callableStatementICROnDoneTestSp + " (?, ?)}";
245+
String errorCallableStmt = "{CALL " + callableStatementICROnDoneErrorTestSp + " (?, ?)}";
246+
String validCallableStmt = "{CALL " + callableStatementICROnDoneTestSp + " (?, ?)}";
245247

246248
try (Connection con = ResiliencyUtils.getConnection(connectionString)) {
247249

@@ -286,7 +288,7 @@ public void testResultSetFetchBufferOnDone() throws SQLException {
286288

287289
try (Statement stmt = con.createStatement()) {
288290
boolean hasResults = stmt.execute(fetchBufferTableQuery1 + "; " + fetchBufferTableQuery2);
289-
while(hasResults) {
291+
while (hasResults) {
290292
ResultSet rs = stmt.getResultSet();
291293
while (rs.next()) {}
292294
hasResults = stmt.getMoreResults();
@@ -326,7 +328,7 @@ public void testResultSetErrorFetchBufferOnDone() throws SQLException {
326328

327329
try (Statement stmt = con.createStatement()) {
328330
boolean hasResults = stmt.execute(fetchBufferTableQuery1 + "; " + errorQuery);
329-
while(hasResults) {
331+
while (hasResults) {
330332
ResultSet rs = stmt.getResultSet();
331333
while (rs.next()) {}
332334
hasResults = stmt.getMoreResults();
@@ -386,7 +388,7 @@ public void testMultipleResultSets() throws Exception {
386388
@Test
387389
public void testResultSetWithException() throws Exception {
388390
try (Connection c = ResiliencyUtils.getConnection(connectionString); Statement s = c.createStatement();
389-
ResultSet rs = s.executeQuery("SELECT 1/0")) {
391+
ResultSet rs = s.executeQuery("SELECT 1/0")) {
390392

391393
while (rs.next()) {
392394
ResiliencyUtils.killConnection(c, connectionString, 0);

0 commit comments

Comments
 (0)