Merge changes from topic "libprocessgroup" am: 830f837231 am: 98d4fc0d13 (9d8bfd85) · Commits · e / os / android_system_core

libprocessgroup/profiles/Android.bp

+38 −10

Original line number	Diff line number	Diff line
		@@ -29,9 +29,21 @@ prebuilt_etc {
		src: "task_profiles.json",
		}

		cc_defaults {
		name: "libprocessgroup_test_defaults",
		cflags: [
		"-Wall",
		"-Werror",

		// Needed for headers from libprotobuf.
		"-Wno-unused-parameter",
		],
		}

		cc_library_static {
		name: "libprocessgroup_proto",
		host_supported: true,
		defaults: ["libprocessgroup_test_defaults"],
		srcs: [
		"cgroups.proto",
		"task_profiles.proto",
		@@ -40,15 +52,11 @@ cc_library_static {
		type: "full",
		export_proto_headers: true,
		},
		cflags: [
		"-Wall",
		"-Werror",
		"-Wno-unused-parameter",
		],
		}

		cc_test_host {
		name: "libprocessgroup_proto_test",
		defaults: ["libprocessgroup_test_defaults"],
		srcs: [
		"test.cpp",
		],
		@@ -64,11 +72,6 @@ cc_test_host {
		shared_libs: [
		"libprotobuf-cpp-full",
		],
		cflags: [
		"-Wall",
		"-Werror",
		"-Wno-unused-parameter",
		],
		data: [
		"cgroups.json",
		"cgroups.recovery.json",
		@@ -78,3 +81,28 @@ cc_test_host {
		"general-tests",
		],
		}

		cc_test {
		name: "vts_processgroup_validate_test",
		defaults: ["libprocessgroup_test_defaults"],
		srcs: [
		"test_vendor.cpp",
		],
		static_libs: [
		"libgmock",
		"libjsonpbverify",
		"libjsonpbparse",
		"libprocessgroup_proto",
		],
		shared_libs: [
		"libbase",
		"liblog",
		"libjsoncpp",
		"libprotobuf-cpp-full",
		],
		target: {
		android: {
		test_config: "vts_processgroup_validate_test.xml",
		},
		},
		}

libprocessgroup/profiles/Android.mk

0 → 100644

+21 −0

Original line number	Diff line number	Diff line
		#
		# 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 := VtsProcessgroupValidateTest
		-include test/vts/tools/build/Android.host_config.mk

libprocessgroup/profiles/cgroups_test.h

0 → 100644

+71 −0

Original line number	Diff line number	Diff line
		/*
		* 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.
		*/

		#pragma once

		#include <string>

		#include <gmock/gmock.h>
		#include <jsonpb/json_schema_test.h>

		#include "cgroups.pb.h"

		using ::testing::MatchesRegex;

		namespace android {
		namespace profiles {

		class CgroupsTest : public jsonpb::JsonSchemaTest {
		public:
		void SetUp() override {
		JsonSchemaTest::SetUp();
		cgroups_ = static_cast<Cgroups*>(message());
		}
		Cgroups* cgroups_;
		};

		TEST_P(CgroupsTest, CgroupRequiredFields) {
		for (int i = 0; i < cgroups_->cgroups_size(); ++i) {
		auto&& cgroup = cgroups_->cgroups(i);
		EXPECT_FALSE(cgroup.controller().empty())
		<< "No controller name for cgroup #" << i << " in " << file_path_;
		EXPECT_FALSE(cgroup.path().empty()) << "No path for cgroup #" << i << " in " << file_path_;
		}
		}

		TEST_P(CgroupsTest, Cgroup2RequiredFields) {
		if (cgroups_->has_cgroups2()) {
		EXPECT_FALSE(cgroups_->cgroups2().path().empty())
		<< "No path for cgroup2 in " << file_path_;
		}
		}

		// "Mode" field must be in the format of "0xxx".
		static inline constexpr const char* REGEX_MODE = "(0[0-7]{3})?";
		TEST_P(CgroupsTest, CgroupMode) {
		for (int i = 0; i < cgroups_->cgroups_size(); ++i) {
		EXPECT_THAT(cgroups_->cgroups(i).mode(), MatchesRegex(REGEX_MODE))
		<< "For cgroup controller #" << i << " in " << file_path_;
		}
		}

		TEST_P(CgroupsTest, Cgroup2Mode) {
		EXPECT_THAT(cgroups_->cgroups2().mode(), MatchesRegex(REGEX_MODE))
		<< "For cgroups2 in " << file_path_;
		}

		} // namespace profiles
		} // namespace android

libprocessgroup/profiles/task_profiles_test.h

0 → 100644

+65 −0

Original line number	Diff line number	Diff line
		/*
		* 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.
		*/

		#pragma once

		#include <string>

		#include <gmock/gmock.h>
		#include <jsonpb/json_schema_test.h>

		#include "task_profiles.pb.h"

		namespace android {
		namespace profiles {

		class TaskProfilesTest : public jsonpb::JsonSchemaTest {
		public:
		void SetUp() override {
		JsonSchemaTest::SetUp();
		task_profiles_ = static_cast<TaskProfiles*>(message());
		}
		TaskProfiles* task_profiles_;
		};

		TEST_P(TaskProfilesTest, AttributeRequiredFields) {
		for (int i = 0; i < task_profiles_->attributes_size(); ++i) {
		auto&& attribute = task_profiles_->attributes(i);
		EXPECT_FALSE(attribute.name().empty())
		<< "No name for attribute #" << i << " in " << file_path_;
		EXPECT_FALSE(attribute.controller().empty())
		<< "No controller for attribute #" << i << " in " << file_path_;
		EXPECT_FALSE(attribute.file().empty())
		<< "No file for attribute #" << i << " in " << file_path_;
		}
		}

		TEST_P(TaskProfilesTest, ProfileRequiredFields) {
		for (int profile_idx = 0; profile_idx < task_profiles_->profiles_size(); ++profile_idx) {
		auto&& profile = task_profiles_->profiles(profile_idx);
		EXPECT_FALSE(profile.name().empty())
		<< "No name for profile #" << profile_idx << " in " << file_path_;
		for (int action_idx = 0; action_idx < profile.actions_size(); ++action_idx) {
		auto&& action = profile.actions(action_idx);
		EXPECT_FALSE(action.name().empty())
		<< "No name for profiles[" << profile_idx << "].actions[" << action_idx
		<< "] in " << file_path_;
		}
		}
		}

		} // namespace profiles
		} // namespace android

libprocessgroup/profiles/test.cpp

+3 −86

Original line number	Diff line number	Diff line
		@@ -14,18 +14,15 @@
		* limitations under the License.
		*/

		#include <string>

		#include <android-base/file.h>
		#include <gmock/gmock.h>
		#include <gtest/gtest.h>
		#include <jsonpb/json_schema_test.h>

		#include "cgroups.pb.h"
		#include "task_profiles.pb.h"
		#include "cgroups_test.h"
		#include "task_profiles_test.h"

		using namespace ::android::jsonpb;
		using ::android::base::GetExecutableDirectory;
		using ::testing::MatchesRegex;

		namespace android {
		namespace profiles {
		@@ -35,87 +32,7 @@ JsonSchemaTestConfigFactory MakeTestParam(const std::string& path) {
		return jsonpb::MakeTestParam<T>(GetExecutableDirectory() + path);
		}

		TEST(LibProcessgroupProto, EmptyMode) {
		EXPECT_EQ(0, strtoul("", nullptr, 8))
		<< "Empty mode string cannot be silently converted to 0; this should not happen";
		}

		class CgroupsTest : public JsonSchemaTest {
		public:
		void SetUp() override {
		JsonSchemaTest::SetUp();
		cgroups_ = static_cast<Cgroups*>(message());
		}
		Cgroups* cgroups_;
		};

		TEST_P(CgroupsTest, CgroupRequiredFields) {
		for (int i = 0; i < cgroups_->cgroups_size(); ++i) {
		auto&& cgroup = cgroups_->cgroups(i);
		EXPECT_FALSE(cgroup.controller().empty())
		<< "No controller name for cgroup #" << i << " in " << file_path_;
		EXPECT_FALSE(cgroup.path().empty()) << "No path for cgroup #" << i << " in " << file_path_;
		}
		}

		TEST_P(CgroupsTest, Cgroup2RequiredFields) {
		if (cgroups_->has_cgroups2()) {
		EXPECT_FALSE(cgroups_->cgroups2().path().empty())
		<< "No path for cgroup2 in " << file_path_;
		}
		}

		// "Mode" field must be in the format of "0xxx".
		static constexpr const char* REGEX_MODE = "(0[0-7]{3})?";
		TEST_P(CgroupsTest, CgroupMode) {
		for (int i = 0; i < cgroups_->cgroups_size(); ++i) {
		EXPECT_THAT(cgroups_->cgroups(i).mode(), MatchesRegex(REGEX_MODE))
		<< "For cgroup controller #" << i << " in " << file_path_;
		}
		}

		TEST_P(CgroupsTest, Cgroup2Mode) {
		EXPECT_THAT(cgroups_->cgroups2().mode(), MatchesRegex(REGEX_MODE))
		<< "For cgroups2 in " << file_path_;
		}

		class TaskProfilesTest : public JsonSchemaTest {
		public:
		void SetUp() override {
		JsonSchemaTest::SetUp();
		task_profiles_ = static_cast<TaskProfiles*>(message());
		}
		TaskProfiles* task_profiles_;
		};

		TEST_P(TaskProfilesTest, AttributeRequiredFields) {
		for (int i = 0; i < task_profiles_->attributes_size(); ++i) {
		auto&& attribute = task_profiles_->attributes(i);
		EXPECT_FALSE(attribute.name().empty())
		<< "No name for attribute #" << i << " in " << file_path_;
		EXPECT_FALSE(attribute.controller().empty())
		<< "No controller for attribute #" << i << " in " << file_path_;
		EXPECT_FALSE(attribute.file().empty())
		<< "No file for attribute #" << i << " in " << file_path_;
		}
		}

		TEST_P(TaskProfilesTest, ProfileRequiredFields) {
		for (int profile_idx = 0; profile_idx < task_profiles_->profiles_size(); ++profile_idx) {
		auto&& profile = task_profiles_->profiles(profile_idx);
		EXPECT_FALSE(profile.name().empty())
		<< "No name for profile #" << profile_idx << " in " << file_path_;
		for (int action_idx = 0; action_idx < profile.actions_size(); ++action_idx) {
		auto&& action = profile.actions(action_idx);
		EXPECT_FALSE(action.name().empty())
		<< "No name for profiles[" << profile_idx << "].actions[" << action_idx
		<< "] in " << file_path_;
		}
		}
		}

		// Test suite instantiations

		INSTANTIATE_TEST_SUITE_P(, JsonSchemaTest,
		::testing::Values(MakeTestParam<Cgroups>("/cgroups.json"),
		MakeTestParam<Cgroups>("/cgroups.recovery.json"),