commit 8f41e998cc0e2175bfaa370548f26cc41a6f3199
author Julien Desprez <jdesprez@google.com> Mon Jul 15 11:43:55 2019 -0700
committer Julien Desprez <jdesprez@google.com> Mon Jul 15 14:38:13 2019 -0700
tree 1a0878966cfa75d529e1560752245086d05ee9bb
parent 27688d6959126436b8be95eaabb7ac0334fbfa58

Start moving more tests base to test_framework

Test: unit tests
Bug: 137401530
Change-Id: I077f7b4f7175fcf8e194a5686671138a7daf992f

Android.bp

diff --git a/Android.bp b/Android.bp
index 8827c37..4b6d838 100644
--- a/Android.bp
+++ b/Android.bp
@@ -81,14 +81,14 @@
         "res",
     ],
     static_libs: [
-        "tradefed-core",
+        "tradefed-lib-core",
         "tradefed-test-framework",
     ],
     manifest: "MANIFEST.mf",
 }
 
 java_library_host {
-    name: "tradefed-core",
+    name: "tradefed-lib-core",
     defaults: ["tradefed_defaults"],
     srcs: [
         "src/**/*.java",

test_framework/Android.bp

diff --git a/test_framework/Android.bp b/test_framework/Android.bp
index 861a678..561d9a8 100644
--- a/test_framework/Android.bp
+++ b/test_framework/Android.bp
@@ -19,7 +19,7 @@
         "com/**/*.java",
     ],
     libs: [
-        "tradefed-core",
+        "tradefed-lib-core",
     ],
 }
 

test_framework/com/android/tradefed/testtype/PythonUnitTestResultParser.java

diff --git a/src/com/android/tradefed/testtype/PythonUnitTestResultParser.java b/test_framework/com/android/tradefed/testtype/PythonUnitTestResultParser.java
similarity index 100%
rename from src/com/android/tradefed/testtype/PythonUnitTestResultParser.java
rename to test_framework/com/android/tradefed/testtype/PythonUnitTestResultParser.java

test_framework/com/android/tradefed/testtype/PythonUnitTestRunner.java

diff --git a/src/com/android/tradefed/testtype/PythonUnitTestRunner.java b/test_framework/com/android/tradefed/testtype/PythonUnitTestRunner.java
similarity index 100%
rename from src/com/android/tradefed/testtype/PythonUnitTestRunner.java
rename to test_framework/com/android/tradefed/testtype/PythonUnitTestRunner.java

test_framework/com/android/tradefed/testtype/python/PythonBinaryHostTest.java

diff --git a/src/com/android/tradefed/testtype/python/PythonBinaryHostTest.java b/test_framework/com/android/tradefed/testtype/python/PythonBinaryHostTest.java
similarity index 100%
rename from src/com/android/tradefed/testtype/python/PythonBinaryHostTest.java
rename to test_framework/com/android/tradefed/testtype/python/PythonBinaryHostTest.java

test_framework/com/android/tradefed/testtype/suite/module/CarModuleController.java

diff --git a/src/com/android/tradefed/testtype/suite/module/CarModuleController.java b/test_framework/com/android/tradefed/testtype/suite/module/CarModuleController.java
similarity index 100%
rename from src/com/android/tradefed/testtype/suite/module/CarModuleController.java
rename to test_framework/com/android/tradefed/testtype/suite/module/CarModuleController.java

test_framework/com/android/tradefed/testtype/suite/module/NativeBridgeModuleController.java

diff --git a/src/com/android/tradefed/testtype/suite/module/NativeBridgeModuleController.java b/test_framework/com/android/tradefed/testtype/suite/module/NativeBridgeModuleController.java
similarity index 100%
rename from src/com/android/tradefed/testtype/suite/module/NativeBridgeModuleController.java
rename to test_framework/com/android/tradefed/testtype/suite/module/NativeBridgeModuleController.java

test_framework/com/android/tradefed/testtype/suite/module/TestFailureModuleController.java

diff --git a/src/com/android/tradefed/testtype/suite/module/TestFailureModuleController.java b/test_framework/com/android/tradefed/testtype/suite/module/TestFailureModuleController.java
similarity index 100%
rename from src/com/android/tradefed/testtype/suite/module/TestFailureModuleController.java
rename to test_framework/com/android/tradefed/testtype/suite/module/TestFailureModuleController.java