(Automated Tests) Updated test suite utils

Change-Id: I15a976bf9ef324c0cc4cb4c01d45963d2ed26370

diff --git a/automated-tests/src/dali-adaptor/dali-test-suite-utils/dali-test-suite-utils.cpp b/automated-tests/src/dali-adaptor/dali-test-suite-utils/dali-test-suite-utils.cpp
index a518dd9..f70e3be 100644 (file)
--- a/automated-tests/src/dali-adaptor/dali-test-suite-utils/dali-test-suite-utils.cpp
+++ b/automated-tests/src/dali-adaptor/dali-test-suite-utils/dali-test-suite-utils.cpp
@@ -16,7 +16,7 @@
  */
 
 // INTERNAL INCLUDES
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include <stdarg.h>
 
 #include "dali-test-suite-utils.h"

diff --git a/automated-tests/src/dali-adaptor/dali-test-suite-utils/dali-test-suite-utils.h b/automated-tests/src/dali-adaptor/dali-test-suite-utils/dali-test-suite-utils.h
index ddd2c07..375fb90 100644 (file)
--- a/automated-tests/src/dali-adaptor/dali-test-suite-utils/dali-test-suite-utils.h
+++ b/automated-tests/src/dali-adaptor/dali-test-suite-utils/dali-test-suite-utils.h
@@ -19,7 +19,7 @@
  */
 
 // INTERNAL INCLUDES
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include <stdarg.h>
 
 void tet_infoline(const char*str);
@@ -295,7 +295,6 @@ void DALI_TEST_EQUALS( const std::string &str1, const char* str2, const char* lo
  */
 void DALI_TEST_EQUALS( const char* str1, const std::string &str2, const char* location);
 
-
 /**
  * Test whether two UTF32 strings are equal.
  * @param[in] str1 The first string
@@ -305,18 +304,18 @@ void DALI_TEST_EQUALS( const char* str1, const std::string &str2, const char* lo
 template<>
 inline void DALI_TEST_EQUALS<const Integration::TextArray&>( const Integration::TextArray& str1, const Integration::TextArray& str2, const char* location)
 {
-  if (!std::equal(str1.Begin(), str1.End(), str2.Begin()))
+  if( !std::equal( str1.Begin(), str1.End(), str2.Begin() ) )
   {
     fprintf(stderr, "%s, checking '", location);
 
-    for( unsigned int i = 0; i < str1.Count(); ++i)
+    for( unsigned int i = 0; i < str1.Count(); ++i )
     {
       fprintf(stderr, "%c", str1[i]);
     }
 
     fprintf(stderr, "' == '");
 
-    for( unsigned int i = 0; i < str2.Count(); ++i)
+    for( unsigned int i = 0; i < str2.Count(); ++i )
     {
       fprintf(stderr, "%c", str2[i]);
     }

diff --git a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-application.h b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-application.h
index 8107b35..bcc2dd8 100644 (file)
--- a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-application.h
+++ b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-application.h
@@ -79,7 +79,7 @@ public:
 private:
   void DoUpdate( unsigned int intervalMilliseconds );
 
-  protected:
+protected:
   TestPlatformAbstraction   mPlatformAbstraction;
   TestRenderController      mRenderController;
   TestGlAbstraction         mGlAbstraction;

diff --git a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-gl-sync-abstraction.h b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-gl-sync-abstraction.h
index 9a754c2..e233176 100644 (file)
--- a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-gl-sync-abstraction.h
+++ b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-gl-sync-abstraction.h
@@ -24,7 +24,6 @@
 #include <map>
 
 // INTERNAL INCLUDES
-#include <dali/dali.h>
 #include <dali/integration-api/core.h>
 #include <dali/integration-api/gl-sync-abstraction.h>
 #include "test-trace-call-stack.h"