Skip to content

Commit

Permalink
Clear vestigial unit test infrastructure from integ tests (aws-amplif…
Browse files Browse the repository at this point in the history
…y#1574)

1. Remove ExampleUnitTest.java files.
2. Remoe testImplementation dependencies from build.gradle.
3. In one case, move a valid unit test into the source code module,
    where the other unit tests for the feature are kept.
  • Loading branch information
jamesonwilliams authored Apr 16, 2020
1 parent 685854a commit 79a8e78
Show file tree
Hide file tree
Showing 29 changed files with 4 additions and 86 deletions.
2 changes: 0 additions & 2 deletions aws-android-sdk-apigateway-test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ dependencies {
exclude group: 'com.google.android', module: 'android'
}

testImplementation 'junit:junit:4.12'

androidTestImplementation project(':aws-android-sdk-testutils')
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'org.mockito:mockito-android:2.7.22'
Expand Down
2 changes: 0 additions & 2 deletions aws-android-sdk-autoscaling-test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ dependencies {
}
implementation 'commons-codec:commons-codec:1.12'

testImplementation 'junit:junit:4.12'

androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation project(':aws-android-sdk-testutils')
Expand Down
3 changes: 1 addition & 2 deletions aws-android-sdk-cloudwatch-test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@ dependencies {
exclude group: 'com.google.android', module: 'android'
}

testImplementation 'junit:junit:4.12'

androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation project(':aws-android-sdk-testutils')
}

2 changes: 0 additions & 2 deletions aws-android-sdk-cognitoidentityprovider-test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ dependencies {
exclude group: 'com.google.android', module: 'android'
}

testImplementation 'junit:junit:4.12'

androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.linkedin.dexmaker:dexmaker-mockito:2.19.0'
Expand Down
2 changes: 0 additions & 2 deletions aws-android-sdk-comprehend-test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ dependencies {
exclude group: 'com.google.android', module: 'android'
}

testImplementation 'junit:junit:4.12'

androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation project(':aws-android-sdk-testutils')
}
Expand Down
3 changes: 1 addition & 2 deletions aws-android-sdk-connect-test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,8 @@ dependencies {
}
implementation 'com.android.support:appcompat-v7:27.0.0'

testImplementation 'junit:junit:4.12'

androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation project(':aws-android-sdk-testutils')
}

This file was deleted.

3 changes: 1 addition & 2 deletions aws-android-sdk-connectparticipant-test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,11 @@ dependencies {
}
implementation 'com.android.support:appcompat-v7:27.0.0'

testImplementation 'junit:junit:4.12'

androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation project(':aws-android-sdk-testutils')
androidTestImplementation (project(':aws-android-sdk-connect')) {
exclude group: 'com.google.android', module: 'android'
}
}

2 changes: 0 additions & 2 deletions aws-android-sdk-ddb-mapper-test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ dependencies {
implementation 'com.fasterxml.jackson.core:jackson-core:2.9.8'
implementation 'com.fasterxml.jackson.core:jackson-databind:2.0.0'

testImplementation 'junit:junit:4.12'

androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation project(':aws-android-sdk-testutils')
}
Expand Down
2 changes: 0 additions & 2 deletions aws-android-sdk-ddb-test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ dependencies {
exclude group: 'com.google.android', module: 'android'
}

testImplementation 'junit:junit:4.12'

androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation project(':aws-android-sdk-testutils')
}
Expand Down
2 changes: 0 additions & 2 deletions aws-android-sdk-elb-test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ dependencies {
exclude group: 'com.google.android', module: 'android'
}

testImplementation 'junit:junit:4.12'

androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation project(':aws-android-sdk-testutils')
}
Expand Down
2 changes: 0 additions & 2 deletions aws-android-sdk-kinesis-test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ dependencies {
implementation 'commons-io:commons-io:2.6'
implementation 'org.apache.commons:commons-lang3:3.6'

testImplementation 'junit:junit:4.12'

androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation project(':aws-android-sdk-testutils')
Expand Down
2 changes: 0 additions & 2 deletions aws-android-sdk-kinesisvideo-signaling-test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ dependencies {
exclude group: 'com.google.android', module: 'android'
}

testImplementation 'junit:junit:4.12'

androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation project(':aws-android-sdk-testutils')
Expand Down
2 changes: 0 additions & 2 deletions aws-android-sdk-lambda-test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ dependencies {
exclude group: 'com.google.android', module: 'android'
}

testImplementation 'junit:junit:4.12'

androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation project(':aws-android-sdk-testutils')
}
Expand Down
3 changes: 1 addition & 2 deletions aws-android-sdk-machinelearning-test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@ dependencies {
exclude group: 'com.google.android', module: 'android'
}

testImplementation 'junit:junit:4.12'

androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation project(':aws-android-sdk-testutils')
}

2 changes: 0 additions & 2 deletions aws-android-sdk-pinpoint-test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ dependencies {
exclude group: 'com.google.android', module: 'android'
}

testImplementation 'junit:junit:4.12'

androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation project(':aws-android-sdk-testutils')
Expand Down
2 changes: 0 additions & 2 deletions aws-android-sdk-polly-test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ dependencies {
exclude group: 'com.google.android', module: 'android'
}

testImplementation 'junit:junit:4.12'

androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation project(':aws-android-sdk-testutils')
}
Expand Down
2 changes: 0 additions & 2 deletions aws-android-sdk-rekognition-test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ dependencies {
exclude group: 'com.google.android', module: 'android'
}

testImplementation 'junit:junit:4.12'

androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation project(':aws-android-sdk-testutils')
}
Expand Down
2 changes: 0 additions & 2 deletions aws-android-sdk-s3-test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ dependencies {
exclude group: 'com.google.android', module: 'android'
}

testImplementation 'junit:junit:4.12'

androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support:appcompat-v7:27.0.0'
androidTestImplementation 'org.apache.commons:commons-io:1.3.2'
Expand Down
2 changes: 0 additions & 2 deletions aws-android-sdk-sagemaker-runtime-test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ dependencies {
}
implementation 'com.android.support:appcompat-v7:27.0.0'

testImplementation 'junit:junit:4.12'

androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation project(':aws-android-sdk-testutils')
Expand Down
2 changes: 0 additions & 2 deletions aws-android-sdk-sdb-test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ dependencies {
exclude group: 'com.google.android', module: 'android'
}

testImplementation 'junit:junit:4.12'

androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation project(':aws-android-sdk-testutils')
Expand Down
2 changes: 0 additions & 2 deletions aws-android-sdk-ses-test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ dependencies {
}
implementation 'commons-io:commons-io:2.6'

testImplementation 'junit:junit:4.12'

androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation project(':aws-android-sdk-testutils')
}
Expand Down
2 changes: 0 additions & 2 deletions aws-android-sdk-sns-test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ dependencies {
exclude group: 'com.google.android', module: 'android'
}

testImplementation 'junit:junit:4.12'

androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation project(':aws-android-sdk-testutils')
}
Expand Down
2 changes: 0 additions & 2 deletions aws-android-sdk-sqs-test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ dependencies {
exclude group: 'com.google.android', module: 'android'
}

testImplementation 'junit:junit:4.12'

androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation project(':aws-android-sdk-testutils')
}
Expand Down
2 changes: 0 additions & 2 deletions aws-android-sdk-textract-test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ dependencies {
}
implementation 'com.android.support:appcompat-v7:27.0.0'

testImplementation 'junit:junit:4.12'

androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation project(':aws-android-sdk-testutils')
Expand Down

This file was deleted.

2 changes: 0 additions & 2 deletions aws-android-sdk-transcribe-test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ dependencies {
}
implementation 'com.android.support:appcompat-v7:27.0.0'

testImplementation 'junit:junit:4.12'

androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation project(':aws-android-sdk-testutils')
Expand Down
2 changes: 0 additions & 2 deletions aws-android-sdk-translate-test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ dependencies {
}
implementation 'com.android.support:appcompat-v7:27.0.0'

testImplementation 'junit:junit:4.12'

androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation project(':aws-android-sdk-testutils')
Expand Down

0 comments on commit 79a8e78

Please sign in to comment.