diff options
| author | 2020-04-22 12:46:39 +0000 | |
|---|---|---|
| committer | 2020-04-22 12:46:39 +0000 | |
| commit | bbb5a3c7f7f29224f62eeddc83388ad4932e8be1 (patch) | |
| tree | 7e886c998fc3f90e1663c42ee5a78c718f85cd48 | |
| parent | f50c5c5ebded2165e4099d4efd25f18ad084b3e8 (diff) | |
| parent | bf0d419301521dfffdb8e36ca5cd3e1ff9a3b021 (diff) | |
Merge "Add TetheringCommonTests"
| -rw-r--r-- | packages/Tethering/tests/unit/Android.bp | 21 | ||||
| -rw-r--r-- | packages/Tethering/tests/unit/common/android/net/TetheredClientTest.kt (renamed from packages/Tethering/tests/unit/src/android/net/TetheredClientTest.kt) | 0 |
2 files changed, 21 insertions, 0 deletions
diff --git a/packages/Tethering/tests/unit/Android.bp b/packages/Tethering/tests/unit/Android.bp index 499ac0e18861..9b7d68309fbf 100644 --- a/packages/Tethering/tests/unit/Android.bp +++ b/packages/Tethering/tests/unit/Android.bp @@ -14,6 +14,26 @@ // limitations under the License. // +// Tests in this folder are included both in unit tests and CTS. +java_library { + name: "TetheringCommonTests", + srcs: [ + "common/**/*.java", + "common/**/*.kt" + ], + static_libs: [ + "androidx.test.rules", + "net-tests-utils", + ], + // TODO(b/147200698) change sdk_version to module-current and remove framework-minus-apex + sdk_version: "core_platform", + libs: [ + "framework-minus-apex", + "framework-tethering", + ], + visibility: ["//cts/tests/tests/tethering"], +} + java_defaults { name: "TetheringTestsDefaults", srcs: [ @@ -22,6 +42,7 @@ java_defaults { ], static_libs: [ "TetheringApiCurrentLib", + "TetheringCommonTests", "androidx.test.rules", "frameworks-base-testutils", "mockito-target-extended-minus-junit4", diff --git a/packages/Tethering/tests/unit/src/android/net/TetheredClientTest.kt b/packages/Tethering/tests/unit/common/android/net/TetheredClientTest.kt index a20a0dfd9c89..a20a0dfd9c89 100644 --- a/packages/Tethering/tests/unit/src/android/net/TetheredClientTest.kt +++ b/packages/Tethering/tests/unit/common/android/net/TetheredClientTest.kt |