Merge pull request #25310 from notspiff/add_guicontrol_factory_tests

Add some tests for CGUIControlFactory
xbmc · Jun 23, 2024 · 8d1bef6 · 8d1bef6
2 parents 5069e47 + e9bdd97
commit 8d1bef6
Show file tree

Hide file tree

Showing 10 changed files with 990 additions and 5 deletions.
diff --git a/cmake/treedata/common/tests.txt b/cmake/treedata/common/tests.txt
@@ -6,6 +6,7 @@ xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/test test/videoshaders
 xbmc/filesystem/test test/filesystem
 xbmc/games/addons/input/test test/games/addons/input
 xbmc/games/controllers/input/test test/games/controllers/input
+xbmc/guilib/test test/guilib
 xbmc/imagefiles/test test/imagefiles
 xbmc/input/keyboard/test test/input/keyboard
 xbmc/interfaces/python/test test/python

diff --git a/xbmc/guilib/GUIAction.h b/xbmc/guilib/GUIAction.h
@@ -63,6 +63,11 @@ class CGUIAction
  */
  void SetAction(const std::string& action);
 
+ bool operator==(const CExecutableAction& right) const
+ {
+ return m_condition == right.m_condition && m_action == right.m_action;
+ }
+
  private:
  /**
  * Executable action default constructor
@@ -123,6 +128,11 @@ class CGUIAction
  */
  void Reset();
 
+ bool operator==(const CGUIAction& rhs) const
+ {
+ return m_actions == rhs.m_actions && m_sendThreadMessages == rhs.m_sendThreadMessages;
+ }
+
 private:
  std::vector<CExecutableAction> m_actions;
  bool m_sendThreadMessages = false;

diff --git a/xbmc/guilib/GUIComponent.cpp b/xbmc/guilib/GUIComponent.cpp
@@ -32,6 +32,10 @@ CGUIComponent::CGUIComponent()
 {
 }
 
+CGUIComponent::CGUIComponent(bool)
+{
+}
+
 CGUIComponent::~CGUIComponent()
 {
  Deinit();
@@ -50,7 +54,8 @@ void CGUIComponent::Deinit()
 {
  CServiceBroker::UnregisterGUI();
 
- m_pWindowManager->DeInitialize();
+ if (m_pWindowManager)
+ m_pWindowManager->DeInitialize();
 }
 
 CGUIWindowManager& CGUIComponent::GetWindowManager()

diff --git a/xbmc/guilib/GUIComponent.h b/xbmc/guilib/GUIComponent.h
@@ -23,6 +23,7 @@ class CGUIComponent
 {
 public:
  CGUIComponent();
+ explicit CGUIComponent(bool);
  virtual ~CGUIComponent();
  void Init();
  void Deinit();

diff --git a/xbmc/guilib/GUIControlFactory.h b/xbmc/guilib/GUIControlFactory.h
@@ -129,15 +129,15 @@ class CGUIControlFactory
  const std::string& scrollerTag,
  CScroller& scroller);
 
-private:
+protected:
  static std::string GetType(const TiXmlElement* pControlNode);
  static bool GetMovingSpeedConfig(const TiXmlNode* pRootNode,
  const char* strTag,
  KODI::UTILS::MOVING_SPEED::MapEventConfig& movingSpeedCfg);
  static bool GetConditionalVisibility(const TiXmlNode* control,
  std::string& condition,
  std::string& allowHiddenFocus);
- bool GetString(const TiXmlNode* pRootNode, const char* strTag, std::string& strString);
+ static bool GetString(const TiXmlNode* pRootNode, const char* strTag, std::string& strString);
  static bool GetFloatRange(const TiXmlNode* pRootNode,
  const char* strTag,
  float& iMinValue,

diff --git a/xbmc/guilib/GUITexture.h b/xbmc/guilib/GUITexture.h
@@ -34,7 +34,13 @@ class CAspectRatio
  ratio = aspect;
  align = ASPECT_ALIGN_CENTER | ASPECT_ALIGNY_CENTER;
  scaleDiffuse = true;
- };
+ }
+
+ CAspectRatio(ASPECT_RATIO aspect, uint32_t al, bool scaleD)
+ : ratio(aspect), align(al), scaleDiffuse(scaleD)
+ {
+ }
+
  bool operator!=(const CAspectRatio &right) const
  {
  if (ratio != right.ratio) return true;
@@ -53,6 +59,23 @@ class CTextureInfo
 public:
  CTextureInfo();
  explicit CTextureInfo(const std::string &file);
+ CTextureInfo(bool large,
+ CRect bord,
+ bool fill,
+ int orient,
+ std::string diff,
+ KODI::GUILIB::GUIINFO::CGUIInfoColor color,
+ std::string f)
+ : useLarge(large),
+ border(bord),
+ m_infill(fill),
+ orientation(orient),
+ diffuse(std::move(diff)),
+ diffuseColor(color),
+ filename(std::move(f))
+ {
+ }
+
  bool useLarge;
  CRect border; // scaled - unneeded if we get rid of scale on load
  bool m_infill{

diff --git a/xbmc/guilib/guiinfo/GUIInfoColor.h b/xbmc/guilib/guiinfo/GUIInfoColor.h
@@ -30,7 +30,8 @@ namespace GUIINFO
 class CGUIInfoColor
 {
 public:
- constexpr CGUIInfoColor(KODI::UTILS::COLOR::Color color = 0) : m_color(color) {}
+ constexpr CGUIInfoColor(UTILS::COLOR::Color color = 0) : m_color(color) {}
+ constexpr CGUIInfoColor(UTILS::COLOR::Color color, int info) : m_info(info), m_color(color) {}
 
  constexpr operator KODI::UTILS::COLOR::Color() const { return m_color; }
 

diff --git a/xbmc/guilib/test/CMakeLists.txt b/xbmc/guilib/test/CMakeLists.txt
@@ -0,0 +1,3 @@
+set(SOURCES TestGUIControlFactory.cpp)
+
+core_add_test_library(guilib_test)