Commit graph android_packages_modules_Co.../tests/unit/Android.bp
Message SHA1
Merge "Add test for EthernetNetworkUpdateRequest" am: 6758a5dfff
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2012897

Change-Id: Ia159ef5459390bb49bb67be26022f942743a20ba

Patrick Rohr   authored and   Automerger Merge Worker   commited 2022-03-09 09:48:38 +00:00
396091b4b1
Merge "Add test for EthernetNetworkUpdateRequest"
Patrick Rohr   authored and   Gerrit Code Review   commited 2022-03-09 09:16:29 +00:00
6758a5dfff
[Resolved conflict] Merge "Merge Android 12L" am: e6953d54a5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2013399

Ignore-AOSP-First: automerger CL from AOSP
Change-Id: Ib5909fcd5078da0beaf399695bc25b28c4eb7918

Xin Li   commited 2022-03-08 17:13:34 +00:00
dc0aa2e9bf
Add test for EthernetNetworkUpdateRequest
Test: atest EthernetNetworkUpdateRequest
Change-Id: I2aeacca81f07cf2d73814d20fc9e63e9f1a65843

Patrick Rohr   commited 2022-03-08 16:29:43 +01:00
30d33f4ee3
Merge "Remove unused libraries" am: e4848734a9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2005450

Change-Id: I831ada348828d28c4abcd961932bdbb7c0c4ec07

Jean Chalard   authored and   Automerger Merge Worker   commited 2022-03-02 08:21:36 +00:00
fb73190bd6
Merge "Remove unused libraries" am: e4848734a9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2005450

Change-Id: I94d1fa0167c143478938342f6d4d41e7a6bdf894

Jean Chalard   authored and   Automerger Merge Worker   commited 2022-03-02 08:19:29 +00:00
0e4e270314
Merge "Remove unused libraries"
Jean Chalard   authored and   Gerrit Code Review   commited 2022-03-02 07:48:51 +00:00
e4848734a9
Remove unused libraries
Test: m, TH
Change-Id: I59c0f8ecc94837635758c7667ea6413a5e6a7e81

Chalard Jean   commited 2022-03-02 14:32:38 +09:00
1f3e110ae6
Add JNI stats libraries to connectivity am: d95048929c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1987449

Change-Id: Ibae3c96be03017135b9aff4caf6f3f5f1a86075a

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2022-02-28 06:26:45 +00:00
97edc959c2
Add JNI stats libraries to connectivity am: d95048929c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1987449

Change-Id: Ice5c8e468807a93b334a6c8f25f18bb9c6cf3a2d

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2022-02-28 06:08:41 +00:00
3918a1a8b5
Add JNI stats libraries to connectivity
Add new symbols to libservice-connectivity loaded on T only, and the
framework libraries to apex and tests.

Bug: 197717846
Test: atest FrameworksNetTests
  (cherry-picked and splitting apex Android.bp to aosp/1994130)
Change-Id: Iae44344701a3267110e5cbf271120201134d59e5
Merged-In: Iae44344701a3267110e5cbf271120201134d59e5

Remi NGUYEN VAN   authored and   Junyu Lai   commited 2022-02-28 04:16:17 +00:00
d95048929c
Merge sc-v2-dev-plus-aosp-without-vendor@8084891
Bug: 214455710
Merged-In: I5894450f3089b2ea105722a18ddf8f1eed1c28a0
Change-Id: If2045705da821c90705f7dd1e6944c0bb92e3289

Xin Li   commited 2022-02-11 06:57:49 +00:00
a459e6a12d
Merge "remove unneeded inclusions of libbpf_android" am: 0fc2ec6d68
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1977891

Change-Id: I74d9611f27056e4d37dacfdd55d24fc6ee1d5480

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-02-10 20:16:17 +00:00
2ccd0d527a
remove unneeded inclusions of libbpf_android
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I6aedf507e09effd9076de85a0acc7aaf1b8e4a1e

Maciej Å»enczykowski   commited 2022-02-09 22:10:22 -08:00
11ab996252
Split out connectivity-t-pre-jarjar and tests am: 2ba9dbe163
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1975069

Change-Id: Ia410e89d09c8470469a38afa0442e4b9ce42077f

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2022-02-09 13:08:58 +00:00
c033c24658
Split out connectivity-t-pre-jarjar and tests
The pre-jarjar variant is necessary so that service-t can depend on
hidden symbols in framework-t that reference (for example as parameter)
classes that are jarjared.
Without this, when depending on framework-connectivity-tiramisu.impl,
service-connectivity-t would see post-jarjar symbols that do not match
the classnames it uses in its code.

Also split FrameworksNetTestsLib so that the same jarjar rules can be
applied between the tests and the module, avoiding different errors
between FrameworksNetTests and ConnectivityCoverageTests.

Ignore-AOSP-First: Avoiding conflicts; cherry-pick will follow
Bug: 204830222
Test: m
Change-Id: I3d0c081c4a7422e128beee11c0156f01b0377c96
Merged-In: I3d0c081c4a7422e128beee11c0156f01b0377c96

Remi NGUYEN VAN   authored and   junyulai   commited 2022-02-09 18:29:30 +08:00
2ba9dbe163
Merge changes from topic "dscp_policies" am: 2a947ceb50
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1963241

Change-Id: Ibf006cef2191a407978edbae20ac9910e03a7be5

Lorenzo Colitti   authored and   Automerger Merge Worker   commited 2022-01-27 23:37:51 +00:00
aa8facf3ac
Allow using BpfMap and TcUtils in unit tests.
Create a Java library that allows the BpfMap class and the
TcUtils class to find their JNI code when they are jarjard to the
package name we use in our unit tests.

Test: atest ConnectivityServiceTest
Change-Id: I2f17b1c366b2b8164eac34b94c9659bc7c0f68e0

Lorenzo Colitti   commited 2022-01-27 10:18:35 +00:00
0c26c9ed37
Merge "[MS59.2] Add unit test for NetworkStatsDataMigrationUtils" am: bfdd0f3c3c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1958907

Change-Id: Ie4255d82cf593a848e1ef64c88dd43e5839b955e

Junyu Lai   authored and   Automerger Merge Worker   commited 2022-01-27 09:35:03 +00:00
11124c2106
Merge "[MS59.2] Add unit test for NetworkStatsDataMigrationUtils"
Junyu Lai   authored and   Gerrit Code Review   commited 2022-01-27 09:20:10 +00:00
bfdd0f3c3c
Merge "Set exclude_kotlinc_generated_files to false explicitly since kotlin reflection is used in some Connectivity test cases kotlin code." am: c7231f3e79
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1950403

Change-Id: I39e10504317c52c43c15c07f8884bf3dc2685bdf

Wei Li   authored and   Automerger Merge Worker   commited 2022-01-27 00:38:05 +00:00
386dc4008d
Set exclude_kotlinc_generated_files to false explicitly since kotlin reflection is used in some Connectivity test cases kotlin code.
Property "exclude_kotlinc_generated_files" is recently added to exclude some kotlinc generated files that are not needed if kotlin reflection is not used. Currently it defaults to false since there are test failures(b/213966211) which is in FullScoreTest#testToString and FullScoreTest#testMinMaxPolicyConstants that uses kotlin reflection and fails if exclude_kotlinc_generated_files defaults to true. By setting explicitly exclude_kotlinc_generated_files to false on tests like FullScoreTest#testToString, we will be able to finally default this property to true so the kotlinc generated files can be removed for most modules that don't need them.
Bug: 204888276
Bug: 213966211
Test: atest
FrameworksNetTests: com.android.server.connectivity.FullScoreTest
Change-Id: I4ed2d27c27841cb7127f669c8db34c90b4a41b1f

Wei Li   commited 2022-01-26 18:25:23 +00:00
8a177f694a
[MS59.2] Add unit test for NetworkStatsDataMigrationUtils
Test: atest NetworkStatsDataMigrationUtilsTest
Bug: 204830222
Change-Id: Ia6e8aec9a828072a2a1e63bec600c2e20d3699b3

junyulai   authored and   Junyu Lai   commited 2022-01-26 16:53:06 +00:00
a1bb3a36cd
Merge changes from topic "libnetworkstats" am: e1f8ad4d59
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1958140

Change-Id: I9efbd8c0bfffc1b7ca779de2978dec3e01da48cb

Maciej Å»enczykowski   authored and   Automerger Merge Worker   commited 2022-01-26 00:04:29 +00:00
3495b52981
Merge changes from topic "libnetworkstats"
* changes:
  Rename libnetdbpf to libnetworkstats
  Copy libnetdbpf from system/net to tethering module

Maciej Å»enczykowski   authored and   Gerrit Code Review   commited 2022-01-25 23:52:06 +00:00
e1f8ad4d59
Merge "[MS67.2] Modify tests for registerUsageCallback" am: 3f9584bfda
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1958145

Change-Id: I1986a2bd9096c98378ee4b85a9150d7d0fc27a6f

Junyu Lai   authored and   Automerger Merge Worker   commited 2022-01-25 01:37:22 +00:00
ba4588b638
Merge "[MS67.2] Modify tests for registerUsageCallback"
Junyu Lai   authored and   Gerrit Code Review   commited 2022-01-25 01:23:45 +00:00
3f9584bfda
Merge "Add unit test for BpfInterfaceMapUpdate" am: d512ec646c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1956062

Change-Id: I459e219d0940c85d58577de5dedfc5deab3d143e

Maciej Å»enczykowski   authored and   Automerger Merge Worker   commited 2022-01-24 19:23:45 +00:00
6c6cf9fecb
[MS67.2] Modify tests for registerUsageCallback
Test: atest FrameworksNetTests
Bug: 204830222
Change-Id: Ia4ff535cd703807516d65b582727684cbb670360

junyulai   commited 2022-01-24 18:59:23 +08:00
f8a1d3e5e6
Rename libnetdbpf to libnetworkstats
Two reason for renaming:
1. Avoid module name collision in sc-mainline-prod branch.
2. The libnetdbpf was misnamed before.

Bug: 202086915
Test: atest libnetworkstats_test FrameworksNetTests
      ConnectivityCoverageTests FrameworksNetSmokeTests
      CtsAppOpsTestCases
Change-Id: I87fcf4b1a9d58780a45743a9aa91b9b936e54266

Ken Chen   commited 2022-01-24 11:53:59 +08:00
f426b2b287
Add unit test for BpfInterfaceMapUpdate
Bug: 215095957
Test: atest FrameworkNetTests

Change-Id: I92d45e5a606f466ce42504629cb3f87fd9e25d22

markchien   commited 2022-01-21 23:34:25 +08:00
adf119a8ed
Merge "Build framework-connectivity-tiramisu library"
Paul Hu   authored and   Gerrit Code Review   commited 2022-01-20 03:02:56 +00:00
a77cad355b
Build framework-connectivity-tiramisu library
- Move nsd APIs and build framework-connectivity-tiramisu library
- Add nsd associated hidden apis
- Build service-connectivity-tiramisu-pre-jarjar library for
  T+ services.
- Move ConnectivityServiceInitialiizer to service-t directory
  to create S+ service instances which can avoid dependency on
  lower sdk library.

Bug: 206893064
Test: atest FrameworksNetTests CtsNetTestCases
Ignore-AOSP-First: Other commits has merged conflict.
CTS-Coverage-Bug: 207804007
Merged-In: I9628716f5c38047ff4ea2346b27589077259c436
Change-Id: I9628716f5c38047ff4ea2346b27589077259c436

paulhu   commited 2021-12-20 16:31:07 +08:00
49ccb6a5cc
Merge "Rename libbpf to libbpf_bcc" am: e44ea016e1 am: 7bf5e61c37 am: 05d00b50fd
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1906032

Change-Id: Ia0bba1c182fe43b01126e88f86f97c9c09163e59

Treehugger Robot   authored and   Automerger Merge Worker   commited 2021-12-17 01:30:27 +00:00
e48a86422a
Merge "Rename libbpf to libbpf_bcc"
Treehugger Robot   authored and   Gerrit Code Review   commited 2021-12-17 00:37:05 +00:00
e44ea016e1
Build framework-connectivity-tiramisu library
- Move nsd APIs and build framework-connectivity-tiramisu library
- Add nsd associated hidden apis
- Build service-connectivity-tiramisu-pre-jarjar library for
  T+ services.
- Move ConnectivityServiceInitialiizer to service-t directory
  to create S+ service instances which can avoid dependency on
  lower sdk library.

Bug: 206893064
Test: atest FrameworksNetTests CtsNetTestCases
CTS-Coverage-Bug: 207804007
Merged-In: I9628716f5c38047ff4ea2346b27589077259c436
Change-Id: I9628716f5c38047ff4ea2346b27589077259c436

paulhu   commited 2021-12-17 00:04:24 +08:00
802ab9760f
Merge "DO NOT MERGE Rename libbpf to libbpf_bcc" into sc-mainline-prod
Maciej Å»enczykowski   authored and   Android (Google) Code Review   commited 2021-12-16 15:26:52 +00:00
b38b63df3c
Merge "[MS07.2] Move NetworkStatsCollection/IdentitySet into frameworks" am: 7577131341 am: a9656625d2 am: bb49fe4bef
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1895330

Change-Id: Id03f0efb4d052fd2da6bfd3d50bbb9a94cd299da

Treehugger Robot   authored and   Automerger Merge Worker   commited 2021-12-10 19:35:17 +00:00
23ec69be0f
Merge "[MS07.2] Move NetworkStatsCollection/IdentitySet into frameworks" am: 7577131341
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1895330

Change-Id: I0201841996260b719dffd8577fd979cce4ebc26b

Treehugger Robot   authored and   Automerger Merge Worker   commited 2021-12-10 19:12:44 +00:00
f945467c54
[MS07.2] Move NetworkStatsCollection/IdentitySet into frameworks
These files are needed for the data migration util system Api
interfaces. Thus, they need to be moved into frameworks folder.

This change also set the @IgnoreUpTo annotation to S, since
these tests are testing purely platform code on S- devices which
is not really necessary for MTS. Also the tests are still covered
by the unit tests, since they are always verifying HEAD.

Test: TH
Bug: 197717846
Change-Id: I93c19b4860864c724be9f9f889ee2173f4605198

Junyu Lai   commited 2021-12-09 08:43:16 +00:00
e9710f0918
DO NOT MERGE Rename libbpf to libbpf_bcc
This is to prevent a name collision with "upstream"
libbpf (external/libbpf) which is built using the same name.

Bug: 203823368
Test: m FrameworksNetTests
Ignore-AOSP-First: Automerger splits topic if not merged here first
Signed-off-by: Connor O'Brien <connoro@google.com>
Change-Id: I9a009493fe0482967ab1f92516514715cfd457d6

Connor O'Brien   commited 2021-12-08 00:43:45 +00:00
9e38c70139
Rename libbpf to libbpf_bcc
This is to prevent a name collision with "upstream"
libbpf (external/libbpf) which is built using the same name.

Bug: 203823368
Test: m FrameworksNetTests
Signed-off-by: Connor O'Brien <connoro@google.com>
Change-Id: I9a009493fe0482967ab1f92516514715cfd457d6

Connor O'Brien   commited 2021-12-07 23:05:24 +00:00
e0a64bb50c
Remove unused service and test dependencies am: f96ecf2708 am: e03f77170a am: 7d865f3e10
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1895317

Change-Id: I22260179985637d82e20b346786bed44148e5dc2

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2021-11-19 16:27:47 +00:00
d1ed21007a
Remove unused service and test dependencies am: f96ecf2708
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1895317

Change-Id: Ifd69656d8c4292f89e61d1cb88f69d7e085463ff

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2021-11-19 15:58:54 +00:00
4b213f57c9
Remove unused service and test dependencies
Nothing uses StateMachine in service-connectivity, and
FrameworksNetTestsLib pulled a lot of unused dependencies with
services.core and services.net.

Remove unused dependencies. This helps measure code coverage more
accurately.

Bug: 207020032
Test: atest ConnectivityCoverageTests
Change-Id: I39857865594a3263c4b1deeda23312c8e4f86a77

Remi NGUYEN VAN   commited 2021-11-19 21:14:39 +09:00
f96ecf2708
DO NOT MERGE: Disable FrameworksNetTests
Disable FrameworksNetTest because platform code might have
newer change that the test depends on it so the test cannot
verify the behavior since the change does not exist in module
branch. Therefore, disable it for module branch.

Ignore-AOSP-First: Disable test for module branch only.
Bug: 201265286
Test: make FrameworksNetTests fails with "unknown target" error
Change-Id: I363bd13ce48b5486262415b78b4fcb8218640725

Aaron Huang   commited 2021-10-04 18:59:14 +08:00
6d6d45127b
Merge "Enable/disable FrameworksNetTests" am: d1ed1cb8b7 am: 045f47bc31 am: 3820c8b69c am: c502fa51d4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1843117

Change-Id: Ic342b4ecb4541c1e58200112dc5bc092b9ab8f2f

Aaron Huang   authored and   Automerger Merge Worker   commited 2021-10-04 08:46:40 +00:00
e75927b122
Merge "Enable/disable FrameworksNetTests" am: d1ed1cb8b7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1843117

Change-Id: Ida093c6792bed45d5f65e3ea0e567eb30de74807

Aaron Huang   authored and   Automerger Merge Worker   commited 2021-10-04 08:07:21 +00:00
045f47bc31
Merge "Enable/disable FrameworksNetTests"
Aaron Huang   authored and   Gerrit Code Review   commited 2021-10-04 07:53:09 +00:00
d1ed1cb8b7
Enable/disable FrameworksNetTests
Currently, there are some test for classes that are not in
connectivity module. If the platform code has a new change
that the test depends on it, then the test cannot verify the
behavior since the change does not exist in module branch.

This change moves the test for non-module classes out of
FrameworksNetTestsLib so that it doesn't go into coverage tests.
Then add those tests to FrameworksNetTests and use a variable
to enable/disable FrameworksNetTests which could minimize merge
conflicts.

Bug: 201265286
Test: make FrameworksNetTests

Change-Id: Ia9669da2c4d79054710e7f4173bc960e3f77f45a

Aaron Huang   commited 2021-10-01 19:29:50 +08:00
1ed8affa72