diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 491ec519..93d40934 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -8,26 +8,6 @@ jobs: deploy: name: Deploy SDK to Maven Central runs-on: ubuntu-latest - env: - BW_ACCOUNT_ID: ${{ secrets.BW_ACCOUNT_ID }} - BW_CLIENT_ID: ${{ secrets.BW_CLIENT_ID }} - BW_CLIENT_SECRET: ${{ secrets.BW_CLIENT_SECRET }} - BW_VOICE_APPLICATION_ID: ${{ secrets.BW_VOICE_APPLICATION_ID }} - BW_MESSAGING_APPLICATION_ID: ${{ secrets.BW_MESSAGING_APPLICATION_ID }} - BW_NUMBER: ${{ secrets.BW_NUMBER }} - USER_NUMBER: ${{ secrets.USER_NUMBER }} - VZW_NUMBER: ${{ secrets.VZW_NUMBER }} - ATT_NUMBER: ${{ secrets.ATT_NUMBER }} - T_MOBILE_NUMBER: ${{ secrets.T_MOBILE_NUMBER }} - BASE_CALLBACK_URL: ${{ secrets.BASE_CALLBACK_URL }} - PYTHON_VERSION: ${{ matrix.python-version }} - OPERATING_SYSTEM: ${{ matrix.os }} - MANTECA_ACTIVE_NUMBER: ${{ secrets.MANTECA_ACTIVE_NUMBER }} - MANTECA_IDLE_NUMBER: ${{ secrets.MANTECA_IDLE_NUMBER }} - MANTECA_BASE_URL: ${{ secrets.MANTECA_BASE_URL }} - MANTECA_APPLICATION_ID: ${{ secrets.MANTECA_APPLICATION_ID }} - BW_NUMBER_PROVIDER: ${{ secrets.BW_NUMBER_PROVIDER }} - steps: - name: Set Release Version run: echo "RELEASE_VERSION=${TAG#v}" >> $GITHUB_ENV @@ -55,11 +35,6 @@ jobs: run: mvn versions:set -DnewVersion=$RELEASE_VERSION - name: Build Package and Test - env: - JAVA_VERSION: 21 - RUNNER_OS: ubuntu-latest - OPERATING_SYSTEM: ubuntu -latest - DISTRIBUTION: adopt run: | mvn -B package --file pom.xml -DskipTests npm install -g @stoplight/prism-cli diff --git a/.github/workflows/test-pr.yml b/.github/workflows/test-pr.yml index 16a445aa..ab8ec56c 100644 --- a/.github/workflows/test-pr.yml +++ b/.github/workflows/test-pr.yml @@ -9,23 +9,6 @@ concurrency: group: ${{ github.workflow }}-${{ github.head_ref }} cancel-in-progress: true -env: - BW_ACCOUNT_ID: ${{ secrets.BW_ACCOUNT_ID }} - BW_CLIENT_ID: ${{ secrets.BW_CLIENT_ID }} - BW_CLIENT_SECRET: ${{ secrets.BW_CLIENT_SECRET }} - BW_VOICE_APPLICATION_ID: ${{ secrets.BW_VOICE_APPLICATION_ID }} - BW_MESSAGING_APPLICATION_ID: ${{ secrets.BW_MESSAGING_APPLICATION_ID }} - BW_NUMBER: ${{ secrets.BW_NUMBER }} - USER_NUMBER: ${{ secrets.USER_NUMBER }} - BASE_CALLBACK_URL: ${{ secrets.BASE_CALLBACK_URL }} - MANTECA_IDLE_NUMBER: ${{ secrets.MANTECA_IDLE_NUMBER }} - MANTECA_ACTIVE_NUMBER: ${{ secrets.MANTECA_ACTIVE_NUMBER }} - MANTECA_APPLICATION_ID: ${{ secrets.MANTECA_APPLICATION_ID }} - MANTECA_BASE_URL: ${{ secrets.MANTECA_BASE_URL }} - ATT_NUMBER: ${{ secrets.ATT_NUMBER }} - T_MOBILE_NUMBER: ${{ secrets.T_MOBILE_NUMBER }} - VZW_NUMBER: ${{ secrets.VZW_NUMBER }} - jobs: test: name: Test PR @@ -47,11 +30,6 @@ jobs: java-version: ${{ matrix.java-version }} - name: Build Package and Test - env: - JAVA_VERSION: ${{ matrix.java-version }} - RUNNER_OS: ${{ matrix.os }} - OPERATING_SYSTEM: ${{ matrix.os }} - DISTRIBUTION: ${{ matrix.distribution }} run: | mvn -B package --file pom.xml -DskipTests npm install -g @stoplight/prism-cli diff --git a/.github/workflows/test-smoke.yml b/.github/workflows/test-smoke.yml index d8471a34..04785e00 100644 --- a/.github/workflows/test-smoke.yml +++ b/.github/workflows/test-smoke.yml @@ -69,7 +69,7 @@ jobs: MANTECA_APPLICATION_ID: ${{ secrets.MANTECA_UP_APPLICATION_ID }} steps: - name: Checkout - uses: actions/checkout@v5 + uses: actions/checkout@v7 - name: Set up JDK uses: actions/setup-java@v5 diff --git a/src/test/java/com/bandwidth/sdk/smoke/CallsApiTest.java b/src/test/java/com/bandwidth/sdk/smoke/CallsApiTest.java index 04c9ddda..75e7c809 100644 --- a/src/test/java/com/bandwidth/sdk/smoke/CallsApiTest.java +++ b/src/test/java/com/bandwidth/sdk/smoke/CallsApiTest.java @@ -35,8 +35,8 @@ import static org.hamcrest.Matchers.anyOf; import static org.hamcrest.beans.HasPropertyWithValue.hasProperty; -import static com.bandwidth.sdk.utils.TestingEnvironmentVariables.*; -import static com.bandwidth.sdk.utils.CallCleanup.Cleanup; +import static com.bandwidth.sdk.smoke.utils.TestingEnvironmentVariables.*; +import static com.bandwidth.sdk.smoke.utils.CallCleanup.Cleanup; @SuppressWarnings("null") @TestMethodOrder(MethodOrderer.OrderAnnotation.class) diff --git a/src/test/java/com/bandwidth/sdk/smoke/ConferencesApiTest.java b/src/test/java/com/bandwidth/sdk/smoke/ConferencesApiTest.java index e9cb6ab3..d3ce4e21 100644 --- a/src/test/java/com/bandwidth/sdk/smoke/ConferencesApiTest.java +++ b/src/test/java/com/bandwidth/sdk/smoke/ConferencesApiTest.java @@ -43,8 +43,8 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; -import static com.bandwidth.sdk.utils.TestingEnvironmentVariables.*; -import static com.bandwidth.sdk.utils.CallCleanup.Cleanup; +import static com.bandwidth.sdk.smoke.utils.TestingEnvironmentVariables.*; +import static com.bandwidth.sdk.smoke.utils.CallCleanup.Cleanup; @SuppressWarnings("null") @TestMethodOrder(MethodOrderer.OrderAnnotation.class) diff --git a/src/test/java/com/bandwidth/sdk/smoke/EndpointsApiTest.java b/src/test/java/com/bandwidth/sdk/smoke/EndpointsApiTest.java index 1f2582f3..a42b3ac8 100644 --- a/src/test/java/com/bandwidth/sdk/smoke/EndpointsApiTest.java +++ b/src/test/java/com/bandwidth/sdk/smoke/EndpointsApiTest.java @@ -32,7 +32,7 @@ import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.Matchers.is; -import static com.bandwidth.sdk.utils.TestingEnvironmentVariables.*; +import static com.bandwidth.sdk.smoke.utils.TestingEnvironmentVariables.*; @SuppressWarnings("null") @TestMethodOrder(MethodOrderer.OrderAnnotation.class) diff --git a/src/test/java/com/bandwidth/sdk/smoke/MediaApiTest.java b/src/test/java/com/bandwidth/sdk/smoke/MediaApiTest.java index ad9fe035..016875b8 100644 --- a/src/test/java/com/bandwidth/sdk/smoke/MediaApiTest.java +++ b/src/test/java/com/bandwidth/sdk/smoke/MediaApiTest.java @@ -20,7 +20,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; -import static com.bandwidth.sdk.utils.TestingEnvironmentVariables.*; +import static com.bandwidth.sdk.smoke.utils.TestingEnvironmentVariables.*; @TestMethodOrder(OrderAnnotation.class) public class MediaApiTest { diff --git a/src/test/java/com/bandwidth/sdk/smoke/MessagesApiTest.java b/src/test/java/com/bandwidth/sdk/smoke/MessagesApiTest.java index 178809fd..afebe890 100644 --- a/src/test/java/com/bandwidth/sdk/smoke/MessagesApiTest.java +++ b/src/test/java/com/bandwidth/sdk/smoke/MessagesApiTest.java @@ -26,7 +26,7 @@ import static org.hamcrest.Matchers.matchesRegex; import static org.hamcrest.Matchers.contains; -import static com.bandwidth.sdk.utils.TestingEnvironmentVariables.*; +import static com.bandwidth.sdk.smoke.utils.TestingEnvironmentVariables.*; /** * API tests for MessagesApi diff --git a/src/test/java/com/bandwidth/sdk/smoke/MfaApiTest.java b/src/test/java/com/bandwidth/sdk/smoke/MfaApiTest.java index 6a49e5c4..603dbcdd 100644 --- a/src/test/java/com/bandwidth/sdk/smoke/MfaApiTest.java +++ b/src/test/java/com/bandwidth/sdk/smoke/MfaApiTest.java @@ -19,7 +19,7 @@ import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.Matchers.is; -import static com.bandwidth.sdk.utils.TestingEnvironmentVariables.*; +import static com.bandwidth.sdk.smoke.utils.TestingEnvironmentVariables.*; public class MfaApiTest { ApiClient oauthClient = new ApiClient(BW_CLIENT_ID, BW_CLIENT_SECRET, null); diff --git a/src/test/java/com/bandwidth/sdk/smoke/MultiChannelApiTest.java b/src/test/java/com/bandwidth/sdk/smoke/MultiChannelApiTest.java index 639fed8d..ba3f7c83 100644 --- a/src/test/java/com/bandwidth/sdk/smoke/MultiChannelApiTest.java +++ b/src/test/java/com/bandwidth/sdk/smoke/MultiChannelApiTest.java @@ -47,7 +47,7 @@ import java.util.List; import java.util.Set; -import static com.bandwidth.sdk.utils.TestingEnvironmentVariables.*; +import static com.bandwidth.sdk.smoke.utils.TestingEnvironmentVariables.*; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.Matchers.contains; diff --git a/src/test/java/com/bandwidth/sdk/smoke/PhoneNumberLookupApiTest.java b/src/test/java/com/bandwidth/sdk/smoke/PhoneNumberLookupApiTest.java index a0f05ad5..63f1aed0 100644 --- a/src/test/java/com/bandwidth/sdk/smoke/PhoneNumberLookupApiTest.java +++ b/src/test/java/com/bandwidth/sdk/smoke/PhoneNumberLookupApiTest.java @@ -30,7 +30,7 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.Matchers.is; -import static com.bandwidth.sdk.utils.TestingEnvironmentVariables.*; +import static com.bandwidth.sdk.smoke.utils.TestingEnvironmentVariables.*; @SuppressWarnings("null") public class PhoneNumberLookupApiTest { diff --git a/src/test/java/com/bandwidth/sdk/smoke/RecordingsApiTest.java b/src/test/java/com/bandwidth/sdk/smoke/RecordingsApiTest.java index a2811b18..85fbcd7d 100644 --- a/src/test/java/com/bandwidth/sdk/smoke/RecordingsApiTest.java +++ b/src/test/java/com/bandwidth/sdk/smoke/RecordingsApiTest.java @@ -41,8 +41,8 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; -import static com.bandwidth.sdk.utils.TestingEnvironmentVariables.*; -import static com.bandwidth.sdk.utils.CallCleanup.Cleanup; +import static com.bandwidth.sdk.smoke.utils.TestingEnvironmentVariables.*; +import static com.bandwidth.sdk.smoke.utils.CallCleanup.Cleanup; @SuppressWarnings("null") @TestMethodOrder(MethodOrderer.OrderAnnotation.class) diff --git a/src/test/java/com/bandwidth/sdk/smoke/StatisticsApiTest.java b/src/test/java/com/bandwidth/sdk/smoke/StatisticsApiTest.java index bb914023..3306a250 100644 --- a/src/test/java/com/bandwidth/sdk/smoke/StatisticsApiTest.java +++ b/src/test/java/com/bandwidth/sdk/smoke/StatisticsApiTest.java @@ -11,7 +11,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.CoreMatchers.instanceOf; -import static com.bandwidth.sdk.utils.TestingEnvironmentVariables.*; +import static com.bandwidth.sdk.smoke.utils.TestingEnvironmentVariables.*; /** * API tests for StatisticsApi diff --git a/src/test/java/com/bandwidth/sdk/smoke/TollFreeVerificationApiTest.java b/src/test/java/com/bandwidth/sdk/smoke/TollFreeVerificationApiTest.java index c92cb29e..69c7aac5 100644 --- a/src/test/java/com/bandwidth/sdk/smoke/TollFreeVerificationApiTest.java +++ b/src/test/java/com/bandwidth/sdk/smoke/TollFreeVerificationApiTest.java @@ -26,7 +26,7 @@ import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.is; -import static com.bandwidth.sdk.utils.TestingEnvironmentVariables.*; +import static com.bandwidth.sdk.smoke.utils.TestingEnvironmentVariables.*; @SuppressWarnings("null") public class TollFreeVerificationApiTest { diff --git a/src/test/java/com/bandwidth/sdk/smoke/TranscriptionsApiTest.java b/src/test/java/com/bandwidth/sdk/smoke/TranscriptionsApiTest.java index a8fa74c0..36a293e2 100644 --- a/src/test/java/com/bandwidth/sdk/smoke/TranscriptionsApiTest.java +++ b/src/test/java/com/bandwidth/sdk/smoke/TranscriptionsApiTest.java @@ -28,7 +28,7 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.beans.HasPropertyWithValue.hasProperty; -import static com.bandwidth.sdk.utils.TestingEnvironmentVariables.*; +import static com.bandwidth.sdk.smoke.utils.TestingEnvironmentVariables.*; @TestInstance(TestInstance.Lifecycle.PER_CLASS) diff --git a/src/test/java/com/bandwidth/sdk/utils/CallCleanup.java b/src/test/java/com/bandwidth/sdk/smoke/utils/CallCleanup.java similarity index 96% rename from src/test/java/com/bandwidth/sdk/utils/CallCleanup.java rename to src/test/java/com/bandwidth/sdk/smoke/utils/CallCleanup.java index b383121e..10687dc6 100644 --- a/src/test/java/com/bandwidth/sdk/utils/CallCleanup.java +++ b/src/test/java/com/bandwidth/sdk/smoke/utils/CallCleanup.java @@ -1,4 +1,4 @@ -package com.bandwidth.sdk.utils; +package com.bandwidth.sdk.smoke.utils; import java.util.List; import java.util.concurrent.TimeUnit; @@ -10,7 +10,7 @@ import com.bandwidth.sdk.model.UpdateCall; import com.bandwidth.sdk.ApiException; -import static com.bandwidth.sdk.utils.TestingEnvironmentVariables.*; +import static com.bandwidth.sdk.smoke.utils.TestingEnvironmentVariables.*; public class CallCleanup { private static int TEST_SLEEP = 5; diff --git a/src/test/java/com/bandwidth/sdk/utils/TestingEnvironmentVariables.java b/src/test/java/com/bandwidth/sdk/smoke/utils/TestingEnvironmentVariables.java similarity index 97% rename from src/test/java/com/bandwidth/sdk/utils/TestingEnvironmentVariables.java rename to src/test/java/com/bandwidth/sdk/smoke/utils/TestingEnvironmentVariables.java index d317bbb0..d0d7a903 100644 --- a/src/test/java/com/bandwidth/sdk/utils/TestingEnvironmentVariables.java +++ b/src/test/java/com/bandwidth/sdk/smoke/utils/TestingEnvironmentVariables.java @@ -1,4 +1,4 @@ -package com.bandwidth.sdk.utils; +package com.bandwidth.sdk.smoke.utils; public final class TestingEnvironmentVariables { public static final String BW_CLIENT_ID = System.getenv("BW_CLIENT_ID"); diff --git a/src/test/java/com/bandwidth/sdk/unit/TestConstants.java b/src/test/java/com/bandwidth/sdk/unit/TestConstants.java new file mode 100644 index 00000000..3696a605 --- /dev/null +++ b/src/test/java/com/bandwidth/sdk/unit/TestConstants.java @@ -0,0 +1,12 @@ +package com.bandwidth.sdk.unit; + +public final class TestConstants { + public static final String BW_CLIENT_ID = "test-client-id"; + public static final String BW_CLIENT_SECRET = "test-client-secret"; + public static final String BW_ACCOUNT_ID = "9900000"; + public static final String BW_NUMBER = "+19195551234"; + public static final String USER_NUMBER = "+19195554321"; + public static final String BW_VOICE_APPLICATION_ID = "abc12345-6def-abc1-2345-6defabc12345"; + public static final String BW_MESSAGING_APPLICATION_ID = "abc12345-6def-abc1-2345-6defabc12345"; + public static final String BASE_CALLBACK_URL = "https://example.com"; +} diff --git a/src/test/java/com/bandwidth/sdk/unit/api/ApiClientTest.java b/src/test/java/com/bandwidth/sdk/unit/api/ApiClientTest.java index aa6923b9..d4255578 100644 --- a/src/test/java/com/bandwidth/sdk/unit/api/ApiClientTest.java +++ b/src/test/java/com/bandwidth/sdk/unit/api/ApiClientTest.java @@ -10,7 +10,8 @@ import com.bandwidth.sdk.auth.OAuth; import com.bandwidth.sdk.auth.RetryingOAuth; -import static com.bandwidth.sdk.utils.TestingEnvironmentVariables.*; +import static com.bandwidth.sdk.unit.TestConstants.BW_CLIENT_ID; +import static com.bandwidth.sdk.unit.TestConstants.BW_CLIENT_SECRET; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.CoreMatchers.nullValue; diff --git a/src/test/java/com/bandwidth/sdk/unit/api/CallsApiTest.java b/src/test/java/com/bandwidth/sdk/unit/api/CallsApiTest.java index c382d5a9..581a958f 100644 --- a/src/test/java/com/bandwidth/sdk/unit/api/CallsApiTest.java +++ b/src/test/java/com/bandwidth/sdk/unit/api/CallsApiTest.java @@ -18,7 +18,13 @@ import com.bandwidth.sdk.model.UpdateCall; import com.google.gson.internal.LinkedTreeMap; -import static com.bandwidth.sdk.utils.TestingEnvironmentVariables.*; +import static com.bandwidth.sdk.unit.TestConstants.BW_CLIENT_ID; +import static com.bandwidth.sdk.unit.TestConstants.BW_CLIENT_SECRET; +import static com.bandwidth.sdk.unit.TestConstants.BW_ACCOUNT_ID; +import static com.bandwidth.sdk.unit.TestConstants.BW_NUMBER; +import static com.bandwidth.sdk.unit.TestConstants.USER_NUMBER; +import static com.bandwidth.sdk.unit.TestConstants.BW_VOICE_APPLICATION_ID; +import static com.bandwidth.sdk.unit.TestConstants.BASE_CALLBACK_URL; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasProperty; import static org.hamcrest.CoreMatchers.instanceOf; diff --git a/src/test/java/com/bandwidth/sdk/unit/api/ConferencesApiTest.java b/src/test/java/com/bandwidth/sdk/unit/api/ConferencesApiTest.java index f368c161..e19c3c71 100644 --- a/src/test/java/com/bandwidth/sdk/unit/api/ConferencesApiTest.java +++ b/src/test/java/com/bandwidth/sdk/unit/api/ConferencesApiTest.java @@ -18,7 +18,10 @@ import com.bandwidth.sdk.model.UpdateConference; import com.bandwidth.sdk.model.UpdateConferenceMember; -import static com.bandwidth.sdk.utils.TestingEnvironmentVariables.*; +import static com.bandwidth.sdk.unit.TestConstants.BW_CLIENT_ID; +import static com.bandwidth.sdk.unit.TestConstants.BW_CLIENT_SECRET; +import static com.bandwidth.sdk.unit.TestConstants.BW_ACCOUNT_ID; +import static com.bandwidth.sdk.unit.TestConstants.BASE_CALLBACK_URL; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.is; diff --git a/src/test/java/com/bandwidth/sdk/unit/api/EndpointsApiTest.java b/src/test/java/com/bandwidth/sdk/unit/api/EndpointsApiTest.java index 7f2f4c11..1cb29303 100644 --- a/src/test/java/com/bandwidth/sdk/unit/api/EndpointsApiTest.java +++ b/src/test/java/com/bandwidth/sdk/unit/api/EndpointsApiTest.java @@ -23,7 +23,9 @@ import java.time.OffsetDateTime; import java.util.List; -import static com.bandwidth.sdk.utils.TestingEnvironmentVariables.*; +import static com.bandwidth.sdk.unit.TestConstants.BW_CLIENT_ID; +import static com.bandwidth.sdk.unit.TestConstants.BW_CLIENT_SECRET; +import static com.bandwidth.sdk.unit.TestConstants.BW_ACCOUNT_ID; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.equalTo; diff --git a/src/test/java/com/bandwidth/sdk/unit/api/MediaApiTest.java b/src/test/java/com/bandwidth/sdk/unit/api/MediaApiTest.java index 6e45fb84..5d80a478 100644 --- a/src/test/java/com/bandwidth/sdk/unit/api/MediaApiTest.java +++ b/src/test/java/com/bandwidth/sdk/unit/api/MediaApiTest.java @@ -6,7 +6,9 @@ import com.bandwidth.sdk.api.MediaApi; import com.bandwidth.sdk.model.Media; -import static com.bandwidth.sdk.utils.TestingEnvironmentVariables.*; +import static com.bandwidth.sdk.unit.TestConstants.BW_CLIENT_ID; +import static com.bandwidth.sdk.unit.TestConstants.BW_CLIENT_SECRET; +import static com.bandwidth.sdk.unit.TestConstants.BW_ACCOUNT_ID; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.is; diff --git a/src/test/java/com/bandwidth/sdk/unit/api/MessagesApiTest.java b/src/test/java/com/bandwidth/sdk/unit/api/MessagesApiTest.java index 9b654f12..4588b778 100644 --- a/src/test/java/com/bandwidth/sdk/unit/api/MessagesApiTest.java +++ b/src/test/java/com/bandwidth/sdk/unit/api/MessagesApiTest.java @@ -19,7 +19,11 @@ import com.bandwidth.sdk.model.PageInfo; import com.bandwidth.sdk.model.PriorityEnum; -import static com.bandwidth.sdk.utils.TestingEnvironmentVariables.*; +import static com.bandwidth.sdk.unit.TestConstants.BW_CLIENT_ID; +import static com.bandwidth.sdk.unit.TestConstants.BW_CLIENT_SECRET; +import static com.bandwidth.sdk.unit.TestConstants.BW_ACCOUNT_ID; +import static com.bandwidth.sdk.unit.TestConstants.BW_NUMBER; +import static com.bandwidth.sdk.unit.TestConstants.BW_MESSAGING_APPLICATION_ID; import java.time.OffsetDateTime; import java.util.LinkedHashSet; diff --git a/src/test/java/com/bandwidth/sdk/unit/api/MfaApiTest.java b/src/test/java/com/bandwidth/sdk/unit/api/MfaApiTest.java index c8d0beba..6af2aefb 100644 --- a/src/test/java/com/bandwidth/sdk/unit/api/MfaApiTest.java +++ b/src/test/java/com/bandwidth/sdk/unit/api/MfaApiTest.java @@ -15,7 +15,13 @@ import java.math.BigDecimal; -import static com.bandwidth.sdk.utils.TestingEnvironmentVariables.*; +import static com.bandwidth.sdk.unit.TestConstants.BW_CLIENT_ID; +import static com.bandwidth.sdk.unit.TestConstants.BW_CLIENT_SECRET; +import static com.bandwidth.sdk.unit.TestConstants.BW_ACCOUNT_ID; +import static com.bandwidth.sdk.unit.TestConstants.BW_NUMBER; +import static com.bandwidth.sdk.unit.TestConstants.USER_NUMBER; +import static com.bandwidth.sdk.unit.TestConstants.BW_VOICE_APPLICATION_ID; +import static com.bandwidth.sdk.unit.TestConstants.BW_MESSAGING_APPLICATION_ID; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.is; diff --git a/src/test/java/com/bandwidth/sdk/unit/api/MultiChannelApiTest.java b/src/test/java/com/bandwidth/sdk/unit/api/MultiChannelApiTest.java index cdf3247d..1c2c33ee 100644 --- a/src/test/java/com/bandwidth/sdk/unit/api/MultiChannelApiTest.java +++ b/src/test/java/com/bandwidth/sdk/unit/api/MultiChannelApiTest.java @@ -24,7 +24,12 @@ import java.util.List; import java.util.Set; -import static com.bandwidth.sdk.utils.TestingEnvironmentVariables.*; +import static com.bandwidth.sdk.unit.TestConstants.BW_CLIENT_ID; +import static com.bandwidth.sdk.unit.TestConstants.BW_CLIENT_SECRET; +import static com.bandwidth.sdk.unit.TestConstants.BW_ACCOUNT_ID; +import static com.bandwidth.sdk.unit.TestConstants.BW_NUMBER; +import static com.bandwidth.sdk.unit.TestConstants.USER_NUMBER; +import static com.bandwidth.sdk.unit.TestConstants.BW_MESSAGING_APPLICATION_ID; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.is; diff --git a/src/test/java/com/bandwidth/sdk/unit/api/PhoneNumberLookupApiTest.java b/src/test/java/com/bandwidth/sdk/unit/api/PhoneNumberLookupApiTest.java index fca57386..b84454c7 100644 --- a/src/test/java/com/bandwidth/sdk/unit/api/PhoneNumberLookupApiTest.java +++ b/src/test/java/com/bandwidth/sdk/unit/api/PhoneNumberLookupApiTest.java @@ -40,7 +40,9 @@ import java.util.Arrays; import java.util.List; -import static com.bandwidth.sdk.utils.TestingEnvironmentVariables.*; +import static com.bandwidth.sdk.unit.TestConstants.BW_CLIENT_ID; +import static com.bandwidth.sdk.unit.TestConstants.BW_CLIENT_SECRET; +import static com.bandwidth.sdk.unit.TestConstants.BW_ACCOUNT_ID; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.equalTo; diff --git a/src/test/java/com/bandwidth/sdk/unit/api/RecordingsApiTest.java b/src/test/java/com/bandwidth/sdk/unit/api/RecordingsApiTest.java index faaa3396..038bec7e 100644 --- a/src/test/java/com/bandwidth/sdk/unit/api/RecordingsApiTest.java +++ b/src/test/java/com/bandwidth/sdk/unit/api/RecordingsApiTest.java @@ -19,7 +19,9 @@ import com.bandwidth.sdk.model.Transcription; import com.bandwidth.sdk.model.UpdateCallRecording; -import static com.bandwidth.sdk.utils.TestingEnvironmentVariables.*; +import static com.bandwidth.sdk.unit.TestConstants.BW_CLIENT_ID; +import static com.bandwidth.sdk.unit.TestConstants.BW_CLIENT_SECRET; +import static com.bandwidth.sdk.unit.TestConstants.BW_ACCOUNT_ID; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.is; diff --git a/src/test/java/com/bandwidth/sdk/unit/api/StatisticsApiTest.java b/src/test/java/com/bandwidth/sdk/unit/api/StatisticsApiTest.java index 77257579..5f6eb579 100644 --- a/src/test/java/com/bandwidth/sdk/unit/api/StatisticsApiTest.java +++ b/src/test/java/com/bandwidth/sdk/unit/api/StatisticsApiTest.java @@ -9,7 +9,9 @@ import com.bandwidth.sdk.api.StatisticsApi; import com.bandwidth.sdk.model.AccountStatistics; -import static com.bandwidth.sdk.utils.TestingEnvironmentVariables.*; +import static com.bandwidth.sdk.unit.TestConstants.BW_CLIENT_ID; +import static com.bandwidth.sdk.unit.TestConstants.BW_CLIENT_SECRET; +import static com.bandwidth.sdk.unit.TestConstants.BW_ACCOUNT_ID; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.is; diff --git a/src/test/java/com/bandwidth/sdk/unit/api/TollFreeVerificationApiTest.java b/src/test/java/com/bandwidth/sdk/unit/api/TollFreeVerificationApiTest.java index 4ab1c805..abea5b1a 100644 --- a/src/test/java/com/bandwidth/sdk/unit/api/TollFreeVerificationApiTest.java +++ b/src/test/java/com/bandwidth/sdk/unit/api/TollFreeVerificationApiTest.java @@ -38,7 +38,9 @@ import com.bandwidth.sdk.model.WebhookSubscriptionTypeEnum; import com.bandwidth.sdk.model.WebhookSubscriptionsListBody; -import static com.bandwidth.sdk.utils.TestingEnvironmentVariables.*; +import static com.bandwidth.sdk.unit.TestConstants.BW_CLIENT_ID; +import static com.bandwidth.sdk.unit.TestConstants.BW_CLIENT_SECRET; +import static com.bandwidth.sdk.unit.TestConstants.BW_ACCOUNT_ID; import static org.hamcrest.MatcherAssert.assertThat; import java.time.OffsetDateTime; diff --git a/src/test/java/com/bandwidth/sdk/unit/api/TranscriptionsApiTest.java b/src/test/java/com/bandwidth/sdk/unit/api/TranscriptionsApiTest.java index 5f2cae8b..f27e4339 100644 --- a/src/test/java/com/bandwidth/sdk/unit/api/TranscriptionsApiTest.java +++ b/src/test/java/com/bandwidth/sdk/unit/api/TranscriptionsApiTest.java @@ -15,7 +15,9 @@ import java.util.List; -import static com.bandwidth.sdk.utils.TestingEnvironmentVariables.*; +import static com.bandwidth.sdk.unit.TestConstants.BW_CLIENT_ID; +import static com.bandwidth.sdk.unit.TestConstants.BW_CLIENT_SECRET; +import static com.bandwidth.sdk.unit.TestConstants.BW_ACCOUNT_ID; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.is;