[Communication]: Remove unused code in pom and test files (#21654)

* Remove unused code in pom and test files * Restore unintended change * Revert a test file change * Restore tests.yml * Remove unused env variable in tests.yml * Remove tests.yml * Keep skipping SMS tests in INT * Try to skip jacoco in INT * try different syntax * Try use string as much as we can * Try escape quotes * Try use a variable inside loop * Fix a typo * Move variable to a different place * Try Macro syntax * Remove variable, use stage name instead * Fix syntax * Try a different syntax * Try something simple * Move variables to the right place * Flip logic * Renamve variable * Give up on customizing jacoco.skip * Try to use variable to skp jacoco * Try different syntax * Move variable declaration * Try to set variable * Try PreSteps * Remove local variable * Remove unnecessary overwrite * Remove quotes Co-authored-by: JP Chen <[email protected]>
Azure · Jun 1, 2021 · ebe9c6d · ebe9c6d
1 parent 8cc107c
commit ebe9c6d
Show file tree

Hide file tree

Showing 19 changed files with 5 additions and 352 deletions.
diff --git a/sdk/communication/azure-communication-chat/pom.xml b/sdk/communication/azure-communication-chat/pom.xml
@@ -170,47 +170,5 @@
         </plugins>
       </build>
     </profile>
-    <profile>
-      <id>disable-coverage-if-identity</id>
-      <activation>
-        <property>
-          <name>env.TEST_PACKAGES_ENABLED</name>
-          <value>identity</value>
-        </property>
-      </activation>
-      <properties>
-        <src.dir>src/main</src.dir>
-        <test.dir>src/test</test.dir>
-        <jacoco.skip.coverage.check>true</jacoco.skip.coverage.check>
-      </properties>
-    </profile>
-     <profile>
-      <id>disable-coverage-if-phonenumbers</id>
-      <activation>
-        <property>
-          <name>env.TEST_PACKAGES_ENABLED</name>
-          <value>phonenumbers</value>
-        </property>
-      </activation>
-      <properties>
-        <src.dir>src/main</src.dir>
-        <test.dir>src/test</test.dir>
-        <jacoco.skip.coverage.check>true</jacoco.skip.coverage.check>
-      </properties>
-    </profile>
-    <profile>
-      <id>disable-coverage-if-sms</id>
-      <activation>
-        <property>
-          <name>env.TEST_PACKAGES_ENABLED</name>
-          <value>sms</value>
-        </property>
-      </activation>
-      <properties>
-        <src.dir>src/main</src.dir>
-        <test.dir>src/test</test.dir>
-        <jacoco.skip.coverage.check>true</jacoco.skip.coverage.check>
-      </properties>
-    </profile>
   </profiles>
 </project>
diff --git a/...re-communication-chat/src/test/java/com/azure/communication/chat/ChatAsyncClientTest.java b/...re-communication-chat/src/test/java/com/azure/communication/chat/ChatAsyncClientTest.java
@@ -30,7 +30,6 @@
 import java.util.UUID;
 
 import static org.junit.jupiter.api.Assertions.*;
-import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 /**
  * Set the AZURE_TEST_MODE environment variable to either PLAYBACK or RECORD to determine if tests are playback or
@@ -46,12 +45,6 @@ public class ChatAsyncClientTest extends ChatClientTestBase {
     private CommunicationUserIdentifier firstThreadMember;
     private CommunicationUserIdentifier secondThreadMember;
 
-    @Override
-    protected void beforeTest() {
-        super.beforeTest();
-        assumeTrue(shouldEnableChatTests());
-    }
-
     @Override
     protected void afterTest() {
         super.afterTest();

diff --git a/...n/azure-communication-chat/src/test/java/com/azure/communication/chat/ChatClientTest.java b/...n/azure-communication-chat/src/test/java/com/azure/communication/chat/ChatClientTest.java
@@ -6,7 +6,6 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -40,12 +39,6 @@ public class ChatClientTest extends ChatClientTestBase {
     private CommunicationUserIdentifier firstThreadMember;
     private CommunicationUserIdentifier secondThreadMember;
 
-    @Override
-    protected void beforeTest() {
-        super.beforeTest();
-        assumeTrue(shouldEnableChatTests());
-    }
-
     @Override
     protected void afterTest() {
         super.afterTest();

diff --git a/...ure-communication-chat/src/test/java/com/azure/communication/chat/ChatClientTestBase.java b/...ure-communication-chat/src/test/java/com/azure/communication/chat/ChatClientTestBase.java
@@ -46,9 +46,6 @@ public class ChatClientTestBase extends TestBase {
     protected static final String ACCESS_KEY = Configuration.getGlobalConfiguration()
         .get("COMMUNICATION_SERVICE_ACCESS_KEY", "pw==");
 
-    private static final String TEST_PACKAGES_ENABLED = Configuration.getGlobalConfiguration()
-        .get("TEST_PACKAGES_ENABLED", "all");
-
     private static final StringJoiner JSON_PROPERTIES_TO_REDACT
         = new StringJoiner("\":\"|\"", "\"", "\":\"")
         .add("token");
@@ -215,10 +212,6 @@ protected ChatClientBuilder addLoggingPolicyForIdentityClientBuilder(ChatClientB
         return builder.addPolicy(new CommunicationLoggerPolicy(testName));
     }
 
-    protected boolean shouldEnableChatTests() {
-        return TEST_PACKAGES_ENABLED.matches("(all|chat)");
-    }
-
     private String redact(String content, Matcher matcher, String replacement) {
         while (matcher.find()) {
             String captureGroup = matcher.group(1);

diff --git a/...munication-chat/src/test/java/com/azure/communication/chat/ChatThreadAsyncClientTest.java b/...munication-chat/src/test/java/com/azure/communication/chat/ChatThreadAsyncClientTest.java
@@ -6,7 +6,6 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 import com.azure.communication.chat.implementation.models.CommunicationErrorResponseException;
 import com.azure.core.exception.HttpResponseException;
@@ -58,12 +57,6 @@ public class ChatThreadAsyncClientTest extends ChatClientTestBase {
     private CommunicationUserIdentifier firstAddedParticipant;
     private CommunicationUserIdentifier secondAddedParticipant;
 
-    @Override
-    protected void beforeTest() {
-        super.beforeTest();
-        assumeTrue(shouldEnableChatTests());
-    }
-
     @Override
     protected void afterTest() {
         super.afterTest();

diff --git a/...e-communication-chat/src/test/java/com/azure/communication/chat/ChatThreadClientTest.java b/...e-communication-chat/src/test/java/com/azure/communication/chat/ChatThreadClientTest.java
@@ -6,7 +6,6 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assumptions.assumeTrue;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import com.azure.core.exception.HttpResponseException;
@@ -54,12 +53,6 @@ public class ChatThreadClientTest extends ChatClientTestBase {
     private CommunicationUserIdentifier firstAddedParticipant;
     private CommunicationUserIdentifier secondAddedParticipant;
 
-    @Override
-    protected void beforeTest() {
-        super.beforeTest();
-        assumeTrue(shouldEnableChatTests());
-    }
-
     @Override
     protected void afterTest() {
         super.afterTest();

diff --git a/sdk/communication/azure-communication-identity/pom.xml b/sdk/communication/azure-communication-identity/pom.xml
@@ -181,47 +181,5 @@
         </plugins>
       </build>
     </profile>
-    <profile>
-      <id>disable-coverage-if-phonenumbers</id>
-      <activation>
-        <property>
-          <name>env.TEST_PACKAGES_ENABLED</name>
-          <value>phonenumbers</value>
-        </property>
-      </activation>
-      <properties>
-        <src.dir>src/main</src.dir>
-        <test.dir>src/test</test.dir>
-        <jacoco.skip.coverage.check>true</jacoco.skip.coverage.check>
-      </properties>
-    </profile>
-     <profile>
-      <id>disable-coverage-if-sms</id>
-      <activation>
-        <property>
-          <name>env.TEST_PACKAGES_ENABLED</name>
-          <value>sms</value>
-        </property>
-      </activation>
-      <properties>
-        <src.dir>src/main</src.dir>
-        <test.dir>src/test</test.dir>
-        <jacoco.skip.coverage.check>true</jacoco.skip.coverage.check>
-      </properties>
-    </profile>
-    <profile>
-      <id>disable-coverage-if-chat</id>
-      <activation>
-        <property>
-          <name>env.TEST_PACKAGES_ENABLED</name>
-          <value>chat</value>
-        </property>
-      </activation>
-      <properties>
-        <src.dir>src/main</src.dir>
-        <test.dir>src/test</test.dir>
-        <jacoco.skip.coverage.check>true</jacoco.skip.coverage.check>
-      </properties>
-    </profile>
   </profiles>
 </project>
diff --git a/...ntity/src/test/java/com/azure/communication/identity/CommunicationIdentityAsyncTests.java b/...ntity/src/test/java/com/azure/communication/identity/CommunicationIdentityAsyncTests.java
@@ -5,7 +5,6 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 import java.util.Arrays;
 import java.util.List;
@@ -26,12 +25,6 @@
 public class CommunicationIdentityAsyncTests extends CommunicationIdentityClientTestBase {
     private CommunicationIdentityAsyncClient asyncClient;
 
-    @Override
-    protected void beforeTest() {
-        super.beforeTest();
-        assumeTrue(shouldEnableIdentityTests());
-    }
-
     @ParameterizedTest
     @MethodSource("com.azure.core.test.TestBase#getHttpClients")
     public void createAsyncIdentityClientUsingManagedIdentity(HttpClient httpClient) {

diff --git a/...y/src/test/java/com/azure/communication/identity/CommunicationIdentityClientTestBase.java b/...y/src/test/java/com/azure/communication/identity/CommunicationIdentityClientTestBase.java
@@ -34,9 +34,6 @@ public class CommunicationIdentityClientTestBase extends TestBase {
     protected static final String CONNECTION_STRING = Configuration.getGlobalConfiguration()
         .get("COMMUNICATION_LIVETEST_DYNAMIC_CONNECTION_STRING", "endpoint=https://REDACTED.communication.azure.com/;accesskey=QWNjZXNzS2V5");
 
-    private static final String TEST_PACKAGES_ENABLED = Configuration.getGlobalConfiguration()
-        .get("TEST_PACKAGES_ENABLED", "all");
-
     private static final StringJoiner JSON_PROPERTIES_TO_REDACT
         = new StringJoiner("\":\"|\"", "\"", "\":\"")
         .add("token");
@@ -138,10 +135,6 @@ private Mono<HttpResponse> logHeaders(String testName, HttpPipelineNextPolicy ne
             });
     }
 
-    protected boolean shouldEnableIdentityTests() {
-        return TEST_PACKAGES_ENABLED.matches("(all|identity)");
-    }
-
     static class FakeCredentials implements TokenCredential {
         @Override
         public Mono<AccessToken> getToken(TokenRequestContext tokenRequestContext) {

diff --git a/...n-identity/src/test/java/com/azure/communication/identity/CommunicationIdentityTests.java b/...n-identity/src/test/java/com/azure/communication/identity/CommunicationIdentityTests.java
@@ -5,7 +5,6 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 import java.util.Arrays;
 import java.util.List;
@@ -24,12 +23,6 @@
 public class CommunicationIdentityTests extends CommunicationIdentityClientTestBase {
     private CommunicationIdentityClient client;
 
-    @Override
-    protected void beforeTest() {
-        super.beforeTest();
-        assumeTrue(shouldEnableIdentityTests());
-    }
-
     @ParameterizedTest
     @MethodSource("com.azure.core.test.TestBase#getHttpClients")
     public void createIdentityClientUsingManagedIdentity(HttpClient httpClient) {

diff --git a/sdk/communication/azure-communication-phonenumbers/pom.xml b/sdk/communication/azure-communication-phonenumbers/pom.xml
@@ -180,61 +180,5 @@
         </plugins>
       </build>
     </profile>
-    <profile>
-      <id>disable-coverage-if-identity</id>
-      <activation>
-        <property>
-          <name>env.TEST_PACKAGES_ENABLED</name>
-          <value>identity</value>
-        </property>
-      </activation>
-      <properties>
-        <src.dir>src/main</src.dir>
-        <test.dir>src/test</test.dir>
-        <jacoco.skip.coverage.check>true</jacoco.skip.coverage.check>
-      </properties>
-    </profile>
-     <profile>
-      <id>disable-coverage-if-sms</id>
-      <activation>
-        <property>
-          <name>env.TEST_PACKAGES_ENABLED</name>
-          <value>sms</value>
-        </property>
-      </activation>
-      <properties>
-        <src.dir>src/main</src.dir>
-        <test.dir>src/test</test.dir>
-        <jacoco.skip.coverage.check>true</jacoco.skip.coverage.check>
-      </properties>
-    </profile>
-    <profile>
-      <id>disable-coverage-if-chat</id>
-      <activation>
-        <property>
-          <name>env.TEST_PACKAGES_ENABLED</name>
-          <value>chat</value>
-        </property>
-      </activation>
-      <properties>
-        <src.dir>src/main</src.dir>
-        <test.dir>src/test</test.dir>
-        <jacoco.skip.coverage.check>true</jacoco.skip.coverage.check>
-      </properties>
-    </profile>
-    <profile>
-      <id>disable-coverage-if-phonenumbers</id>
-      <activation>
-        <property>
-          <name>env.COMMUNICATION_SKIP_INT_PHONENUMBERS_TEST</name>
-          <value>true</value>
-        </property>
-      </activation>
-      <properties>
-        <src.dir>src/main</src.dir>
-        <test.dir>src/test</test.dir>
-        <jacoco.skip.coverage.check>true</jacoco.skip.coverage.check>
-      </properties>
-    </profile>
   </profiles>
 </project>
diff --git a/...est/java/com/azure/communication/phonenumbers/PhoneNumbersAsyncClientIntegrationTest.java b/...est/java/com/azure/communication/phonenumbers/PhoneNumbersAsyncClientIntegrationTest.java
@@ -26,16 +26,9 @@
 import java.time.Duration;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 public class PhoneNumbersAsyncClientIntegrationTest extends PhoneNumbersIntegrationTestBase {
 
-    @Override
-    protected void beforeTest() {
-        super.beforeTest();
-        assumeTrue(shouldEnablePhoneNumbersTests());
-    }
-
     @ParameterizedTest
     @MethodSource("com.azure.core.test.TestBase#getHttpClients")
     public void getPurchasedPhoneNumber(HttpClient httpClient) {

diff --git a/...ers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersClientBuilderTest.java b/...ers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersClientBuilderTest.java
@@ -26,7 +26,6 @@
 
 
 import static org.junit.jupiter.api.Assertions.*;
-import static org.junit.jupiter.api.Assumptions.assumeTrue;
 import static org.mockito.Mockito.*;
 
 @Execution(value = ExecutionMode.SAME_THREAD)
@@ -45,7 +44,6 @@ public class PhoneNumbersClientBuilderTest {
     void setUp() {
         this.httpClient = mock(HttpClient.class);
         this.clientBuilder = Mockito.spy(new PhoneNumbersClientBuilder());
-        assumeTrue(Configuration.getGlobalConfiguration().get("TEST_PACKAGES_ENABLED", "all").matches("all|phonenumbers"));
     }
 
     @AfterEach

diff --git a/...src/test/java/com/azure/communication/phonenumbers/PhoneNumbersClientIntegrationTest.java b/...src/test/java/com/azure/communication/phonenumbers/PhoneNumbersClientIntegrationTest.java
@@ -30,16 +30,9 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.fail;
-import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 public class PhoneNumbersClientIntegrationTest extends PhoneNumbersIntegrationTestBase {
 
-    @Override
-    protected void beforeTest() {
-        super.beforeTest();
-        assumeTrue(shouldEnablePhoneNumbersTests());
-    }
-
     @ParameterizedTest
     @MethodSource("com.azure.core.test.TestBase#getHttpClients")
     public void getPurchasedPhoneNumber(HttpClient httpClient) {

diff --git a/...s/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersIntegrationTestBase.java b/...s/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersIntegrationTestBase.java
@@ -37,9 +37,6 @@ public class PhoneNumbersIntegrationTestBase extends TestBase {
     protected static final String PHONE_NUMBER =
         Configuration.getGlobalConfiguration().get("AZURE_PHONE_NUMBER", "+11234567891");
 
-    private static final String TEST_PACKAGES_ENABLED = Configuration.getGlobalConfiguration()
-        .get("TEST_PACKAGES_ENABLED", "all");
-
     private static final StringJoiner JSON_PROPERTIES_TO_REDACT =
         new StringJoiner("\":\"|\"", "\"", "\":\"")
             .add("id")
@@ -146,7 +143,4 @@ private String redact(String content, Matcher matcher, String replacement) {
         return content;
     }
 
-    protected boolean shouldEnablePhoneNumbersTests() {
-        return TEST_PACKAGES_ENABLED.matches("(all|phonenumbers)");
-    }
 }