Test | Fix random test issues with BVT Test (#994)

microsoft · Mar 29, 2019 · 45525dc · 45525dc
1 parent 5b02953
commit 45525dc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/bvt/BvtTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/bvt/BvtTest.java
@@ -286,7 +286,7 @@ public void testCreatepreparedStatement() throws SQLException {
 
         String colName = table1.getEscapedColumnName(7);
         String value = table1.getRowData(7, 0).toString();
-        String query = "SELECT * from " + table1.getEscapedTableName() + " where " + colName + " = ? ";
+        String query = "SELECT * from " + table1.getEscapedTableName() + " where " + colName + " = ? "+ " ORDER BY " + table1.getEscapedColumnName(0);
 
         try (DBConnection conn = new DBConnection(connectionString);
                 DBPreparedStatement pstmt = conn.prepareStatement(query)) {

diff --git a/src/test/java/com/microsoft/sqlserver/testframework/DBResultSet.java b/src/test/java/com/microsoft/sqlserver/testframework/DBResultSet.java
@@ -308,7 +308,7 @@ public void verifydata(int ordinal, Class<?> coercion, Object expectedData, Obje
 
             case java.sql.Types.TIME:
                 String retrievedTime = retrieved.toString();
-                String expectedTime = expectedData.toString().substring(0, retrievedTime.length());
+                String expectedTime = expectedData.toString();
                 assertTrue(expectedTime.equalsIgnoreCase(retrievedTime),
                         "Unexpected time value, expected: " + expectedTime + " ,received: " + retrievedTime);
                 break;

diff --git a/src/test/java/com/microsoft/sqlserver/testframework/sqlType/SqlTime.java b/src/test/java/com/microsoft/sqlserver/testframework/sqlType/SqlTime.java
@@ -46,7 +46,7 @@ public SqlTime() {
     public Object createdata() {
         Time temp = new Time(
                 ThreadLocalRandom.current().nextLong(((Time) minvalue).getTime(), ((Time) maxvalue).getTime()));
-        String timeNano = temp.toString() + "." + generateRandomInt(this.scale);
+        String timeNano = temp.toString();
         return timeNano;
 
         // can pass String rather than converting to loacTime, but leaving it