Merge branch 'release1.5.0.G1' of git.sami.int.thomsonreuters.com:EPD/esdk into release1.5.0.G1

MitchellKato · MitchellKato · commit 338e99572c66 · 2020-06-11T16:13:27.000+01:00
diff --git a/Cpp-C/Ema/Examples/Test/UnitTest/EmaConfigTest.cpp b/Cpp-C/Ema/Examples/Test/UnitTest/EmaConfigTest.cpp
@@ -32,6 +32,11 @@ class EmaConfigTest : public ::testing::Test {
 		SCOPED_TRACE("EmaConfigTest SetUp");
 		if (hasRun == true)
 			return;
+
+		// The default path uses when creating Config instance
+		// and was set an empty path to EmaConfigTest.xml or a directory
+		EmaConfigBaseImpl::setDefaultConfigFileName(emaConfigXMLFileNameTest);
+
 		EmaString workingDir;
 		ASSERT_EQ(getCurrentDir(workingDir), true)
 			<< "Error: failed to load config file from current working dir "
diff --git a/Cpp-C/Ema/Src/Access/Impl/EmaConfigImpl.cpp b/Cpp-C/Ema/Src/Access/Impl/EmaConfigImpl.cpp
@@ -34,6 +34,10 @@ using namespace thomsonreuters::ema::access;
 
 extern const EmaString& getDTypeAsString( DataType::DataTypeEnum dType );
 
+static const char* strEmaConfigXMLFileName = "EmaConfig.xml";
+
+EmaString EmaConfigBaseImpl::defaultEmaConfigXMLFileName(strEmaConfigXMLFileName);
+
 EmaConfigBaseImpl::EmaConfigBaseImpl( const EmaString & path ) :
 	_pEmaConfig(new XMLnode("EmaConfig", 0, 0)),
 	_pProgrammaticConfigure(0),
@@ -162,6 +166,14 @@ const XMLnode* EmaConfigBaseImpl::getNode(const EmaString& itemToRetrieve) const
 	return 0;
 }
 
+void EmaConfigBaseImpl::setDefaultConfigFileName(const EmaString& pathConfigFileName)
+{
+	if (!pathConfigFileName.empty())
+		defaultEmaConfigXMLFileName = pathConfigFileName;
+	else
+		defaultEmaConfigXMLFileName = strEmaConfigXMLFileName;
+}
+
 //  helper function for handling errors in readXMLconfiguration
 static OmmLoggerClient::Severity handleConfigurationPathError(const EmaString& errorMsg, bool userSpecifiedPath) {
 	if (userSpecifiedPath)
@@ -182,7 +194,7 @@ static OmmLoggerClient::Severity handleConfigurationPathError(const EmaString& e
 OmmLoggerClient::Severity EmaConfigBaseImpl::readXMLconfiguration(const EmaString& path)
 {
 	EmaString fileName;		// eventual location of config file
-	const EmaString defaultFileName( "EmaConfig.xml" ); // used if path is empty or contains a directory
+	const EmaString defaultFileName( defaultEmaConfigXMLFileName ); // used if path is empty or contains a directory
 
 	if ( path.empty() )
 		fileName = defaultFileName;
diff --git a/Cpp-C/Ema/Src/Access/Impl/EmaConfigImpl.h b/Cpp-C/Ema/Src/Access/Impl/EmaConfigImpl.h
@@ -1177,6 +1177,8 @@ class EmaConfigBaseImpl
 
 	virtual EmaString getConfiguredName() = 0;
 
+	static void setDefaultConfigFileName(const EmaString&);
+
 protected:
 
 	XMLnode*				_pEmaConfig;
@@ -1188,7 +1190,7 @@ class EmaConfigBaseImpl
 private:
 
 	HashTable< EmaString, ConfigElement::ConfigElementType> nameToValueHashTable;
-
+	static EmaString		defaultEmaConfigXMLFileName;
 };
 
 class EmaConfigImpl : public EmaConfigBaseImpl
