Skip to content

refactor DROP TABLE and DROP PROCEDURE calls in test code #222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
v-nisidh merged 3 commits into from
Mar 31, 2017
Merged

refactor DROP TABLE and DROP PROCEDURE calls in test code #222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
574eee9
refactor DROP TABLE and DROP PROCEDURE calls in test code
gordthompson Mar 25, 2017
ddd3012
related tweak to NamedParamMultiPartTest.java
gordthompson Mar 25, 2017
d673438
fix to dropObjectIfExists
gordthompson Mar 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/test/java/com/microsoft/sqlserver/jdbc/connection/TimeoutTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import com.microsoft.sqlserver.jdbc.SQLServerConnection;
import com.microsoft.sqlserver.jdbc.SQLServerException;
import com.microsoft.sqlserver.testframework.AbstractTest;
import com.microsoft.sqlserver.testframework.Utils;
import com.microsoft.sqlserver.testframework.util.RandomUtil;

@RunWith(JUnitPlatform.class)
Expand Down Expand Up @@ -129,9 +130,7 @@ public void testSocketTimeout() throws Exception {
}

private void dropWaitForDelayProcedure(SQLServerConnection conn) throws SQLException {
String sql = " IF EXISTS (select * from sysobjects where id = object_id(N'" + waitForDelaySPName
+ "') and OBJECTPROPERTY(id, N'IsProcedure') = 1)" + " DROP PROCEDURE " + waitForDelaySPName;
conn.createStatement().execute(sql);
Utils.dropProcedureIfExists(waitForDelaySPName, conn.createStatement());
}

private void createWaitForDelayPreocedure(SQLServerConnection conn) throws SQLException {
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/com/microsoft/sqlserver/jdbc/parametermetadata/ParameterMetaDataTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@

import com.microsoft.sqlserver.jdbc.SQLServerException;
import com.microsoft.sqlserver.testframework.AbstractTest;
import com.microsoft.sqlserver.testframework.Utils;
import com.microsoft.sqlserver.testframework.util.RandomUtil;

@RunWith(JUnitPlatform.class)
Expand All @@ -49,8 +50,7 @@ public void testParameterMetaDataWrapper() throws SQLException {
assertSame(parameterMetaData, parameterMetaData.unwrap(ParameterMetaData.class));
}
} finally {
stmt.executeUpdate("IF EXISTS (select * from sysobjects where id = object_id(N'" + tableName + "') and OBJECTPROPERTY(id, N'IsTable') = 1)"
+ " DROP TABLE " + tableName);
Utils.dropTableIfExists(tableName, stmt);
}

}
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/com/microsoft/sqlserver/jdbc/resultset/ResultSetTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@

import com.microsoft.sqlserver.jdbc.ISQLServerResultSet;
import com.microsoft.sqlserver.testframework.AbstractTest;
import com.microsoft.sqlserver.testframework.Utils;
import com.microsoft.sqlserver.testframework.util.RandomUtil;

@RunWith(JUnitPlatform.class)
Expand Down Expand Up @@ -97,8 +98,7 @@ public void testResultSetWrapper() throws SQLException {
assertSame(rs, rs.unwrap(ResultSet.class));
assertSame(rs, rs.unwrap(ISQLServerResultSet.class));
} finally {
stmt.executeUpdate("IF EXISTS (select * from sysobjects where id = object_id(N'" + tableName + "') and OBJECTPROPERTY(id, N'IsTable') = 1)"
+ " DROP TABLE " + tableName);
Utils.dropTableIfExists(tableName, stmt);
}
}
}
Expand Down
7 changes: 2 additions & 5 deletions src/test/java/com/microsoft/sqlserver/jdbc/unit/statement/NamedParamMultiPartTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,19 @@

import java.sql.CallableStatement;
import java.sql.Connection;
import java.sql.DatabaseMetaData;
import java.sql.Driver;
import java.sql.DriverManager;
import java.sql.SQLException;
import java.sql.Statement;
import java.sql.Types;

import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.junit.platform.runner.JUnitPlatform;
import org.junit.runner.RunWith;

import com.microsoft.sqlserver.testframework.AbstractTest;
import com.microsoft.sqlserver.testframework.Utils;

/**
* Multipart parameters
Expand All @@ -46,8 +44,7 @@ public class NamedParamMultiPartTest extends AbstractTest {
public static void beforeAll() throws SQLException {
connection = DriverManager.getConnection(connectionString);
Statement statement = connection.createStatement();
statement.executeUpdate(
"if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[mystoredproc]') and OBJECTPROPERTY(id, N'IsProcedure') = 1) DROP PROCEDURE [mystoredproc]");
Utils.dropProcedureIfExists("mystoredproc", statement);
statement.executeUpdate("CREATE PROCEDURE [mystoredproc] (@p_out varchar(255) OUTPUT) AS set @p_out = '" + dataPut + "'");
statement.close();
}
Expand Down
8 changes: 3 additions & 5 deletions src/test/java/com/microsoft/sqlserver/jdbc/unit/statement/RegressionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import com.microsoft.sqlserver.jdbc.SQLServerConnection;
import com.microsoft.sqlserver.testframework.AbstractTest;
import com.microsoft.sqlserver.testframework.DBConnection;
import com.microsoft.sqlserver.testframework.Utils;

@RunWith(JUnitPlatform.class)
public class RegressionTest extends AbstractTest {
Expand Down Expand Up @@ -126,11 +127,8 @@ public void testSelectIntoUpdateCount() throws SQLException {
public static void terminate() throws SQLException {
SQLServerConnection con = (SQLServerConnection) DriverManager.getConnection(connectionString);
Statement stmt = con.createStatement();
stmt.executeUpdate("IF EXISTS (select * from sysobjects where id = object_id(N'" + tableName + "') and OBJECTPROPERTY(id, N'IsTable') = 1)"
+ " DROP TABLE " + tableName);
stmt.executeUpdate("IF EXISTS (select * from sysobjects where id = object_id(N'" + procName + "') and OBJECTPROPERTY(id, N'IsProcedure') = 1)"
+ " DROP PROCEDURE " + procName);

Utils.dropTableIfExists(tableName, stmt);
Utils.dropProcedureIfExists(procName, stmt);
}

}
Loading