Merge "SecurityTest: Remove FakeStorageModule" (3a0e9109) · Commits · e / os / android_packages_modules_Bluetooth

system/gd/security/record/security_record_storage_test.cc

+11 −6

Original line number	Diff line number	Diff line
		@@ -18,21 +18,26 @@

		#include <gtest/gtest.h>

		#include "security/test/fake_storage_module.h"
		#include "storage/storage_module.h"

		namespace bluetooth {
		namespace security {
		namespace record {
		namespace {

		static const std::chrono::milliseconds kTestConfigSaveDelay = std::chrono::milliseconds(100);

		using storage::StorageModule;

		class DISABLED_SecurityRecordStorageTest : public ::testing::Test {
		protected:
		void SetUp() override {
		// Make Fake storage module
		storage_module_ = new FakeStorageModule();
		// Make storage module
		storage_module_ =
		new StorageModule("/tmp/temp_config.txt", kTestConfigSaveDelay, 100, false, false);

		// Inject
		fake_registry_.InjectTestModule(&storage::StorageModule::Factory, storage_module_);
		fake_registry_.InjectTestModule(&StorageModule::Factory, storage_module_);

		// Make storage
		record_storage_ = new record::SecurityRecordStorage(storage_module_, handler_);
		@@ -45,13 +50,13 @@ class DISABLED_SecurityRecordStorageTest : public ::testing::Test {
		}

		void synchronize() {
		fake_registry_.SynchronizeModuleHandler(&FakeStorageModule::Factory, std::chrono::milliseconds(20));
		fake_registry_.SynchronizeModuleHandler(&StorageModule::Factory, std::chrono::milliseconds(20));
		}

		TestModuleRegistry fake_registry_;
		os::Thread& thread_ = fake_registry_.GetTestThread();
		os::Handler* handler_ = nullptr;
		FakeStorageModule* storage_module_;
		StorageModule* storage_module_;
		record::SecurityRecordStorage* record_storage_;
		};

deleted100644 → 0

+0 −42

Original line number	Diff line number	Diff line
		/*
		*
		* Copyright 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 "storage/storage_module.h"

		#include <filesystem>

		namespace bluetooth {
		namespace security {

		static const std::chrono::milliseconds kTestConfigSaveDelay = std::chrono::milliseconds(100);

		class FakeStorageModule : public storage::StorageModule {
		public:
		FakeStorageModule() : storage::StorageModule("/tmp/temp_config.txt", kTestConfigSaveDelay, 100, false, false) {}

		storage::ConfigCache* GetConfigCachePublic() {
		return StorageModule::GetConfigCache();
		}

		void SaveImmediatelyPublic() {
		StorageModule::SaveImmediately();
		}
		};

		} // namespace security
		} // namespace bluetooth