0001cfd931
Tests for the connectivity module and network policy are both currently residing in the same cts module leading to significant problems while maintaining the tests. Breaking them up into two separate modules so making changes and maintaining error free tests is easier. Development of network policy changes occurs in non-updatable system code so relevant tests should be moved outside of the apex module respository. This will be possible after this change. Network policy related tests are moved to the new module CtsHostsideNetworkPolicyTests, with classes renamed accordingly. Since some code was shared between tests, that code is now duplicated in the new module. No functional change to tests is intended. Further refactorings to better suit the new structure should be pursued independently via follow-up changes in respective modules from now on. Test: atest CtsHostsideNetworkTests Test: atest CtsHostsideNetworkPolicyTests Bug: 322115994 Change-Id: I2c6ad2281ede6bad099c971b1f212244881a262d
57 lines
1.9 KiB
Text
57 lines
1.9 KiB
Text
// Copyright (C) 2014 The Android Open Source Project
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
next_app_data = [":CtsHostsideNetworkTestsAppNext"]
|
|
|
|
// The above line is put in place to prevent any future automerger merge conflict between aosp,
|
|
// downstream branches. The CtsHostsideNetworkTestsAppNext target will not exist in
|
|
// some downstream branches, but it should exist in aosp and some downstream branches.
|
|
|
|
package {
|
|
default_team: "trendy_team_fwk_core_networking",
|
|
default_applicable_licenses: ["Android-Apache-2.0"],
|
|
}
|
|
|
|
java_test_host {
|
|
name: "CtsHostsideNetworkTests",
|
|
defaults: ["cts_defaults"],
|
|
// Only compile source java files in this apk.
|
|
srcs: [
|
|
"src/**/*.java",
|
|
],
|
|
libs: [
|
|
"net-tests-utils-host-device-common",
|
|
"cts-tradefed",
|
|
"tradefed",
|
|
],
|
|
static_libs: [
|
|
"modules-utils-build-testing",
|
|
],
|
|
// Tag this module as a cts test artifact
|
|
test_suites: [
|
|
"cts",
|
|
"general-tests",
|
|
"mcts-tethering",
|
|
"mts-tethering",
|
|
"sts",
|
|
],
|
|
data: [
|
|
":CtsHostsideNetworkTestsApp",
|
|
":CtsHostsideNetworkTestsApp2",
|
|
":CtsHostsideNetworkCapTestsAppWithoutProperty",
|
|
":CtsHostsideNetworkCapTestsAppWithProperty",
|
|
":CtsHostsideNetworkCapTestsAppSdk33",
|
|
] + next_app_data,
|
|
per_testcase_directory: true,
|
|
}
|