exclude AEv2 tests

Author: lilgreenbird

src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/AESetup.java

@@ -218,7 +218,6 @@ public static void setupAETest() throws Exception {
         // reset logging to avoid severe logs due to negative testing
         LogManager.getLogManager().reset();
 
-        try {
         // setup test params and encryption keys on each server
         for (int i = 0; i < enclaveServer.length; i++) {
             String serverName = enclaveServer[i];
@@ -247,10 +246,6 @@ public static void setupAETest() throws Exception {
                 createCEK(AETestConnectionString, cmkWin, cekWin, null);
             }
         }
-        } catch (Exception e) {
-            System.out.println("AESetup exception: "+e.getMessage());
-            e.printStackTrace();
-        }
     }
 
     /**
@@ -1993,7 +1988,6 @@ protected static void dropObject(String connString, String objectType, String ob
     protected void testAlterColumnEncryption(SQLServerStatement stmt, String tableName, String table[][],
             String cekName) throws SQLException {
         try (SQLServerConnection con = PrepUtil.getConnection(AETestConnectionString, AEInfo)) {
-	    System.out.println("testAlterColumnEncryption connected");
             for (int i = 0; i < table.length; i++) {
                 // alter deterministic to randomized
                 String sql = "ALTER TABLE " + tableName + " ALTER COLUMN " + ColumnType.DETERMINISTIC.name()
@@ -2012,9 +2006,6 @@ protected void testAlterColumnEncryption(SQLServerStatement stmt, String tableNa
                     }
                 }
             }
-        } catch (Exception e) {
-		System.out.println("testAlterColumnEncryption exception: " + e.getMessage());
-		System.out.println("AETestConnectionString: " + AETestConnectionString);
-	}
+        }
     }
 }

src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/EnclaveTest.java

@@ -44,6 +44,7 @@
 @Tag(Constants.xAzureSQLDW)
 @Tag(Constants.xAzureSQLDB)
 @Tag(Constants.reqExternalSetup)
+@Tag(Constants.requireSecret)
 public class EnclaveTest extends AESetup {
     /**
      * Tests basic connection.
@@ -348,9 +349,6 @@ public void testChar(String serverName, String url, String protocol) throws Exce
             createTable(CHAR_TABLE_AE, cekJks, charTable);
             populateCharNormalCase(createCharValues(false));
             testAlterColumnEncryption(stmt, CHAR_TABLE_AE, charTable, cekJks);
-        } catch (Exception e) {
-            System.out.println("exception: " + e.getMessage());
-            e.printStackTrace();
         }
     }
 
@@ -368,9 +366,6 @@ public void testCharAkv(String serverName, String url, String protocol) throws E
             createTable(CHAR_TABLE_AE, cekAkv, charTable);
             populateCharNormalCase(createCharValues(false));
             testAlterColumnEncryption(stmt, CHAR_TABLE_AE, charTable, cekAkv);
-        } catch (Exception e) {
-            System.out.println("exception: " + e.getMessage());
-            e.printStackTrace();
         }
     }
 
@@ -414,9 +409,6 @@ public void testAlter(String serverName, String url, String protocol) throws Exc
             pstmt = c.prepareStatement("ALTER TABLE " + CHAR_TABLE_AE
                     + " ALTER COLUMN RandomizedVarchar VARCHAR(20) NULL WITH (ONLINE = ON)");
             pstmt.execute();
-        } catch (Exception e) {
-            System.out.println("exception: " + e.getMessage());
-            e.printStackTrace();
         }
     }
 
@@ -444,9 +436,6 @@ public void testNumericRichQuery(String serverName, String url, String protocol)
                     assertTrue(3 == rs.getInt(3), "rs.getInt(3)=" + rs.getInt(3));
                 }
             }
-        } catch (Exception e) {
-            System.out.println("exception: " + e.getMessage());
-            e.printStackTrace();
         }
     }
 
@@ -475,9 +464,6 @@ public void testStringRichQuery(String serverName, String url, String protocol)
                     assertTrue(rs.getString(3).equalsIgnoreCase("test"), "rs.getString(3)=" + rs.getString(3));
                 }
             }
-        } catch (Exception e) {
-            System.out.println("exception: " + e.getMessage());
-            e.printStackTrace();
         }
     }