Clean up libcutils/libutils tests.

Move tests in the same directory as the corresponding code, so it's
easier to see what is/isn't tested.

Fix naming of libcutils_tests (plural) to match the singular that's more
common (even though the plural makes more sense to me).

Add these two to system/core/'s TEST_MAPPING.

Remove obsolete AndroidTest.xml.

Fix a flaky (timing-dependent) libcutils test.

Test: ran tests
Change-Id: I7e0a31ff45c8a152562bf66fc97161594249366e

1 files changed, 0 insertions, 58 deletions

diff --git a/libutils/tests/StrongPointer_test.cpp b/libutils/tests/StrongPointer_test.cpp
deleted file mode 100644
index 153cf9683..000000000
--- a/libutils/tests/StrongPointer_test.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2015 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.
- */
-
-#include <gtest/gtest.h>
-
-#include <utils/StrongPointer.h>
-#include <utils/RefBase.h>
-
-using namespace android;
-
-class SPFoo : public LightRefBase<SPFoo> {
-public:
-    explicit SPFoo(bool* deleted_check) : mDeleted(deleted_check) {
-        *mDeleted = false;
-    }
-
-    ~SPFoo() {
-        *mDeleted = true;
-    }
-private:
-    bool* mDeleted;
-};
-
-TEST(StrongPointer, move) {
-    bool isDeleted;
-    SPFoo* foo = new SPFoo(&isDeleted);
-    ASSERT_EQ(0, foo->getStrongCount());
-    ASSERT_FALSE(isDeleted) << "Already deleted...?";
-    sp<SPFoo> sp1(foo);
-    ASSERT_EQ(1, foo->getStrongCount());
-    {
-        sp<SPFoo> sp2 = std::move(sp1);
-        ASSERT_EQ(1, foo->getStrongCount()) << "std::move failed, incremented refcnt";
-        ASSERT_EQ(nullptr, sp1.get()) << "std::move failed, sp1 is still valid";
-        // The strong count isn't increasing, let's double check the old object
-        // is properly reset and doesn't early delete
-        sp1 = std::move(sp2);
-    }
-    ASSERT_FALSE(isDeleted) << "deleted too early! still has a reference!";
-    {
-        // Now let's double check it deletes on time
-        sp<SPFoo> sp2 = std::move(sp1);
-    }
-    ASSERT_TRUE(isDeleted) << "foo was leaked!";
-}