Fixed CallableStatements test to use defined credentials and some test config changes

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

@@ -186,6 +186,10 @@ static void setAEConnectionString(String serverName, String url, String protocol
             if (enclaveServer.length > 1) {
                 System.out.println("Testing enclave: " + enclaveProperties);
             }
+
+            String password = getConfiguredProperty("enclaveServerPassword");
+            AETestConnectionString = TestUtils.addOrOverrideProperty(AETestConnectionString, Constants.PASSWORD,
+                    password);
         } else {
             AETestConnectionString = connectionString + ";sendTimeAsDateTime=false;columnEncryptionSetting=enabled;";
         }

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

@@ -53,7 +53,13 @@ public class EnclaveTest extends AESetup {
     @ParameterizedTest
     @MethodSource("enclaveParams")
     public void testBasicConnection(String serverName, String url, String protocol) throws Exception {
+	System.out.println("serverName= " + serverName);
+	System.out.println("url= " + url);
+	System.out.println("protocol= " + protocol);
+
+	System.out.println("before: AETestConnectionString= " +AETestConnectionString);
         setAEConnectionString(serverName, url, protocol);
+	System.out.println("after: AETestConnectionString= " +AETestConnectionString);
         EnclavePackageTest.testBasicConnection(AETestConnectionString, protocol);
     }
 

src/test/java/com/microsoft/sqlserver/jdbc/callablestatement/CallableStatementTest.java

@@ -1173,20 +1173,21 @@ public void testFourPartSyntaxCallEscapeSyntax() throws SQLException {
             }
 
             stmt.execute("EXEC sp_addlinkedserver @server='" + linkedServer + "';");
-            stmt.execute("EXEC sp_addlinkedsrvlogin @rmtsrvname=N'" + linkedServer + "', @rmtuser=N'" + remoteUser
-                    + "', @rmtpassword=N'" + remotePassword + "'");
+            stmt.execute("EXEC sp_addlinkedsrvlogin @rmtsrvname=N'" + linkedServer + "', @useself=false"
+                    + ", @rmtuser=N'" + linkedServerUser + "', @rmtpassword=N'" + linkedServerPassword + "'");
             stmt.execute("EXEC sp_serveroption '" + linkedServer + "', 'rpc', true;");
             stmt.execute("EXEC sp_serveroption '" + linkedServer + "', 'rpc out', true;");
         }
 
         SQLServerDataSource ds = new SQLServerDataSource();
         ds.setServerName(linkedServer);
-        ds.setUser(remoteUser);
-        ds.setPassword(remotePassword);
+        ds.setUser(linkedServerUser);
+        ds.setPassword(linkedServerPassword);
         ds.setEncrypt(false);
         ds.setTrustServerCertificate(true);
 
         try (Connection linkedServerConnection = ds.getConnection();
+                // Statement stmt = linkedServerConnection.createStatement()) {
                 Statement stmt = linkedServerConnection.createStatement()) {
             stmt.execute(
                     "create or alter procedure dbo.TestAdd(@Num1 int, @Num2 int, @Result int output) as begin set @Result = @Num1 + @Num2; end;");

src/test/java/com/microsoft/sqlserver/testframework/AbstractTest.java

@@ -63,8 +63,8 @@ public abstract class AbstractTest {
     protected static String[] keyIDs = null;
 
     protected static String linkedServer = null;
-    protected static String remoteUser = null;
-    protected static String remotePassword = null;
+    protected static String linkedServerUser = null;
+    protected static String linkedServerPassword = null;
     protected static String[] enclaveServer = null;
     protected static String[] enclaveAttestationUrl = null;
     protected static String[] enclaveAttestationProtocol = null;
@@ -201,8 +201,8 @@ public static void setup() throws Exception {
         clientKeyPassword = getConfiguredProperty("clientKeyPassword", "");
 
         linkedServer = getConfiguredProperty("linkedServer", null);
-        remoteUser = getConfiguredProperty("remoteUser", null);
-        remotePassword = getConfiguredProperty("remotePassword", null);
+        linkedServerUser = getConfiguredProperty("linkedServerUser", null);
+        linkedServerPassword = getConfiguredProperty("linkedServerPassword", null);
 
         kerberosServer = getConfiguredProperty("kerberosServer", null);
         kerberosServerPort = getConfiguredProperty("kerberosServerPort", null);
@@ -267,7 +267,6 @@ protected static void setupConnectionString() {
         // If these properties are defined then NTLM is desired, modify connection string accordingly
         String domain = getConfiguredProperty("domainNTLM");
         String user = getConfiguredProperty("userNTLM");
-        String password = getConfiguredProperty("passwordNTLM");
 
         if (null != domain) {
             connectionStringNTLM = TestUtils.addOrOverrideProperty(connectionStringNTLM, "domain", domain);
@@ -277,11 +276,7 @@ protected static void setupConnectionString() {
             connectionStringNTLM = TestUtils.addOrOverrideProperty(connectionStringNTLM, "user", user);
         }
 
-        if (null != password) {
-            connectionStringNTLM = TestUtils.addOrOverrideProperty(connectionStringNTLM, "password", password);
-        }
-
-        if (null != user && null != password) {
+        if (null != user) {
             connectionStringNTLM = TestUtils.addOrOverrideProperty(connectionStringNTLM, "authenticationScheme",
                     "NTLM");
             connectionStringNTLM = TestUtils.addOrOverrideProperty(connectionStringNTLM, "integratedSecurity", "true");