Fix windows ut regarding sql.properties file.

Author: silvakid

test/CJUnitTestsPort/BaseTestFixture.cpp

@@ -43,9 +43,14 @@ int TestFixtureCommon::instanceCount=1;
 
 Properties TestFixtureCommon::sqlProps;
 
-int TestFixtureCommon::propsLoaded=resources::LoadProperties(SQL_PROPERTIES_FILE
-                                                             , sqlProps
-                                                             , NULL);
+static const char * possiblePropertiesLocations[]={".."
+                                                   , "test/CJUnitTestsPort"
+                                                   , NULL //last should be NULL
+};
+
+int TestFixtureCommon::propsLoaded=resources::LoadProperties("sql.properties",
+                                                             sqlProps,
+                                                             possiblePropertiesLocations);
 
 Driver * TestFixtureCommon::driver=NULL;
 

test/CJUnitTestsPort/CMakeLists.txt

@@ -1,90 +1,93 @@
 #
-# Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 # The MySQL Connector/C++ is licensed under the terms of the GPLv2
 # <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
 # MySQL Connectors. There are special exceptions to the terms and
 # conditions of the GPLv2 as it is applied to this software, see the
 # FLOSS License Exception
 # <http://www.mysql.com/about/legal/licensing/foss-exception.html>.
-# 
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published
 # by the Free Software Foundation; version 2 of the License.
-# 
+#
 # This program is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 # or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
 # for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License along
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 #
 
 IF(WIN32)
-	LINK_DIRECTORIES(../framework/$(ConfigurationName))
-	SET(MY_TARGET_LINK_LIBRARIES mysqlcppconn test_framework)
+  LINK_DIRECTORIES(../framework/$(ConfigurationName))
+  SET(MY_TARGET_LINK_LIBRARIES mysqlcppconn test_framework)
 #	ADD_DEFINITIONS("-D_SECURE_SCL")
-	ADD_DEFINITIONS("-D_SCL_SECURE_NO_WARNINGS")
-	ADD_DEFINITIONS("-D_CRT_SECURE_NO_WARNINGS")
+  ADD_DEFINITIONS("-D_SCL_SECURE_NO_WARNINGS")
+  ADD_DEFINITIONS("-D_CRT_SECURE_NO_WARNINGS")
 
 ELSEIF(NOT WIN32)
-	SET(MY_TARGET_LINK_LIBRARIES mysqlcppconn test_framework)
+  SET(MY_TARGET_LINK_LIBRARIES mysqlcppconn test_framework)
 ENDIF(WIN32)
 
 IF(CMAKE_COMPILER_IS_GNUCC AND MYSQLCPPCONN_GCOV_ENABLE)
-	SET(MY_GCOV_LINK_LIBRARIES gcov)
+  SET(MY_GCOV_LINK_LIBRARIES gcov)
 ENDIF(CMAKE_COMPILER_IS_GNUCC AND MYSQLCPPCONN_GCOV_ENABLE)
 
 ADD_DEFINITIONS("-DWE_HAVE_DATATYPE_AGAIN")
 
 IF(MYSQLCPPCONN_TEST_NOT_IMPLEMENTED)
-	ADD_DEFINITIONS("-DINCLUDE_NOT_IMPLEMENTED_METHODS=1")
+  ADD_DEFINITIONS("-DINCLUDE_NOT_IMPLEMENTED_METHODS=1")
 ENDIF(MYSQLCPPCONN_TEST_NOT_IMPLEMENTED)
 
 SET(jdbctests_sources
-	ccpptests.cpp
-	BaseTestFixture.cpp
-	../common/stringutils.cpp
-	resources.cpp
-	regression/EscapeProcessorRegressionTest.cpp
-	compliance/ConnectionTest.cpp
-	compliance/DatabaseMetaDataTest.cpp
-	compliance/StatementTest.cpp
-	compliance/ResultSetMetadataTest.cpp
-	compliance/PreparedStatementTest.cpp
-	simple/BlobTest.cpp
-	regression/BlobRegressionTest.cpp
-	regression/PreparedStatementRegressionTest.cpp
-	simple/TransactionTest.cpp
-	regression/SubqueriesRegressionTest.cpp
-	compliance/UnbufferedRsStmtTest.cpp
-	)
+  ccpptests.cpp
+  BaseTestFixture.cpp
+  ../common/stringutils.cpp
+  resources.cpp
+  regression/EscapeProcessorRegressionTest.cpp
+  compliance/ConnectionTest.cpp
+  compliance/DatabaseMetaDataTest.cpp
+  compliance/StatementTest.cpp
+  compliance/ResultSetMetadataTest.cpp
+  compliance/PreparedStatementTest.cpp
+  simple/BlobTest.cpp
+  regression/BlobRegressionTest.cpp
+  regression/PreparedStatementRegressionTest.cpp
+  simple/TransactionTest.cpp
+  regression/SubqueriesRegressionTest.cpp
+  compliance/UnbufferedRsStmtTest.cpp
+  )
 
 # It's convinient for VS users to have headers as part of project
 IF(WIN32)
-	SET(jdbctests_sources
-    		${jdbctests_sources}
-		BaseTestFixture.h
-		../common/stringutils.h
-		resources.h
-		regression/EscapeProcessorRegressionTest.h
-		compliance/ConnectionTest.h
-		compliance/DatabaseMetaDataTest.h
-		compliance/StatementTest.h
-		compliance/ResultSetMetadataTest.h
-		compliance/PreparedStatementTest.h
-		simple/BlobTest.h
-		regression/BlobRegressionTest.h
-		regression/PreparedStatementRegressionTest.h
-		simple/TransactionTest.h
-		regression/SubqueriesRegressionTest.h
-		compliance/UnbufferedRsStmtTest.h
-		)
+  SET(jdbctests_sources
+        ${jdbctests_sources}
+    BaseTestFixture.h
+    ../common/stringutils.h
+    resources.h
+    regression/EscapeProcessorRegressionTest.h
+    compliance/ConnectionTest.h
+    compliance/DatabaseMetaDataTest.h
+    compliance/StatementTest.h
+    compliance/ResultSetMetadataTest.h
+    compliance/PreparedStatementTest.h
+    simple/BlobTest.h
+    regression/BlobRegressionTest.h
+    regression/PreparedStatementRegressionTest.h
+    simple/TransactionTest.h
+    regression/SubqueriesRegressionTest.h
+    compliance/UnbufferedRsStmtTest.h
+    )
 ENDIF(WIN32)
 
 ADD_EXECUTABLE(CJUnitTestsPort ${jdbctests_sources})
 TARGET_LINK_LIBRARIES(CJUnitTestsPort ${MY_TARGET_LINK_LIBRARIES} ${MY_GCOV_LINK_LIBRARIES})
 
+#Copy sql.properties file to build dir
+file(COPY sql.properties DESTINATION ${CMAKE_BINARY_DIR}/test/CJUnitTestsPort/)
+
 MESSAGE(STATUS "Configuring C/J junit tests port")

test/CMakeLists.txt

@@ -30,8 +30,6 @@ SET(TEST_DEFAULT_DB     "test"                  CACHE STRING "Defines Unit Tests
 SET(TEST_DEFAULT_LOGIN  "root"                  CACHE STRING "Defines Unit Tests default login user" )
 SET(TEST_DEFAULT_PASSWD "root"                  CACHE STRING "Defines Unit Tests default login user password" )
 
-# sql.properties file for CJUnitTestsPort tests
-set(SQL_PROPERTIES_FILE "${CMAKE_CURRENT_SOURCE_DIR}/CJUnitTestsPort/sql.properties")
 
 configure_file(tests_config.h.in
                ${CMAKE_BINARY_DIR}/tests_config.h)

test/tests_config.h.in

@@ -30,7 +30,4 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define TEST_DEFAULT_LOGIN  "${TEST_DEFAULT_LOGIN}"
 #define TEST_DEFAULT_PASSWD "${TEST_DEFAULT_PASSWD}"
 
-#define SQL_PROPERTIES_FILE "${SQL_PROPERTIES_FILE}"
-
-
 #endif //_TESTS_CONFIG_IN_