Purge underscored header file barriers

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

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-toolkit-test-suite-utils.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-toolkit-test-suite-utils.h
index fcda1d2..da96fac 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-toolkit-test-suite-utils.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-toolkit-test-suite-utils.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TOOLKIT_TEST_SUITE_UTILS_H__
-#define __DALI_TOOLKIT_TEST_SUITE_UTILS_H__
+#ifndef DALI_TOOLKIT_TEST_SUITE_UTILS_H
+#define DALI_TOOLKIT_TEST_SUITE_UTILS_H
 
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 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.
@@ -18,19 +18,19 @@
  *
  */
 
-// INTERNAL INCLUDES
+#include <iostream>
+#include <dali-toolkit/public-api/visuals/visual-properties.h>
 
-// dali-test-suite-utils.h needed first, but want to prevent certain headers
-// from being read, as we want to override as much of their behaviour as possible.
-#define __DALI_STYLE_MONITOR_H__
-#define __DALI_ACCESSIBILITY_MANAGER_H__
-#define __DALI_TIMER_H__
-#define __DALI_CLIPBOARD_H__
-#define IMFMANAGER_H
+// Put any toolkit specific operators for DALI_TEST_CHECK template here, before dali-test-suite-utils.h.
 
-#include <dali-test-suite-utils.h>
+std::ostream& operator<<( std::ostream& ostream, Dali::Toolkit::Visual::ResourceStatus status );
 
+// INTERNAL INCLUDES
+
+#include <dali-test-suite-utils.h>
 #include "toolkit-test-application.h"
 #include "toolkit-application.h"
+#include "toolkit-input-method-context.h"
+#include "toolkit-clipboard-event-notifier.h"
 
-#endif // __DALI_TOOLKIT_TEST_SUITE_UTILS_H__
+#endif // DALI_TOOLKIT_TEST_SUITE_UTILS_H