X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fdali-toolkit-test-utils%2Ftoolkit-environment-variable.cpp;h=4fc6cf275759526a6ba5971516778aa2fd714eb6;hp=5d8d14300a74aad989dc57672afbea940efd6086;hb=959f0134ef092cda808d6b810708bc21c95cd7d6;hpb=404951ce1994183b50908037e954760bedfbb912

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-environment-variable.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-environment-variable.cpp
index 5d8d143..4fc6cf2 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-environment-variable.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-environment-variable.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 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,8 +18,7 @@
 #include "toolkit-environment-variable.h"
 
 // EXTERNAL INCLUDE
-#include <cstddef>
-#include <string>
+#include <map>
 
 namespace Dali
 {
@@ -27,36 +26,22 @@ namespace EnvironmentVariable
 {
 namespace
 {
-const char* gReturnValue = NULL;
-std::string gEnvironmentVariableName;
-std::string gEnvironmentVariableValue;
+std::map<std::string, std::string> gEnvironmentVariables;
 } // namespace
 
 const char* GetEnvironmentVariable(const char* variable)
 {
-  if(gEnvironmentVariableName == variable)
+  auto value = gEnvironmentVariables.find(variable);
+  if(value != gEnvironmentVariables.end())
   {
-    return gEnvironmentVariableValue.c_str();
-  }
-  return gReturnValue;
-}
-
-void SetTestingEnvironmentVariable(bool testing)
-{
-  if(testing)
-  {
-    gReturnValue = "1";
-  }
-  else
-  {
-    gReturnValue = NULL;
+    return value->second.c_str();
   }
+  return nullptr;
 }
 
 void SetTestEnvironmentVariable(const char* variable, const char* value)
 {
-  gEnvironmentVariableName  = variable;
-  gEnvironmentVariableValue = value;
+  gEnvironmentVariables[variable] = value;
 }
 
 } // namespace EnvironmentVariable