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

Commit 2c8b28b9 authored by Hansong Zhang's avatar Hansong Zhang
Browse files

ModuleRegistry: Start() injected modules 

Call Start() on injected modules, and set registry_ and handler_
properly

Test: atest --host bluetooth_test_gd
Change-Id: Id655d537982eab285549ff797a907dabb15ca64d
parent 3c3861fd

system/gd/module.cc

+9 −0
Original line number Diff line number Diff line
@@ -94,4 +94,13 @@ void ModuleRegistry::StopAll() { 
  ASSERT(started_modules_.empty());

  start_order_.clear();

}



void ModuleRegistry::inject_test_module(const ModuleFactory* module, Module* instance, os::Thread* thread) {

  instance->registry_ = this;

  instance->handler_ = new Handler(thread);

  start_order_.push_back(module);

  started_modules_[module] = instance;

  instance->Start();

}



}  // namespace bluetooth

system/gd/module.h

+11 −14
Original line number Diff line number Diff line
@@ -115,23 +115,20 @@ class ModuleRegistry { 
  // Stop all running modules in reverse order of start

  void StopAll();



 protected:

  Module* Get(const ModuleFactory* module) const;

  // Helper for dependency injection in test code. DO NOT USE in prod code!

  // Ownership of |instance| is transferred to the registry.

  void inject_test_module(const ModuleFactory* module, Module* instance, os::Thread* thread);



  std::map<const ModuleFactory*, Module*> started_modules_;

  std::vector<const ModuleFactory*> start_order_;

};



class TestModuleRegistry : public ModuleRegistry {

 public:

  void InjectTestModule(const ModuleFactory* module, Module* instance) {

    start_order_.push_back(module);

    started_modules_[module] = instance;

  // Helper for dependency injection in test code. DO NOT USE in prod code!

  template <class T>

  T* get_module_under_test() const {

    return static_cast<T*>(Get(&T::Factory));

  }



  Module* GetModuleUnderTest(const ModuleFactory* module) const {

    return Get(module);

  }

 private:

  Module* Get(const ModuleFactory* module) const;

  std::map<const ModuleFactory*, Module*> started_modules_;

  std::vector<const ModuleFactory*> start_order_;

};



}  // namespace bluetooth