Revert "Revert "Modify NNAPI VTS tests to run on version 1.3" am: 64f9eb4bd5 am: 7973d7dec5 am: 8bde98b027"
This reverts commit 496320b1ec72f861ebd59d3f9ad4615ce9c80564.
Reason for revert: revert of a cherry-pick broke master
Change-Id: I4654dc75c17f8801103015dc1da91663dfa28d52
diff --git a/neuralnetworks/1.3/vts/functional/BasicTests.cpp b/neuralnetworks/1.3/vts/functional/BasicTests.cpp
index 8e82c53..b64dc2f 100644
--- a/neuralnetworks/1.3/vts/functional/BasicTests.cpp
+++ b/neuralnetworks/1.3/vts/functional/BasicTests.cpp
@@ -18,11 +18,14 @@
#include "VtsHalNeuralnetworks.h"
-namespace android::hardware::neuralnetworks::V1_2::vts::functional {
+namespace android::hardware::neuralnetworks::V1_3::vts::functional {
using V1_0::DeviceStatus;
using V1_0::ErrorStatus;
using V1_0::PerformanceInfo;
+using V1_2::Constant;
+using V1_2::DeviceType;
+using V1_2::Extension;
// create device test
TEST_P(NeuralnetworksHidlTest, CreateDevice) {}
@@ -37,7 +40,7 @@
// initialization
TEST_P(NeuralnetworksHidlTest, GetCapabilitiesTest) {
using OperandPerformance = Capabilities::OperandPerformance;
- Return<void> ret = kDevice->getCapabilities_1_2([](ErrorStatus status,
+ Return<void> ret = kDevice->getCapabilities_1_3([](ErrorStatus status,
const Capabilities& capabilities) {
EXPECT_EQ(ErrorStatus::NONE, status);
@@ -58,57 +61,4 @@
});
EXPECT_TRUE(ret.isOk());
}
-
-// device version test
-TEST_P(NeuralnetworksHidlTest, GetDeviceVersionStringTest) {
- Return<void> ret =
- kDevice->getVersionString([](ErrorStatus status, const hidl_string& version) {
- EXPECT_EQ(ErrorStatus::NONE, status);
- EXPECT_LT(0, version.size());
- });
- EXPECT_TRUE(ret.isOk());
-}
-
-// device type test
-TEST_P(NeuralnetworksHidlTest, GetDeviceTypeTest) {
- Return<void> ret = kDevice->getType([](ErrorStatus status, DeviceType type) {
- EXPECT_EQ(ErrorStatus::NONE, status);
- EXPECT_TRUE(type == DeviceType::OTHER || type == DeviceType::CPU ||
- type == DeviceType::GPU || type == DeviceType::ACCELERATOR);
- });
- EXPECT_TRUE(ret.isOk());
-}
-
-// device supported extensions test
-TEST_P(NeuralnetworksHidlTest, GetDeviceSupportedExtensionsTest) {
- Return<void> ret = kDevice->getSupportedExtensions(
- [](ErrorStatus status, const hidl_vec<Extension>& extensions) {
- EXPECT_EQ(ErrorStatus::NONE, status);
- for (auto& extension : extensions) {
- std::string extensionName = extension.name;
- EXPECT_FALSE(extensionName.empty());
- for (char c : extensionName) {
- EXPECT_TRUE(('a' <= c && c <= 'z') || ('0' <= c && c <= '9') || c == '_' ||
- c == '.')
- << "Extension name contains an illegal character: " << c;
- }
- EXPECT_NE(extensionName.find('.'), std::string::npos)
- << "Extension name must start with the reverse domain name of the "
- "vendor";
- }
- });
- EXPECT_TRUE(ret.isOk());
-}
-
-// getNumberOfCacheFilesNeeded test
-TEST_P(NeuralnetworksHidlTest, getNumberOfCacheFilesNeeded) {
- Return<void> ret = kDevice->getNumberOfCacheFilesNeeded(
- [](ErrorStatus status, uint32_t numModelCache, uint32_t numDataCache) {
- EXPECT_EQ(ErrorStatus::NONE, status);
- EXPECT_LE(numModelCache,
- static_cast<uint32_t>(Constant::MAX_NUMBER_OF_CACHE_FILES));
- EXPECT_LE(numDataCache, static_cast<uint32_t>(Constant::MAX_NUMBER_OF_CACHE_FILES));
- });
- EXPECT_TRUE(ret.isOk());
-}
-} // namespace android::hardware::neuralnetworks::V1_2::vts::functional
+} // namespace android::hardware::neuralnetworks::V1_3::vts::functional