Skip to content
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

Junit testing #432

Merged
merged 5 commits into from
Aug 8, 2017
Merged

Junit testing #432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c5f00c5
Junit changes - added CallableStatementTest and PrecisionScaleTest. R…
peterbae Aug 2, 2017
cf9ae2e
Fix timezone issues with testing
peterbae Aug 3, 2017
b0aa7fa
Fix more issues with timezone
peterbae Aug 3, 2017
ddde692
Add javadoc/fix issues
peterbae Aug 8, 2017
3f0baf0
Got rid of all the underscores in method names
peterbae Aug 8, 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
1,682 changes: 1,653 additions & 29 deletions src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/AESetup.java
View file
Open in desktop

Large diffs are not rendered by default.

2,654 changes: 2,654 additions & 0 deletions src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/CallableStatementTest.java
View file
Open in desktop

Large diffs are not rendered by default.

1,774 changes: 231 additions & 1,543 deletions src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/JDBCEncryptionDecryptionTest.java
View file
Open in desktop

Large diffs are not rendered by default.

585 changes: 585 additions & 0 deletions src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/PrecisionScaleTest.java
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/BulkCopyAllTypes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,16 @@ public class BulkCopyAllTypes extends AbstractTest {
* @throws SQLException
*/
@Test
public void testTVP_ResultSet() throws SQLException {
testBulkCopy_ResultSet(false, null, null);
testBulkCopy_ResultSet(true, null, null);
testBulkCopy_ResultSet(false, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
testBulkCopy_ResultSet(false, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_UPDATABLE);
testBulkCopy_ResultSet(false, ResultSet.TYPE_SCROLL_SENSITIVE, ResultSet.CONCUR_READ_ONLY);
testBulkCopy_ResultSet(false, ResultSet.TYPE_SCROLL_SENSITIVE, ResultSet.CONCUR_UPDATABLE);
public void testTVPResultSet() throws SQLException {
testBulkCopyResultSet(false, null, null);
testBulkCopyResultSet(true, null, null);
testBulkCopyResultSet(false, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
testBulkCopyResultSet(false, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_UPDATABLE);
testBulkCopyResultSet(false, ResultSet.TYPE_SCROLL_SENSITIVE, ResultSet.CONCUR_READ_ONLY);
testBulkCopyResultSet(false, ResultSet.TYPE_SCROLL_SENSITIVE, ResultSet.CONCUR_UPDATABLE);
}

private void testBulkCopy_ResultSet(boolean setSelectMethod,
private void testBulkCopyResultSet(boolean setSelectMethod,
Integer resultSetType,
Integer resultSetConcurrency) throws SQLException {
setupVariation();
Expand Down
16 changes: 8 additions & 8 deletions src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/BulkCopyConnectionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public class BulkCopyConnectionTest extends BulkCopyTestSetUp {
*/
@TestFactory
Stream<DynamicTest> generateBulkCopyConstructorTest() {
List<BulkCopyTestWrapper> testData = createTestData_testBulkCopyConstructor();
List<BulkCopyTestWrapper> testData = createTestDatatestBulkCopyConstructor();
// had to avoid using lambdas as we need to test against java7
return testData.stream().map(new Function<BulkCopyTestWrapper, DynamicTest>() {
@Override
Expand All @@ -66,7 +66,7 @@ public void execute() {
*/
@TestFactory
Stream<DynamicTest> generateBulkCopyOptionsTest() {
List<BulkCopyTestWrapper> testData = createTestData_testBulkCopyOption();
List<BulkCopyTestWrapper> testData = createTestDatatestBulkCopyOption();
return testData.stream().map(new Function<BulkCopyTestWrapper, DynamicTest>() {
@Override
public DynamicTest apply(final BulkCopyTestWrapper datum) {
Expand All @@ -85,7 +85,7 @@ public void execute() {
*/
@Test
@DisplayName("BulkCopy:test uninitialized Connection")
void testInvalidConnection_1() {
void testInvalidConnection1() {
assertThrows(SQLServerException.class, new org.junit.jupiter.api.function.Executable() {
@Override
public void execute() throws SQLServerException {
Expand All @@ -100,7 +100,7 @@ public void execute() throws SQLServerException {
*/
@Test
@DisplayName("BulkCopy:test uninitialized SQLServerConnection")
void testInvalidConnection_2() {
void testInvalidConnection2() {
assertThrows(SQLServerException.class, new org.junit.jupiter.api.function.Executable() {
@Override
public void execute() throws SQLServerException {
Expand All @@ -115,7 +115,7 @@ public void execute() throws SQLServerException {
*/
@Test
@DisplayName("BulkCopy:test empty connenction string")
void testInvalidConnection_3() {
void testInvalidConnection3() {
assertThrows(SQLServerException.class, new org.junit.jupiter.api.function.Executable() {
@Override
public void execute() throws SQLServerException {
Expand All @@ -130,7 +130,7 @@ public void execute() throws SQLServerException {
*/
@Test
@DisplayName("BulkCopy:test null connenction string")
void testInvalidConnection_4() {
void testInvalidConnection4() {
assertThrows(SQLServerException.class, new org.junit.jupiter.api.function.Executable() {
@Override
public void execute() throws SQLServerException {
Expand Down Expand Up @@ -159,7 +159,7 @@ void testEmptyBulkCopyOptions() {
*
* @return
*/
List<BulkCopyTestWrapper> createTestData_testBulkCopyConstructor() {
List<BulkCopyTestWrapper> createTestDatatestBulkCopyConstructor() {
String testCaseName = "BulkCopyConstructor ";
List<BulkCopyTestWrapper> testData = new ArrayList<BulkCopyTestWrapper>();
BulkCopyTestWrapper bulkWrapper1 = new BulkCopyTestWrapper(connectionString);
Expand All @@ -180,7 +180,7 @@ List<BulkCopyTestWrapper> createTestData_testBulkCopyConstructor() {
*
* @return
*/
private List<BulkCopyTestWrapper> createTestData_testBulkCopyOption() {
private List<BulkCopyTestWrapper> createTestDatatestBulkCopyOption() {
String testCaseName = "BulkCopyOption ";
List<BulkCopyTestWrapper> testData = new ArrayList<BulkCopyTestWrapper>();

Expand Down
4 changes: 2 additions & 2 deletions src/test/java/com/microsoft/sqlserver/jdbc/bvt/bvtTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ public void testStmtScrollSensitiveUpdatable() throws SQLException {
* @throws SQLException
*/
@Test
public void testStmtSS_ScrollDynamicOptimistic_CC() throws SQLException {
public void testStmtSSScrollDynamicOptimisticCC() throws SQLException {

try {
conn = new DBConnection(connectionString);
Expand All @@ -321,7 +321,7 @@ public void testStmtSS_ScrollDynamicOptimistic_CC() throws SQLException {
* @throws SQLException
*/
@Test
public void testStmtSS_SEVER_CURSOR_FORWARD_ONLY() throws SQLException {
public void testStmtSserverCursorForwardOnly() throws SQLException {

try {
conn = new DBConnection(connectionString);
Expand Down
Loading