Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dcbfc6b8 authored by Myles Watson's avatar Myles Watson
Browse files

SecurityTest: Remove FakeStorageModule 

Bug: 260006855
Test: atest bluetooth_unit_test_gd
Change-Id: Ifb73badc5dd10ff6416c0ecc8d7d6d0fd1701b98
parent ff263c53

system/gd/security/record/security_record_storage_test.cc

+11 −6
Original line number Original line Diff line number Diff line
@@ -18,21 +18,26 @@ 




#include <gtest/gtest.h>

#include <gtest/gtest.h>





#include "security/test/fake_storage_module.h"

#include "storage/storage_module.h"





namespace bluetooth {

namespace bluetooth {

namespace security {

namespace security {

namespace record {

namespace record {

namespace {

namespace {





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



using storage::StorageModule;



class DISABLED_SecurityRecordStorageTest : public ::testing::Test {

class DISABLED_SecurityRecordStorageTest : public ::testing::Test {

 protected:

 protected:

  void SetUp() override {

  void SetUp() override {

    // Make Fake storage module

    // Make storage module

    storage_module_ = new FakeStorageModule();

    storage_module_ =

        new StorageModule("/tmp/temp_config.txt", kTestConfigSaveDelay, 100, false, false);





    // Inject

    // Inject

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

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





    // Make storage

    // Make storage

    record_storage_ = new record::SecurityRecordStorage(storage_module_, handler_);

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

  }





  void synchronize() {

  void synchronize() {

    fake_registry_.SynchronizeModuleHandler(&FakeStorageModule::Factory, std::chrono::milliseconds(20));

    fake_registry_.SynchronizeModuleHandler(&StorageModule::Factory, std::chrono::milliseconds(20));

  }

  }





  TestModuleRegistry fake_registry_;

  TestModuleRegistry fake_registry_;

  os::Thread& thread_ = fake_registry_.GetTestThread();

  os::Thread& thread_ = fake_registry_.GetTestThread();

  os::Handler* handler_ = nullptr;

  os::Handler* handler_ = nullptr;

  FakeStorageModule* storage_module_;

  StorageModule* storage_module_;

  record::SecurityRecordStorage* record_storage_;

  record::SecurityRecordStorage* record_storage_;

};

};

system/gd/security/test/fake_storage_module.h

deleted100644 → 0
+0 −42
Original line number Original line 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