Follow up fix for testcase for wl#8338

lkotula · lkotula · commit 545e3aebd9ee · 2016-02-26T21:06:59.000+01:00
description: 1) Fixed copy paste error in doxygen documentation
             2) Changed name of UT executable for mysqlx plugin.
                Name was colliding with other optional target.
diff --git a/include/mysql/service_ssl_wrapper.h b/include/mysql/service_ssl_wrapper.h
@@ -47,10 +47,11 @@ extern "C"
 void ssl_wrapper_cipher(Vio *vio, char *cipher, const size_t cipher_size);
 
 /**
-  Calls the query rewrite plugins' respective rewrite functions before parsing
-  the query.
+  Return cipher list that can be used for SSL
 
-  @param[in] thd The session sending the query to be rewritten.
+  @param vio                       VIO connection descriptor
+  @param clipher_list              Pointer to an array of c-strings
+  @param maximun_num_of_elements   Size of the pointer array
 */
 extern "C"
 long ssl_wrapper_cipher_list(Vio *vio, const char **clipher_list, const size_t maximun_num_of_elements);
@@ -83,8 +84,8 @@ long ssl_wrapper_verify_mode(Vio *vio);
   Return issuer name form peers ssl certificate
 
   @param vio              VIO connection descriptor
-  @param subject          Character buffer in which the issuer name is going to be placed
-  @param subject_size     Size of character buffer for the issuer name
+  @param issuer           Character buffer in which the issuer name is going to be placed
+  @param issuer_size      Size of character buffer for the issuer name
 */
 extern "C"
 void ssl_wrapper_get_peer_certificate_issuer(Vio *vio, char *issuer, const size_t issuer_size);
@@ -149,8 +150,8 @@ void  ssl_wrapper_ctx_server_not_after(struct st_VioSSLFd *vio_ssl, char *no_aft
   Return the first day the server certificate is valid
 
   @param vio_ssl              VIO SSL contex descriptor
-  @param no_after             Character buffer for to be filed with the date in human readble format
-  @param no_after_size        Size of the character buffer
+  @param no_before            Character buffer for to be filed with the date in human readble format
+  @param no_before_size       Size of the character buffer
 */
 extern "C"
 void ssl_wrapper_ctx_server_not_before(struct st_VioSSLFd *vio_ssl, char *no_before, const size_t no_before_size);
diff --git a/rapid/unittest/gunit/xplugin/CMakeLists.txt b/rapid/unittest/gunit/xplugin/CMakeLists.txt
@@ -99,19 +99,19 @@ FILE(
   "${PROJECT_SOURCE_DIR}/rapid/plugin/x/mysqlxtest_src/mysqlx_row.cc"
 )
 
-ADD_EXECUTABLE(run_unit_tests ${unit_tests_SRC} ${xplugin_SRC} ${protobuf_SRC})
+ADD_EXECUTABLE(xplugin_unit_tests ${unit_tests_SRC} ${xplugin_SRC} ${protobuf_SRC})
 
-ADD_DEPENDENCIES(run_unit_tests mysqlxtest)
+ADD_DEPENDENCIES(xplugin_unit_tests mysqlxtest)
 
 # New warning in Visual Studio 2008
 # '%$S': virtual function overrides '%$pS', previous versions of the compiler
 # did not override when parameters only differed by const/volatile qualifiers
 IF(WIN32)
-  SET_TARGET_PROPERTIES(run_unit_tests PROPERTIES COMPILE_FLAGS "/wd4373")
+  SET_TARGET_PROPERTIES(xplugin_unit_tests PROPERTIES COMPILE_FLAGS "/wd4373")
 ENDIF(WIN32)
 
 TARGET_LINK_LIBRARIES(
-  run_unit_tests
+  xplugin_unit_tests
   xplugin
   gtest
   regex
diff --git a/rapid/unittest/gunit/xplugin/TestGroups.txt b/rapid/unittest/gunit/xplugin/TestGroups.txt
@@ -1,39 +1,39 @@
 # Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
 # Automatically generated, use make testgroups to update
-add_test(Query_string_builder_testsuite run_unit_tests --gtest_filter=Query_string_builder_testsuite.*)
-add_test(row_builder run_unit_tests --gtest_filter=row_builder.*)
-add_test(Delete_statement_builder_test run_unit_tests --gtest_filter=Delete_statement_builder_test.*)
-add_test(User_verification_test run_unit_tests --gtest_filter=User_verification_test.*)
-add_test(Insert_statement_builder_test run_unit_tests --gtest_filter=Insert_statement_builder_test.*)
-add_test(xpl_scheduler_dynamic run_unit_tests --gtest_filter=xpl_scheduler_dynamic.*)
-add_test(xpl_expr_generator run_unit_tests --gtest_filter=xpl_expr_generator.*)
-add_test(Update_statement_builder_test run_unit_tests --gtest_filter=Update_statement_builder_test.*)
-add_test(Ngs_sync_variable run_unit_tests --gtest_filter=Ngs_sync_variable.*)
-add_test(SaslAuthenticationTestSuite run_unit_tests --gtest_filter=SaslAuthenticationTestSuite.*)
-add_test(ExpectedValuesSaslAuthenticationTestSuite run_unit_tests --gtest_filter=ExpectedValuesSaslAuthenticationTestSuite.*)
-add_test(PartialMockSaslAuthenticationTestSuite run_unit_tests --gtest_filter=PartialMockSaslAuthenticationTestSuite.*)
-add_test(message_builder run_unit_tests --gtest_filter=message_builder.*)
-add_test(Statement_builder_test run_unit_tests --gtest_filter=Statement_builder_test.*)
-add_test(OBuffer run_unit_tests --gtest_filter=OBuffer.*)
-add_test(xdecimal run_unit_tests --gtest_filter=xdecimal.*)
-add_test(CapabilityHanderTlsTestSuite run_unit_tests --gtest_filter=CapabilityHanderTlsTestSuite.*)
-add_test(CapabilityHanderAuthMechTestSuite run_unit_tests --gtest_filter=CapabilityHanderAuthMechTestSuite.*)
-add_test(CapabilitiesConfiguratorTestSuite run_unit_tests --gtest_filter=CapabilitiesConfiguratorTestSuite.*)
-add_test(Find_statement_builder_test run_unit_tests --gtest_filter=Find_statement_builder_test.*)
-add_test(Getter_any_testsuite run_unit_tests --gtest_filter=Getter_any_testsuite.*)
-add_test(xdatetime run_unit_tests --gtest_filter=xdatetime.*)
-add_test(expect run_unit_tests --gtest_filter=expect.*)
-add_test(InstantiationPositiveTest/Query_string_builder_param_testsuite run_unit_tests --gtest_filter=InstantiationPositiveTest/Query_string_builder_param_testsuite.*)
-add_test(InstantiationPositiveTests/Query_string_builder_multiple_tags_param_testsuite run_unit_tests --gtest_filter=InstantiationPositiveTests/Query_string_builder_multiple_tags_param_testsuite.*)
-add_test(InstantiationPositiveTestsQueryOrValuesWithEscapedChars/Query_string_builder_multiple_tags_param_testsuite run_unit_tests --gtest_filter=InstantiationPositiveTestsQueryOrValuesWithEscapedChars/Query_string_builder_multiple_tags_param_testsuite.*)
-add_test(InstantiationPositiveTestsQueryWithComment/Query_string_builder_multiple_tags_param_testsuite run_unit_tests --gtest_filter=InstantiationPositiveTestsQueryWithComment/Query_string_builder_multiple_tags_param_testsuite.*)
-add_test(InstantiationNegativeTest/Query_string_builder_multiple_too_many_tags_param_testsuite run_unit_tests --gtest_filter=InstantiationNegativeTest/Query_string_builder_multiple_too_many_tags_param_testsuite.*)
-add_test(Valid_ip_mask_addresses/User_verification_dbuser_param_valid_test run_unit_tests --gtest_filter=Valid_ip_mask_addresses/User_verification_dbuser_param_valid_test.*)
-add_test(Invalid_ip_mask_addresses/User_verification_dbuser_param_notvalid_test run_unit_tests --gtest_filter=Invalid_ip_mask_addresses/User_verification_dbuser_param_notvalid_test.*)
-add_test(Range_from_0_to_9/User_verification_param_test run_unit_tests --gtest_filter=Range_from_0_to_9/User_verification_param_test.*)
-add_test(SuccessInstantiation/SuccessSetCapabilityHanderTlsTestSuite run_unit_tests --gtest_filter=SuccessInstantiation/SuccessSetCapabilityHanderTlsTestSuite.*)
-add_test(FaildInstantiationAlreadySet/FaildSetCapabilityHanderTlsTestSuite run_unit_tests --gtest_filter=FaildInstantiationAlreadySet/FaildSetCapabilityHanderTlsTestSuite.*)
-add_test(FaildInstantiationCantDisable/FaildSetCapabilityHanderTlsTestSuite run_unit_tests --gtest_filter=FaildInstantiationCantDisable/FaildSetCapabilityHanderTlsTestSuite.*)
-add_test(FaildInstantiationAlreadyDisabled/FaildSetCapabilityHanderTlsTestSuite run_unit_tests --gtest_filter=FaildInstantiationAlreadyDisabled/FaildSetCapabilityHanderTlsTestSuite.*)
-add_test(InstantiationNegativeTests/Getter_any_type_testsuite run_unit_tests --gtest_filter=InstantiationNegativeTests/Getter_any_type_testsuite.*)
-add_test(InstantiationNegativeTests/Getter_scalar_type_testsuite run_unit_tests --gtest_filter=InstantiationNegativeTests/Getter_scalar_type_testsuite.*)
+add_test(Query_string_builder_testsuite xplugin_unit_tests --gtest_filter=Query_string_builder_testsuite.*)
+add_test(row_builder xplugin_unit_tests --gtest_filter=row_builder.*)
+add_test(Delete_statement_builder_test xplugin_unit_tests --gtest_filter=Delete_statement_builder_test.*)
+add_test(User_verification_test xplugin_unit_tests --gtest_filter=User_verification_test.*)
+add_test(Insert_statement_builder_test xplugin_unit_tests --gtest_filter=Insert_statement_builder_test.*)
+add_test(xpl_scheduler_dynamic xplugin_unit_tests --gtest_filter=xpl_scheduler_dynamic.*)
+add_test(xpl_expr_generator xplugin_unit_tests --gtest_filter=xpl_expr_generator.*)
+add_test(Update_statement_builder_test xplugin_unit_tests --gtest_filter=Update_statement_builder_test.*)
+add_test(Ngs_sync_variable xplugin_unit_tests --gtest_filter=Ngs_sync_variable.*)
+add_test(SaslAuthenticationTestSuite xplugin_unit_tests --gtest_filter=SaslAuthenticationTestSuite.*)
+add_test(ExpectedValuesSaslAuthenticationTestSuite xplugin_unit_tests --gtest_filter=ExpectedValuesSaslAuthenticationTestSuite.*)
+add_test(PartialMockSaslAuthenticationTestSuite xplugin_unit_tests --gtest_filter=PartialMockSaslAuthenticationTestSuite.*)
+add_test(message_builder xplugin_unit_tests --gtest_filter=message_builder.*)
+add_test(Statement_builder_test xplugin_unit_tests --gtest_filter=Statement_builder_test.*)
+add_test(OBuffer xplugin_unit_tests --gtest_filter=OBuffer.*)
+add_test(xdecimal xplugin_unit_tests --gtest_filter=xdecimal.*)
+add_test(CapabilityHanderTlsTestSuite xplugin_unit_tests --gtest_filter=CapabilityHanderTlsTestSuite.*)
+add_test(CapabilityHanderAuthMechTestSuite xplugin_unit_tests --gtest_filter=CapabilityHanderAuthMechTestSuite.*)
+add_test(CapabilitiesConfiguratorTestSuite xplugin_unit_tests --gtest_filter=CapabilitiesConfiguratorTestSuite.*)
+add_test(Find_statement_builder_test xplugin_unit_tests --gtest_filter=Find_statement_builder_test.*)
+add_test(Getter_any_testsuite xplugin_unit_tests --gtest_filter=Getter_any_testsuite.*)
+add_test(xdatetime xplugin_unit_tests --gtest_filter=xdatetime.*)
+add_test(expect xplugin_unit_tests --gtest_filter=expect.*)
+add_test(InstantiationPositiveTest/Query_string_builder_param_testsuite xplugin_unit_tests --gtest_filter=InstantiationPositiveTest/Query_string_builder_param_testsuite.*)
+add_test(InstantiationPositiveTests/Query_string_builder_multiple_tags_param_testsuite xplugin_unit_tests --gtest_filter=InstantiationPositiveTests/Query_string_builder_multiple_tags_param_testsuite.*)
+add_test(InstantiationPositiveTestsQueryOrValuesWithEscapedChars/Query_string_builder_multiple_tags_param_testsuite xplugin_unit_tests --gtest_filter=InstantiationPositiveTestsQueryOrValuesWithEscapedChars/Query_string_builder_multiple_tags_param_testsuite.*)
+add_test(InstantiationPositiveTestsQueryWithComment/Query_string_builder_multiple_tags_param_testsuite xplugin_unit_tests --gtest_filter=InstantiationPositiveTestsQueryWithComment/Query_string_builder_multiple_tags_param_testsuite.*)
+add_test(InstantiationNegativeTest/Query_string_builder_multiple_too_many_tags_param_testsuite xplugin_unit_tests --gtest_filter=InstantiationNegativeTest/Query_string_builder_multiple_too_many_tags_param_testsuite.*)
+add_test(Valid_ip_mask_addresses/User_verification_dbuser_param_valid_test xplugin_unit_tests --gtest_filter=Valid_ip_mask_addresses/User_verification_dbuser_param_valid_test.*)
+add_test(Invalid_ip_mask_addresses/User_verification_dbuser_param_notvalid_test xplugin_unit_tests --gtest_filter=Invalid_ip_mask_addresses/User_verification_dbuser_param_notvalid_test.*)
+add_test(Range_from_0_to_9/User_verification_param_test xplugin_unit_tests --gtest_filter=Range_from_0_to_9/User_verification_param_test.*)
+add_test(SuccessInstantiation/SuccessSetCapabilityHanderTlsTestSuite xplugin_unit_tests --gtest_filter=SuccessInstantiation/SuccessSetCapabilityHanderTlsTestSuite.*)
+add_test(FaildInstantiationAlreadySet/FaildSetCapabilityHanderTlsTestSuite xplugin_unit_tests --gtest_filter=FaildInstantiationAlreadySet/FaildSetCapabilityHanderTlsTestSuite.*)
+add_test(FaildInstantiationCantDisable/FaildSetCapabilityHanderTlsTestSuite xplugin_unit_tests --gtest_filter=FaildInstantiationCantDisable/FaildSetCapabilityHanderTlsTestSuite.*)
+add_test(FaildInstantiationAlreadyDisabled/FaildSetCapabilityHanderTlsTestSuite xplugin_unit_tests --gtest_filter=FaildInstantiationAlreadyDisabled/FaildSetCapabilityHanderTlsTestSuite.*)
+add_test(InstantiationNegativeTests/Getter_any_type_testsuite xplugin_unit_tests --gtest_filter=InstantiationNegativeTests/Getter_any_type_testsuite.*)
+add_test(InstantiationNegativeTests/Getter_scalar_type_testsuite xplugin_unit_tests --gtest_filter=InstantiationNegativeTests/Getter_scalar_type_testsuite.*)
diff --git a/rapid/unittest/gunit/xplugin/test_main.cc b/rapid/unittest/gunit/xplugin/test_main.cc
@@ -43,7 +43,7 @@ int main(int argc, char **argv)
     for (int i = 0; i < ut->total_test_case_count(); ++i)
     {
       const char *name = ut->GetTestCase(i)->name();
-      f << "add_test(" << name << " run_unit_tests --gtest_filter=" << name << ".*)" << std::endl;
+      f << "add_test(" << name << " xplugin_unit_tests --gtest_filter=" << name << ".*)" << std::endl;
     }
 
     return 0;
diff --git a/sql/ssl_wrapper_service.cc b/sql/ssl_wrapper_service.cc
@@ -110,7 +110,13 @@ void ssl_wrapper_cipher(Vio *vio, char *buffer, const size_t buffer_size)
   buffer[buffer_size - 1]= '\0';
 }
 
+/**
+  Return cipher list that can be used for SSL
 
+  @param vio                       VIO connection descriptor
+  @param clipher_list              Pointer to an array of c-strings
+  @param maximun_num_of_elements   Size of the pointer array
+*/
 long ssl_wrapper_cipher_list(Vio *vio, const char **clipher_list, const size_t maximun_num_of_elements)
 {
   const char *cipher= NULL;
@@ -153,8 +159,8 @@ long ssl_wrapper_verify_mode(Vio *vio)
   Return issuer name form peers ssl certificate
 
   @param vio              VIO connection descriptor
-  @param subject          Character buffer in which the issuer name is going to be placed
-  @param subject_size     Size of character buffer for the issuer name
+  @param issuer           Character buffer in which the issuer name is going to be placed
+  @param issuer_size      Size of character buffer for the issuer name
 */
 void ssl_wrapper_get_peer_certificate_issuer(Vio *vio, char *issuer, const size_t issuer_size)
 {
@@ -274,8 +280,8 @@ void  ssl_wrapper_ctx_server_not_after(struct st_VioSSLFd *vio_ssl, char *no_aft
   Return the first day the server certificate is valid
 
   @param vio_ssl              VIO SSL contex descriptor
-  @param no_after             Character buffer for to be filed with the date in human readble format
-  @param no_after_size        Size of the character buffer
+  @param no_before            Character buffer for to be filed with the date in human readble format
+  @param no_before_size       Size of the character buffer
 */
 void ssl_wrapper_ctx_server_not_before(struct st_VioSSLFd *vio_ssl, char *no_before, const size_t no_before_size)
 {

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ int main(int argc, char **argv)`
`43`	`43`	`for (int i = 0; i < ut->total_test_case_count(); ++i)`
`44`	`44`	`{`
`45`	`45`	`const char *name = ut->GetTestCase(i)->name();`
`46`		`- f << "add_test(" << name << " run_unit_tests --gtest_filter=" << name << ".*)" << std::endl;`
	`46`	`+ f << "add_test(" << name << " xplugin_unit_tests --gtest_filter=" << name << ".*)" << std::endl;`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`return 0;`