avoid running the same same test twice when using -t option in runtes…

…ts.sh avoid running the same same test twice when using -t option in runtests.sh.
forcedotcom · Sep 24, 2024 · 79f6a19 · 79f6a19
1 parent 3669c9c
commit 79f6a19
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -24,6 +24,7 @@
     <test.encryptionFile></test.encryptionFile>
     <test.redirect>false</test.redirect>
     <test.testfiles.directory>${project.build.testOutputDirectory}/testfiles</test.testfiles.directory>
+    <skip-unit-tests>false</skip-unit-tests>
   </properties>
 
   <repositories>
@@ -524,10 +525,17 @@
             <id>unit-tests</id>
             <phase>package</phase>
             <configuration>
-              <skipTests>false</skipTests>
+              <skipTests>${skip-unit-tests}</skipTests>
               <excludes>
                 <!-- skip integration tests -->
-                <exclude>**/client/**, **/dyna/SObjectReferenceConverterTest.*, **/integration/**, **/mapping/LoadMapperTest.*, **/mapping/SOQLMapperTest.*, **/process/** </exclude>
+                <exclude>
+                    **/client/**,
+                    **/dyna/SObjectReferenceConverterTest.*, 
+                    **/integration/**, 
+                    **/mapping/LoadMapperTest.*, 
+                    **/mapping/SOQLMapperTest.*, 
+                    **/process/** 
+                </exclude>
               </excludes>
             </configuration>
             <goals>
@@ -538,10 +546,16 @@
             <id>integration-tests</id>
             <phase>verify</phase>
             <configuration>
-              <skipTests>false</skipTests>
+              <skipTests>!${skip-unit-tests}</skipTests>
               <excludes>
                 <exclude>
-                  <!-- Specify the list of integration tests to exclude -->
+                    **/action/**, 
+                    **/dao/**, 
+                    **/dyna/BooleanConverterTest.*,
+                    **/dyna/DateConverterTest.*,
+                    **/EncryptionUtil/**,
+                    **/mapping/SOQLMapperTest.*,
+                    **/util/**
                 </exclude>
               </excludes>
             </configuration>

diff --git a/rundl.sh b/rundl.sh
@@ -8,7 +8,7 @@ while getopts ":dbe:v:" flag
 do
   case "${flag}" in
     d)
-      debug="-Xdebug -Xrunjdwp:server=y,transport=dt_socket,address=5005,suspend=y"
+      debug="-Xdebug -Xrunjdwp:server=y,transport=dt_socket,address=0.0.0.0:5005,suspend=y"
       ;;
     b)
       batchmodeargs="./.. upsertAccounts run.mode=batch"

diff --git a/runtests.sh b/runtests.sh
@@ -32,11 +32,11 @@ do
       ;;
     d)
       debug="-Dmaven.surefire.debug"
-      debugEncryption="-Xdebug -Xrunjdwp:server=y,transport=dt_socket,address=5005,suspend=y"
+      debugEncryption="-Xdebug -Xrunjdwp:server=y,transport=dt_socket,address=0.0.0.0:5005,suspend=y"
 
       ;;
     t)
-      test="-Dtest=com.salesforce.dataloader.${OPTARG}"
+      test="-Dskip-unit-tests=true -Dtest=com.salesforce.dataloader.${OPTARG}"
       ;;
     f)
       encryptionFile="${OPTARG}"