Merge branch 'devel/graphics' into devel/master

[platform/core/uifw/dali-toolkit.git] / automated-tests / src / dali-toolkit / dali-toolkit-test-utils / test-gl-sync-abstraction.h

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-sync-abstraction.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-sync-abstraction.h
index 8ce96a4..73be9ee 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-sync-abstraction.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-sync-abstraction.h
@@ -1,8 +1,8 @@
-#ifndef __TEST_GL_SYNC_ABSTRACTION_H__
-#define __TEST_GL_SYNC_ABSTRACTION_H__
+#ifndef TEST_GL_SYNC_ABSTRACTION_H
+#define TEST_GL_SYNC_ABSTRACTION_H
 
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2021 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,32 +19,32 @@
  */
 
 // EXTERNAL INCLUDES
+#include <map>
 #include <sstream>
 #include <string>
-#include <map>
 
 // INTERNAL INCLUDES
 #include <dali/integration-api/core.h>
 #include <dali/integration-api/gl-sync-abstraction.h>
+
 #include "test-trace-call-stack.h"
 
 namespace Dali
 {
-
-class DALI_IMPORT_API TestSyncObject : public Integration::GlSyncAbstraction::SyncObject
+class DALI_CORE_API TestSyncObject : public Integration::GlSyncAbstraction::SyncObject
 {
 public:
   TestSyncObject(TraceCallStack& trace);
-  ~TestSyncObject();
-  bool IsSynced();
-  bool synced;
+  ~TestSyncObject() override;
+  bool            IsSynced() override;
+  bool            synced;
   TraceCallStack& mTrace;
 };
 
 /**
  * Class to emulate the GL sync functions with tracing
  */
-class DALI_IMPORT_API TestGlSyncAbstraction: public Integration::GlSyncAbstraction
+class DALI_CORE_API TestGlSyncAbstraction : public Integration::GlSyncAbstraction
 {
 public:
   /**
@@ -55,7 +55,7 @@ public:
   /**
    * Destructor
    */
-  ~TestGlSyncAbstraction();
+  ~TestGlSyncAbstraction() override;
 
   /**
    * Initialize the sync objects - clear down the map
@@ -66,24 +66,23 @@ public:
    * Create a sync object
    * @return the sync object
    */
-  virtual Integration::GlSyncAbstraction::SyncObject* CreateSyncObject( );
+  Integration::GlSyncAbstraction::SyncObject* CreateSyncObject() override;
 
   /**
    * Destroy a sync object
    * @param[in] syncObject The object to destroy
    */
-  virtual void DestroySyncObject( Integration::GlSyncAbstraction::SyncObject* syncObject );
-
+  void DestroySyncObject(Integration::GlSyncAbstraction::SyncObject* syncObject) override;
 
 public: // TEST FUNCTIONS
-  Integration::GlSyncAbstraction::SyncObject* GetLastSyncObject( );
+  Integration::GlSyncAbstraction::SyncObject* GetLastSyncObject();
 
   /**
    * Test method to trigger the object sync behaviour.
    * @param[in]
    * @param[in] sync The sync value to set
    */
-  void SetObjectSynced( Integration::GlSyncAbstraction::SyncObject* syncObject, bool sync );
+  void SetObjectSynced(Integration::GlSyncAbstraction::SyncObject* syncObject, bool sync);
 
   /**
    * Turn trace on
@@ -105,19 +104,18 @@ public: // TEST FUNCTIONS
    *
    * @return the number of sync objects
    */
-  int GetNumberOfSyncObjects();
+  int32_t GetNumberOfSyncObjects();
 
 private:
+  TestGlSyncAbstraction(const TestGlSyncAbstraction&);            ///< Undefined
+  TestGlSyncAbstraction& operator=(const TestGlSyncAbstraction&); ///< Undefined
 
-  TestGlSyncAbstraction( const TestGlSyncAbstraction& ); ///< Undefined
-  TestGlSyncAbstraction& operator=( const TestGlSyncAbstraction& ); ///< Undefined
-
-  typedef std::vector<TestSyncObject*>   SyncContainer;
-  typedef SyncContainer::iterator SyncIter;
-  SyncContainer mSyncObjects;  ///< The sync objects
-  TraceCallStack mTrace; ///< the trace call stack for testing
+  typedef std::vector<TestSyncObject*> SyncContainer;
+  typedef SyncContainer::iterator      SyncIter;
+  SyncContainer                        mSyncObjects;       ///< The sync objects
+  TraceCallStack                       mTrace{true, "gl"}; ///< the trace call stack for testing
 };
 
-} // Dali
+} // namespace Dali
 
-#endif // __TEST_GL_SYNC_ABSTRACTION_H__
+#endif // TEST_GL_SYNC_ABSTRACTION_H