Move cvd selector unittests to selector subdirectory
Unittests directory will populate unittests for different,
unrelated subcomponents of cvd.
Bug: 252408153
Test: Build and run locally
Change-Id: I2248d0cde02f6bced028fd9070878733d35445ac
diff --git a/host/commands/cvd/unittests/Android.bp b/host/commands/cvd/unittests/Android.bp
index 381d57f..fe60b9c 100644
--- a/host/commands/cvd/unittests/Android.bp
+++ b/host/commands/cvd/unittests/Android.bp
@@ -16,28 +16,3 @@
package {
default_applicable_licenses: ["Android-Apache-2.0"],
}
-
-cc_test_host {
- name: "cvd_db_instance_test",
- srcs: [
- "test_group_record.cpp",
- "test_instance_record.cpp",
- ],
- test_options: {
- unit_test: true,
- },
- defaults: ["cvd_and_fetch_cvd_defaults"],
-}
-
-cc_test_host {
- name: "cvd_db_test",
- srcs: [
- "instance_database_test_helper.cpp",
- "test_id_allocator.cpp",
- "test_instance_database.cpp",
- ],
- test_options: {
- unit_test: true,
- },
- defaults: ["cvd_and_fetch_cvd_defaults"],
-}
diff --git a/host/commands/cvd/unittests/selector/Android.bp b/host/commands/cvd/unittests/selector/Android.bp
new file mode 100644
index 0000000..381d57f
--- /dev/null
+++ b/host/commands/cvd/unittests/selector/Android.bp
@@ -0,0 +1,43 @@
+//
+// Copyright (C) 2022 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.
+
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+cc_test_host {
+ name: "cvd_db_instance_test",
+ srcs: [
+ "test_group_record.cpp",
+ "test_instance_record.cpp",
+ ],
+ test_options: {
+ unit_test: true,
+ },
+ defaults: ["cvd_and_fetch_cvd_defaults"],
+}
+
+cc_test_host {
+ name: "cvd_db_test",
+ srcs: [
+ "instance_database_test_helper.cpp",
+ "test_id_allocator.cpp",
+ "test_instance_database.cpp",
+ ],
+ test_options: {
+ unit_test: true,
+ },
+ defaults: ["cvd_and_fetch_cvd_defaults"],
+}
diff --git a/host/commands/cvd/unittests/instance_database_test_helper.cpp b/host/commands/cvd/unittests/selector/instance_database_test_helper.cpp
similarity index 98%
rename from host/commands/cvd/unittests/instance_database_test_helper.cpp
rename to host/commands/cvd/unittests/selector/instance_database_test_helper.cpp
index ac7409e..164f942 100644
--- a/host/commands/cvd/unittests/instance_database_test_helper.cpp
+++ b/host/commands/cvd/unittests/selector/instance_database_test_helper.cpp
@@ -13,7 +13,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "host/commands/cvd/unittests/instance_database_test_helper.h"
+#include "host/commands/cvd/unittests/selector/instance_database_test_helper.h"
#include <algorithm>
#include <cstdio>
diff --git a/host/commands/cvd/unittests/instance_database_test_helper.h b/host/commands/cvd/unittests/selector/instance_database_test_helper.h
similarity index 100%
rename from host/commands/cvd/unittests/instance_database_test_helper.h
rename to host/commands/cvd/unittests/selector/instance_database_test_helper.h
diff --git a/host/commands/cvd/unittests/test_group_record.cpp b/host/commands/cvd/unittests/selector/test_group_record.cpp
similarity index 100%
rename from host/commands/cvd/unittests/test_group_record.cpp
rename to host/commands/cvd/unittests/selector/test_group_record.cpp
diff --git a/host/commands/cvd/unittests/test_id_allocator.cpp b/host/commands/cvd/unittests/selector/test_id_allocator.cpp
similarity index 100%
rename from host/commands/cvd/unittests/test_id_allocator.cpp
rename to host/commands/cvd/unittests/selector/test_id_allocator.cpp
diff --git a/host/commands/cvd/unittests/test_instance_database.cpp b/host/commands/cvd/unittests/selector/test_instance_database.cpp
similarity index 98%
rename from host/commands/cvd/unittests/test_instance_database.cpp
rename to host/commands/cvd/unittests/selector/test_instance_database.cpp
index 1b34d45..1c6b293 100644
--- a/host/commands/cvd/unittests/test_instance_database.cpp
+++ b/host/commands/cvd/unittests/selector/test_instance_database.cpp
@@ -21,7 +21,7 @@
#include "common/libs/utils/files.h"
#include "host/commands/cvd/instance_database.h"
#include "host/commands/cvd/selector/selector_constants.h"
-#include "host/commands/cvd/unittests/instance_database_test_helper.h"
+#include "host/commands/cvd/unittests/selector/instance_database_test_helper.h"
/*
* SetUp creates a mock ANDROID_HOST_OUT directory where there is
diff --git a/host/commands/cvd/unittests/test_instance_record.cpp b/host/commands/cvd/unittests/selector/test_instance_record.cpp
similarity index 100%
rename from host/commands/cvd/unittests/test_instance_record.cpp
rename to host/commands/cvd/unittests/selector/test_instance_record.cpp
