From 75dec5cd75db57a613fa85ff988f05d3cba9218f Mon Sep 17 00:00:00 2001 From: Sundong Ahn Date: Thu, 21 Mar 2019 16:35:46 +0900 Subject: [PATCH] Add Vts test for xsd_config The vts_permission_validate_test and vts_defaultPermissions_validate_test are added for checking xsd schema validation. Bug: 127435354 Test: vts-tradefed run vts -m VtsValidatePermission Test: vts-tradefed run vts -m VtsValidateDefaultPermissions Merged-In: Ib73dcbe4f9c20e0a957be4325d5cfc2b27c64b67 Change-Id: Ib73dcbe4f9c20e0a957be4325d5cfc2b27c64b67 (cherry picked from commit dc15dc8cc0bbaa10f31b3b8118594a559edd0296) --- core/xsd/vts/Android.bp | 34 ++++++++++ core/xsd/vts/Android.mk | 22 +++++++ core/xsd/vts/AndroidTest.xml | 30 +++++++++ core/xsd/vts/ValidatePermission.cpp | 62 +++++++++++++++++++ services/core/xsd/vts/Android.bp | 33 ++++++++++ services/core/xsd/vts/Android.mk | 22 +++++++ services/core/xsd/vts/AndroidTest.xml | 30 +++++++++ .../xsd/vts/ValidateDefaultPermissions.cpp | 28 +++++++++ 8 files changed, 261 insertions(+) create mode 100644 core/xsd/vts/Android.bp create mode 100644 core/xsd/vts/Android.mk create mode 100644 core/xsd/vts/AndroidTest.xml create mode 100644 core/xsd/vts/ValidatePermission.cpp create mode 100644 services/core/xsd/vts/Android.bp create mode 100644 services/core/xsd/vts/Android.mk create mode 100644 services/core/xsd/vts/AndroidTest.xml create mode 100644 services/core/xsd/vts/ValidateDefaultPermissions.cpp diff --git a/core/xsd/vts/Android.bp b/core/xsd/vts/Android.bp new file mode 100644 index 0000000000000..9cf68c1ea703e --- /dev/null +++ b/core/xsd/vts/Android.bp @@ -0,0 +1,34 @@ +// +// Copyright (C) 2019 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. +// + +cc_test { + name: "vts_permission_validate_test", + srcs: [ + "ValidatePermission.cpp" + ], + static_libs: [ + "android.hardware.audio.common.test.utility", + "libxml2", + ], + shared_libs: [ + "liblog", + "libbase", + ], + cflags: [ + "-Wall", + "-Werror", + ], +} diff --git a/core/xsd/vts/Android.mk b/core/xsd/vts/Android.mk new file mode 100644 index 0000000000000..a5754a494d94c --- /dev/null +++ b/core/xsd/vts/Android.mk @@ -0,0 +1,22 @@ +# +# Copyright (C) 2019 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. +# + +LOCAL_PATH := $(call my-dir) + +include $(CLEAR_VARS) + +LOCAL_MODULE := VtsValidatePermission +include test/vts/tools/build/Android.host_config.mk diff --git a/core/xsd/vts/AndroidTest.xml b/core/xsd/vts/AndroidTest.xml new file mode 100644 index 0000000000000..e5cc9a0f74ee9 --- /dev/null +++ b/core/xsd/vts/AndroidTest.xml @@ -0,0 +1,30 @@ + + + + diff --git a/core/xsd/vts/ValidatePermission.cpp b/core/xsd/vts/ValidatePermission.cpp new file mode 100644 index 0000000000000..34996890000be --- /dev/null +++ b/core/xsd/vts/ValidatePermission.cpp @@ -0,0 +1,62 @@ +/* + * Copyright (C) 2019 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 +#include +#include +#include +#include +#include +#include + +#include "android-base/logging.h" +#include "utility/ValidateXml.h" + +static void get_files_in_dirs(const char* dir_path, std::vector& files) { + DIR* d; + struct dirent* de; + + d = opendir(dir_path); + if (d == nullptr) { + return; + } + + while ((de = readdir(d))) { + if (de->d_type != DT_REG) { + continue; + } + if (std::regex_match(de->d_name, std::regex("(.*)(.xml)"))) { + files.push_back(de->d_name); + } + } + closedir(d); +} + +TEST(CheckConfig, permission) { + RecordProperty("description", + "Verify that the permission file " + "is valid according to the schema"); + + const char* location = "/vendor/etc/permissions"; + + std::vector files; + get_files_in_dirs(location, files); + + for (std::string file_name : files) { + EXPECT_ONE_VALID_XML_MULTIPLE_LOCATIONS(file_name.c_str(), {location}, + "/data/local/tmp/permission.xsd"); + } +} diff --git a/services/core/xsd/vts/Android.bp b/services/core/xsd/vts/Android.bp new file mode 100644 index 0000000000000..967750ddc5de1 --- /dev/null +++ b/services/core/xsd/vts/Android.bp @@ -0,0 +1,33 @@ +// +// Copyright (C) 2019 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. +// + +cc_test { + name: "vts_defaultPermissions_validate_test", + srcs: [ + "ValidateDefaultPermissions.cpp" + ], + static_libs: [ + "android.hardware.audio.common.test.utility", + "libxml2", + ], + shared_libs: [ + "liblog", + ], + cflags: [ + "-Wall", + "-Werror", + ], +} diff --git a/services/core/xsd/vts/Android.mk b/services/core/xsd/vts/Android.mk new file mode 100644 index 0000000000000..6dc2c437a2f9f --- /dev/null +++ b/services/core/xsd/vts/Android.mk @@ -0,0 +1,22 @@ +# +# Copyright (C) 2019 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. +# + +LOCAL_PATH := $(call my-dir) + +include $(CLEAR_VARS) + +LOCAL_MODULE := VtsValidateDefaultPermissions +include test/vts/tools/build/Android.host_config.mk diff --git a/services/core/xsd/vts/AndroidTest.xml b/services/core/xsd/vts/AndroidTest.xml new file mode 100644 index 0000000000000..4f3b2ef1ace14 --- /dev/null +++ b/services/core/xsd/vts/AndroidTest.xml @@ -0,0 +1,30 @@ + + + + diff --git a/services/core/xsd/vts/ValidateDefaultPermissions.cpp b/services/core/xsd/vts/ValidateDefaultPermissions.cpp new file mode 100644 index 0000000000000..54c115b14e377 --- /dev/null +++ b/services/core/xsd/vts/ValidateDefaultPermissions.cpp @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2019 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 "utility/ValidateXml.h" + +TEST(CheckConfig, mediaDefaultPermissions) { + RecordProperty("description", + "Verify that the default-permissions file " + "is valid according to the schema"); + + const char* location = "/vendor/etc/default-permissions"; + + EXPECT_ONE_VALID_XML_MULTIPLE_LOCATIONS("default-permissions.xml", {location}, + "/data/local/tmp/default-permissions.xsd"); +}