Replace test plan xml configs with csuite_test soong targets

Test: make csuite
Change-Id: If43cc5a2549a6d37e72df1ae6e95c1691d45021f

9 files changed, 54 insertions, 66 deletions

diff --git a/harness/src/main/resources/config/csuite-app-launch.xml b/harness/src/main/resources/config/csuite-app-launch.xml
deleted file mode 100644
index 6913382..0000000
--- a/harness/src/main/resources/config/csuite-app-launch.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2020 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.
--->
-<configuration description="C-Suite Compatibility Launch Test Plan">
-  <test class="com.android.csuite.config.ModuleGenerator"  >
-    <option name="template" value="config/csuite-app-launch.xml.template" />
-  </test>
-  <include name="csuite-base" />
-  <option name="plan" value="csuite-app-launch" />
-</configuration>
diff --git a/harness/src/main/resources/config/csuite-system-app-launch.xml b/harness/src/main/resources/config/csuite-system-app-launch.xml
deleted file mode 100644
index 816ad8c..0000000
--- a/harness/src/main/resources/config/csuite-system-app-launch.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2020 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.
--->
-<configuration description="C-Suite Compatibility Launch Test Plan">
-  <test class="com.android.csuite.config.ModuleGenerator"  >
-    <option name="template" value="config/csuite-system-app-launch.xml.template" />
-  </test>
-  <include name="csuite-base" />
-  <option name="plan" value="csuite-system-app-launch" />
-</configuration>
\ No newline at end of file
diff --git a/harness/src/main/resources/config/csuite-test-package-launch.xml b/harness/src/main/resources/config/csuite-test-package-launch.xml
deleted file mode 100644
index 27c310a..0000000
--- a/harness/src/main/resources/config/csuite-test-package-launch.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2020 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.
--->
-<configuration description="C-Suite Compatibility Launch Test Plan">
-  <test class="com.android.csuite.config.ModuleGenerator"  >
-    <option name="template" value="config/csuite-test-package-launch.xml.template" />
-  </test>
-  <include name="csuite-base" />
-  <option name="plan" value="csuite-test-package-launch" />
-</configuration>
\ No newline at end of file
diff --git a/tests/csuite-app-launch/Android.bp b/tests/csuite-app-launch/Android.bp
new file mode 100644
index 0000000..b5a49b2
--- /dev/null
+++ b/tests/csuite-app-launch/Android.bp
@@ -0,0 +1,18 @@
+// Copyright (C) 2021 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.
+
+csuite_test {
+  name: "csuite-app-launch",
+  test_config_template: "template.xml"
+}
diff --git a/harness/src/main/resources/config/csuite-app-launch.xml.template b/tests/csuite-app-launch/template.xml
index 52c4611..52c4611 100644
--- a/harness/src/main/resources/config/csuite-app-launch.xml.template
+++ b/tests/csuite-app-launch/template.xml
diff --git a/tests/csuite-system-app-launch/Android.bp b/tests/csuite-system-app-launch/Android.bp
new file mode 100644
index 0000000..bf13297
--- /dev/null
+++ b/tests/csuite-system-app-launch/Android.bp
@@ -0,0 +1,18 @@
+// Copyright (C) 2021 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.
+
+csuite_test {
+  name: "csuite-system-app-launch",
+  test_config_template: "template.xml"
+}
diff --git a/harness/src/main/resources/config/csuite-system-app-launch.xml.template b/tests/csuite-system-app-launch/template.xml
index 4d1181b..4d1181b 100644
--- a/harness/src/main/resources/config/csuite-system-app-launch.xml.template
+++ b/tests/csuite-system-app-launch/template.xml
diff --git a/tests/csuite-test-package-launch/Android.bp b/tests/csuite-test-package-launch/Android.bp
new file mode 100644
index 0000000..5f9caff
--- /dev/null
+++ b/tests/csuite-test-package-launch/Android.bp
@@ -0,0 +1,18 @@
+// Copyright (C) 2021 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.
+
+csuite_test {
+  name: "csuite-test-package-launch",
+  test_config_template: "template.xml"
+}
diff --git a/harness/src/main/resources/config/csuite-test-package-launch.xml.template b/tests/csuite-test-package-launch/template.xml
index 9c97fd3..9c97fd3 100644
--- a/harness/src/main/resources/config/csuite-test-package-launch.xml.template
+++ b/tests/csuite-test-package-launch/template.xml