Test | Fix Gradle exclude tag and DatabaseMetaDataForeignKeyTest (#1424)

microsoft · Sep 10, 2020 · 37be51e · 37be51e
1 parent 44415bd
commit 37be51e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/build.gradle b/build.gradle
@@ -31,7 +31,7 @@ allprojects {
 
 test {
     useJUnitPlatform {
-        excludeTags (hasProperty('excludedGroups') ? excludedGroups : 'xSQLv15','xGradle','reqExternalSetup','NTLM','MSI','clientCertAuth','Fedauth')
+        excludeTags (hasProperty('excludedGroups') ? excludedGroups : 'xSQLv15','xGradle','reqExternalSetup','NTLM','MSI','clientCertAuth','fedAuth')
     }
 }
 
@@ -70,7 +70,7 @@ if(hasProperty('buildProfile') && buildProfile == "jre8") {
 	targetCompatibility = 1.8
 	test {
 		useJUnitPlatform {
-			excludeTags (hasProperty('excludedGroups') ? excludedGroups : 'xSQLv15','xGradle','NTLM','reqExternalSetup','MSI','clientCertAuth','Fedauth','xJDBC42')
+			excludeTags (hasProperty('excludedGroups') ? excludedGroups : 'xSQLv15','xGradle','NTLM','reqExternalSetup','MSI','clientCertAuth','fedAuth','xJDBC42')
 		}
 	}
 }

diff --git a/...st/java/com/microsoft/sqlserver/jdbc/databasemetadata/DatabaseMetaDataForeignKeyTest.java b/...st/java/com/microsoft/sqlserver/jdbc/databasemetadata/DatabaseMetaDataForeignKeyTest.java
@@ -46,6 +46,7 @@ public class DatabaseMetaDataForeignKeyTest extends AbstractTest {
     private static String FKTable1 = RandomUtil.getIdentifier("DatabaseMetaDataForeignKeyTest_FKTable1");
     private static String PKTable2 = RandomUtil.getIdentifier("DatabaseMetaDataForeignKeyTest_PKTable2");
     private static String FKTable2 = RandomUtil.getIdentifier("DatabaseMetaDataForeignKeyTest_FKTable2");
+    private static String fkName = RandomUtil.getIdentifier("fk_DuplicateName");
 
     private static String schema = null;
     private static String anotherSchema = RandomUtil.getIdentifier("anotherSchema");
@@ -89,14 +90,14 @@ public static void setupVariation() throws SQLException {
                     + AbstractSQLGenerator.escapeIdentifier(PKTable2) + " (col int NOT NULL PRIMARY KEY)");
 
             stmt.execute("Create table " + AbstractSQLGenerator.escapeIdentifier(schema) + "."
-                    + AbstractSQLGenerator.escapeIdentifier(FKTable1)
-                    + " (col int, CONSTRAINT fk_DuplicateName FOREIGN KEY ([col]) REFERENCES "
+                    + AbstractSQLGenerator.escapeIdentifier(FKTable1) + " (col int, CONSTRAINT "
+                    + AbstractSQLGenerator.escapeIdentifier(fkName) + " FOREIGN KEY ([col]) REFERENCES "
                     + AbstractSQLGenerator.escapeIdentifier(schema) + "."
                     + AbstractSQLGenerator.escapeIdentifier(PKTable1) + "([col])" + ")");
 
             stmt.execute("Create table " + AbstractSQLGenerator.escapeIdentifier(anotherSchema) + "."
-                    + AbstractSQLGenerator.escapeIdentifier(FKTable2)
-                    + " (col int, CONSTRAINT fk_DuplicateName FOREIGN KEY ([col]) REFERENCES "
+                    + AbstractSQLGenerator.escapeIdentifier(FKTable2) + " (col int, CONSTRAINT "
+                    + AbstractSQLGenerator.escapeIdentifier(fkName) + " FOREIGN KEY ([col]) REFERENCES "
                     + AbstractSQLGenerator.escapeIdentifier(anotherSchema) + "."
                     + AbstractSQLGenerator.escapeIdentifier(PKTable2) + "([col])" + ")");