You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by mm...@apache.org on 2020/08/28 15:18:50 UTC
[geode-native] 02/02: Configure docker based acceptance tests -
Create new acceptance-test folders for cpp and cli - move existing sni
tests to acceptance-test
This is an automated email from the ASF dual-hosted git repository.
mmartell pushed a commit to branch GEODE-8460-docker-available
in repository https://gitbox.apache.org/repos/asf/geode-native.git
commit 3570cb02afa1632ca169c87f9c725dbde2bf933e
Author: Mike Martell <mm...@pivotal.io>
AuthorDate: Fri Aug 28 08:18:17 2020 -0700
Configure docker based acceptance tests
- Create new acceptance-test folders for cpp and cli
- move existing sni tests to acceptance-test
---
CMakeLists.txt | 25 +++++-
clicache/CMakeLists.txt | 4 +
.../CMakeLists.txt | 22 +----
clicache/acceptance-test/Config.cs.in | 46 ++++++++++
.../SNITests.cs | 1 -
clicache/acceptance-test/TestBase.cs | 58 +++++++++++++
clicache/acceptance-test/cache.xml | 41 +++++++++
clicache/acceptance-test/geode.properties | 99 ++++++++++++++++++++++
clicache/acceptance-test/packages.config | 29 +++++++
clicache/acceptance-test/xunit.runner.json | 5 ++
clicache/integration-test2/CMakeLists.txt | 1 -
cppcache/CMakeLists.txt | 5 ++
cppcache/acceptance-test/CMakeLists.txt | 92 ++++++++++++++++++++
.../test => acceptance-test}/SNITest.cpp | 8 --
cppcache/integration/test/CMakeLists.txt | 5 +-
15 files changed, 404 insertions(+), 37 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index baeab6e..428e3f3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -338,8 +338,8 @@ set_target_properties(unit-tests PROPERTIES
add_custom_target(run-unit-tests)
add_dependencies(run-unit-tests unit-tests)
set_target_properties(run-unit-tests PROPERTIES
- EXCLUDE_FROM_ALL TRUE
- EXCLUDE_FROM_DEFAULT_BUILD TRUE
+ EXCLUDE_FROM_ALL TRUE
+ EXCLUDE_FROM_DEFAULT_BUILD TRUE
FOLDER cpp/test/unit
)
@@ -349,13 +349,30 @@ set_target_properties(integration-tests PROPERTIES FOLDER cpp/test/integration)
add_custom_target(run-integration-tests)
add_dependencies(run-integration-tests integration-tests)
set_target_properties(run-integration-tests PROPERTIES
- EXCLUDE_FROM_ALL TRUE
- EXCLUDE_FROM_DEFAULT_BUILD TRUE
+ EXCLUDE_FROM_ALL TRUE
+ EXCLUDE_FROM_DEFAULT_BUILD TRUE
+ FOLDER test-common
+)
+
+add_custom_target(acceptance-tests)
+set_target_properties(acceptance-tests PROPERTIES FOLDER cpp/test/acceptance)
+
+add_custom_target(run-acceptance-tests)
+add_dependencies(run-acceptance-tests acceptance-tests)
+set_target_properties(run-acceptance-tests PROPERTIES
+ EXCLUDE_FROM_ALL TRUE
+ EXCLUDE_FROM_DEFAULT_BUILD TRUE
FOLDER test-common
)
find_package(OpenSSL REQUIRED)
+find_program(DOCKER docker)
+set(DOCKER_PGM ${DOCKER} CACHE INTERNAL "")
+
+find_program(DOCKERCOMPOSE docker-compose)
+set(DOCKERCOMPOSE_PGM ${DOCKERCOMPOSE} CACHE INTERNAL "")
+
add_subdirectory(tests/javaobject)
add_subdirectory(dependencies)
add_subdirectory(cppcache)
diff --git a/clicache/CMakeLists.txt b/clicache/CMakeLists.txt
index 9895a75..9df76a7 100644
--- a/clicache/CMakeLists.txt
+++ b/clicache/CMakeLists.txt
@@ -27,5 +27,9 @@ add_subdirectory(test)
add_subdirectory(test2)
add_subdirectory(integration-test)
add_subdirectory(integration-test2)
+if ((NOT ${DOCKER_PGM} MATCHES "DOCKER_NOTFOUND") AND
+ (NOT ${DOCKERCOMPOSE_PGM} MATCHES "DOCKERCOMPOSE_NOTFOUND"))
+ add_subdirectory(acceptance-test)
+endif()
add_subdirectory(plugins/SQLiteCLI)
diff --git a/clicache/integration-test2/CMakeLists.txt b/clicache/acceptance-test/CMakeLists.txt
similarity index 89%
copy from clicache/integration-test2/CMakeLists.txt
copy to clicache/acceptance-test/CMakeLists.txt
index c41a4d2..2e3aa38 100644
--- a/clicache/integration-test2/CMakeLists.txt
+++ b/clicache/acceptance-test/CMakeLists.txt
@@ -14,7 +14,7 @@
# limitations under the License.
cmake_minimum_required( VERSION 3.9 )
-project( Apache.Geode.IntegrationTests2 CSharp )
+project( Apache.Geode.DockerAcceptanceTests CSharp )
set(CMAKE_CSharp_FLAGS "/langversion:5")
@@ -24,30 +24,13 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/packages.config ${CMAKE_CURRENT_BINAR
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Config.cs.in ${CMAKE_CURRENT_BINARY_DIR}/Config.cs)
add_library( ${PROJECT_NAME} SHARED
- Framework.cs
- Cluster.cs
- ClusterTest.cs
Config.cs.in
${CMAKE_CURRENT_BINARY_DIR}/Config.cs
- GfshTest.cs
- GfshExecuteTest.cs
- Gfsh.cs
- GfshExecute.cs
- CacheXml.cs
- CacheXmlTests.cs
- CqOperationTest.cs
- FunctionExecutionTest.cs
- QueryTest.cs
- RegionTest.cs
- RegionSSLTest.cs
- Position.cs
TestBase.cs
cache.xml
geode.properties
xunit.runner.json
packages.config
- AutoSerializationTests.cs
- SerializationTests.cs
SNITests.cs
)
@@ -64,7 +47,6 @@ set_source_files_properties(
target_link_libraries(${PROJECT_NAME}
PUBLIC
Apache.Geode
- PdxClassLibrary
)
set_target_properties( ${PROJECT_NAME} PROPERTIES
@@ -81,7 +63,7 @@ set_target_properties( ${PROJECT_NAME} PROPERTIES
VS_DOTNET_REFERENCE_xunit.abstractions "${CMAKE_BINARY_DIR}/clicache/packages/xunit.abstractions.2.0.2/lib/net35/xunit.abstractions.dll"
VS_DOTNET_REFERENCE_xunit.execution.desktop "${CMAKE_BINARY_DIR}/clicache/packages/xunit.extensibility.execution.2.4.0/lib/net452/xunit.execution.desktop.dll"
VS_DOTNET_REFERENCE_xunit.runner.visualstudio.testadapter "${CMAKE_BINARY_DIR}/clicache/packages/xunit.runner.visualstudio.2.4.0/build/_common/xunit.runner.visualstudio.testadapter.dll"
- FOLDER cli/test/integration
+ FOLDER cli/test/acceptance
)
if(NOT "${STRONG_NAME_KEY}" STREQUAL "")
diff --git a/clicache/acceptance-test/Config.cs.in b/clicache/acceptance-test/Config.cs.in
new file mode 100644
index 0000000..4111ec2
--- /dev/null
+++ b/clicache/acceptance-test/Config.cs.in
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// GENERATED FROM Config.cs.in DO NOT EDIT Config.cs
+
+public class Config
+{
+ public static string GeodeGfsh
+ {
+ get { return @"@Geode_gfsh_EXECUTABLE@"; }
+ }
+
+ public static string JavaobjectJarPath
+ {
+ get { return @"@JAVAOBJECT_JAR_PATH@"; }
+ }
+
+ public static string SslServerKeyPath
+ {
+ get { return @"@CMAKE_CURRENT_SOURCE_DIR@/../../ssl_keys/server_keys"; }
+ }
+
+ public static string SslClientKeyPath
+ {
+ get { return @"@CMAKE_CURRENT_SOURCE_DIR@/../../ssl_keys/client_keys"; }
+ }
+
+ public static string SniConfigPath
+ {
+ get { return @"@CMAKE_CURRENT_SOURCE_DIR@/../../sni-test-config"; }
+ }
+}
diff --git a/clicache/integration-test2/SNITests.cs b/clicache/acceptance-test/SNITests.cs
similarity index 99%
rename from clicache/integration-test2/SNITests.cs
rename to clicache/acceptance-test/SNITests.cs
index f23818b..0dbf148 100644
--- a/clicache/integration-test2/SNITests.cs
+++ b/clicache/acceptance-test/SNITests.cs
@@ -19,7 +19,6 @@ using System;
using System.Diagnostics;
using System.IO;
using Xunit;
-using PdxTests;
using System.Collections;
using System.Collections.Generic;
using Xunit.Abstractions;
diff --git a/clicache/acceptance-test/TestBase.cs b/clicache/acceptance-test/TestBase.cs
new file mode 100644
index 0000000..fe5b87e
--- /dev/null
+++ b/clicache/acceptance-test/TestBase.cs
@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Reflection;
+using Xunit;
+using Xunit.Abstractions;
+using Xunit.Sdk;
+
+namespace Apache.Geode.Client.IntegrationTests
+{
+ [Trait("Category", "Integration")]
+ public class TestBase
+ {
+ protected ITest currentTest;
+ protected ITestOutputHelper output;
+
+ public TestBase(ITestOutputHelper testOutputHelper)
+ {
+ var helper = (TestOutputHelper)testOutputHelper;
+
+ ITest test = (ITest)helper.GetType().GetField("test", BindingFlags.NonPublic | BindingFlags.Instance)
+ .GetValue(helper);
+
+ currentTest = test;
+ output = testOutputHelper;
+ }
+
+ public void CleanTestCaseDirectory(string directory)
+ {
+ if (Directory.Exists(directory))
+ {
+ Directory.Delete(directory, true);
+ }
+ }
+
+ public string CreateTestCaseDirectoryName()
+ {
+ return currentTest.TestCase.TestMethod.Method.Name;
+ }
+ }
+}
diff --git a/clicache/acceptance-test/cache.xml b/clicache/acceptance-test/cache.xml
new file mode 100644
index 0000000..9840108
--- /dev/null
+++ b/clicache/acceptance-test/cache.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<client-cache
+ xmlns="http://geode.apache.org/schema/cache"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://geode.apache.org/schema/cache
+ http://geode.apache.org/schema/cache/cpp-cache-1.0.xsd"
+ version="9.0">
+
+ <pool name="default">
+ <locator host="localhost" port="LOCATOR_PORT"/>
+ </pool>
+
+ <region name = "REGION_NAME" >
+ <region-attributes refid="PROXY" pool-name="default" />
+ </region>
+
+ <region name = "testRegion1" >
+ <region-attributes refid="PROXY" pool-name="default" />
+ </region>
+
+ <region name = "testRegion2" >
+ <region-attributes refid="PROXY" pool-name="default" />
+ </region>
+
+</client-cache>
\ No newline at end of file
diff --git a/clicache/acceptance-test/geode.properties b/clicache/acceptance-test/geode.properties
new file mode 100644
index 0000000..e43c71a
--- /dev/null
+++ b/clicache/acceptance-test/geode.properties
@@ -0,0 +1,99 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# Default Geode C++ distributed system properties
+# Copy to current directory and uncomment to override defaults.
+#
+## Debugging support, enables stacktraces in apache::geode::client::Exception.
+#
+# The default is false, uncomment to enable stacktraces in exceptions.
+#stacktrace-enabled=true
+#crash-dump-enabled=true
+#
+#
+## Cache region configurtion
+#
+#cache-xml-file=cache.xml
+#
+## Log file config
+#
+#log-file=gemfire_cpp.log
+#log-level=debug
+# zero indicates use no limit.
+#log-file-size-limit=0
+# zero indicates use no limit.
+#log-disk-space-limit=0
+#
+## Statistics values
+#
+# the rate is in seconds.
+#statistic-sample-rate=1
+#statistic-sampling-enabled=true
+#statistic-archive-file=statArchive.gfs
+# zero indicates use no limit.
+#archive-file-size-limit=0
+# zero indicates use no limit.
+#archive-disk-space-limit=0
+#enable-time-statistics=false
+#
+## Heap based eviction configuration
+#
+# maximum amount of memory used by the cache for all regions, 0 disables this feature
+#heap-lru-limit=0
+# percentage over heap-lru-limit when LRU will be called.
+#heap-lru-delta=10
+#
+## Durable client support
+#
+#durable-client-id=
+durable-timeout=12345s
+#
+## SSL socket support
+#
+#ssl-enabled=false
+#ssl-keystore=
+#ssl-keystore-password=
+#ssl-truststore=
+#
+## .NET AppDomain support
+#
+#appdomain-enabled=false
+#
+## Misc
+#
+#conflate-events=server
+#disable-shuffling-of-endpoints=false
+#grid-client=false
+#max-fe-threads=
+#max-socket-buffer-size=66560
+# the units are in seconds.
+#connect-timeout=59
+#notify-ack-interval=10
+#notify-dupcheck-life=300
+#ping-interval=10
+#redundancy-monitor-interval=10
+#auto-ready-for-events=true
+#suspended-tx-timeout=30
+#enable-chunk-handler-thread=false
+#tombstone-timeout=480000
+#
+## module name of the initializer pointing to sample
+## implementation from templates/security
+#security-client-auth-library=securityImpl
+## static method name of the library mentioned above
+#security-client-auth-factory=createUserPasswordAuthInitInstance
+## credential for Dummy Authenticator configured in server.
+## note: security-password property will be inserted by the initializer
+## mentioned in the above property.
+#security-username=root
diff --git a/clicache/acceptance-test/packages.config b/clicache/acceptance-test/packages.config
new file mode 100644
index 0000000..e7d725b
--- /dev/null
+++ b/clicache/acceptance-test/packages.config
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<packages>
+ <package id="Microsoft.VisualStudio.TestPlatform" version="14.0.0.1" targetFramework="net452" />
+ <package id="xunit" version="2.4.0" targetFramework="net452" />
+ <package id="xunit.abstractions" version="2.0.2" targetFramework="net35" />
+ <package id="xunit.analyzers" version="0.10.0" targetFramework="net452" />
+ <package id="xunit.assert" version="2.4.0" targetFramework="net452" />
+ <package id="xunit.core" version="2.4.0" targetFramework="net452" />
+ <package id="xunit.extensibility.core" version="2.4.0" targetFramework="net452" />
+ <package id="xunit.extensibility.execution" version="2.4.0" targetFramework="net452" />
+ <package id="xunit.runner.console" version="2.4.0" targetFramework="net452" developmentDependency="true" />
+ <package id="xunit.runner.visualstudio" version="2.4.0" targetFramework="net452" developmentDependency="true" />
+</packages>
diff --git a/clicache/acceptance-test/xunit.runner.json b/clicache/acceptance-test/xunit.runner.json
new file mode 100644
index 0000000..16ea334
--- /dev/null
+++ b/clicache/acceptance-test/xunit.runner.json
@@ -0,0 +1,5 @@
+{
+ "methodDisplay": "classAndMethod",
+ "parallelizeAssembly": true,
+ "parallelizeTestCollections": true
+}
diff --git a/clicache/integration-test2/CMakeLists.txt b/clicache/integration-test2/CMakeLists.txt
index c41a4d2..3437621 100644
--- a/clicache/integration-test2/CMakeLists.txt
+++ b/clicache/integration-test2/CMakeLists.txt
@@ -48,7 +48,6 @@ add_library( ${PROJECT_NAME} SHARED
packages.config
AutoSerializationTests.cs
SerializationTests.cs
- SNITests.cs
)
set_source_files_properties(
diff --git a/cppcache/CMakeLists.txt b/cppcache/CMakeLists.txt
index eecd64e..0e4126e 100644
--- a/cppcache/CMakeLists.txt
+++ b/cppcache/CMakeLists.txt
@@ -116,6 +116,11 @@ add_subdirectory(internal)
add_subdirectory(integration)
add_subdirectory(integration-test)
+if ((NOT ${DOCKER_PGM} MATCHES "DOCKER_NOTFOUND") AND
+ (NOT ${DOCKERCOMPOSE_PGM} MATCHES "DOCKERCOMPOSE_NOTFOUND"))
+ add_subdirectory(acceptance-test)
+endif()
+
if (BUILD_BENCHMARKS)
add_subdirectory(benchmark)
endif()
diff --git a/cppcache/acceptance-test/CMakeLists.txt b/cppcache/acceptance-test/CMakeLists.txt
new file mode 100644
index 0000000..e62d8a8
--- /dev/null
+++ b/cppcache/acceptance-test/CMakeLists.txt
@@ -0,0 +1,92 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+add_executable(cpp-acceptance-test
+ SNITest.cpp
+)
+
+target_compile_definitions(cpp-acceptance-test
+ PUBLIC
+ GTEST_ELLIPSIS_NEEDS_POD_
+)
+
+target_include_directories(cpp-acceptance-test
+ PUBLIC
+ ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+target_link_libraries(cpp-acceptance-test
+ PUBLIC
+ apache-geode
+ integration-framework
+ testobject
+ ACE::ACE
+ GTest::gtest
+ GTest::gtest_main
+ Boost::boost
+ Boost::system
+ Boost::log
+ Boost::filesystem
+ Boost::chrono
+ PRIVATE
+ _WarningsAsError
+ internal
+)
+
+if(WIN32)
+ foreach (_target apache-geode testobject)
+ add_custom_command(TARGET cpp-acceptance-test
+ DEPENDS ${_target}
+ COMMAND ${CMAKE_COMMAND} -E copy_if_different
+ "$<TARGET_FILE:${_target}>"
+ "$<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:$<TARGET_PDB_FILE:${_target}>>"
+ "$<TARGET_FILE_DIR:cpp-acceptance-test>")
+ endforeach()
+endif()
+
+# file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/sni-test-config DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+
+set_target_properties(cpp-acceptance-test PROPERTIES
+ CXX_VISIBILITY_PRESET hidden
+ VISIBILITY_INLINES_HIDDEN ON
+ FOLDER cpp/test/acceptance
+)
+
+add_clangformat(cpp-acceptance-test)
+
+enable_testing()
+include(GoogleTest)
+gtest_discover_tests(cpp-acceptance-test
+ DISCOVERY_TIMEOUT 60
+)
+
+file(GLOB SSL_CERTIFICATES
+ "${CMAKE_CURRENT_SOURCE_DIR}/*Keys"
+ )
+
+file(INSTALL ${SSL_CERTIFICATES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+
+add_custom_target(run-cpp-acceptance-test
+ DEPENDS $<TARGET_FILE:cpp-acceptance-test>
+ COMMAND ctest -C $<CONFIG>
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+ USES_TERMINAL
+)
+add_dependencies(run-acceptance-tests run-cpp-acceptance-test)
+set_target_properties(run-cpp-acceptance-test PROPERTIES
+ EXCLUDE_FROM_ALL TRUE
+ EXCLUDE_FROM_DEFAULT_BUILD TRUE
+ FOLDER cpp/test/acceptance
+)
diff --git a/cppcache/integration/test/SNITest.cpp b/cppcache/acceptance-test/SNITest.cpp
similarity index 97%
rename from cppcache/integration/test/SNITest.cpp
rename to cppcache/acceptance-test/SNITest.cpp
index 0232bc6..6d28681 100644
--- a/cppcache/integration/test/SNITest.cpp
+++ b/cppcache/acceptance-test/SNITest.cpp
@@ -117,11 +117,7 @@ class SNITest : public ::testing::Test {
boost::filesystem::path sniConfigPath;
};
-#if defined(_WIN32)
-TEST_F(SNITest, DISABLED_connectViaProxyTest) {
-#else
TEST_F(SNITest, connectViaProxyTest) {
-#endif
const auto clientTruststore =
(clientSslKeysDir / boost::filesystem::path("/truststore_sni.pem"));
@@ -150,11 +146,7 @@ TEST_F(SNITest, connectViaProxyTest) {
cache.close();
}
-#if defined(_WIN32)
-TEST_F(SNITest, DISABLE_connectWithoutProxyFails) {
-#else
TEST_F(SNITest, connectWithoutProxyFails) {
-#endif
const auto clientTruststore =
(clientSslKeysDir / boost::filesystem::path("/truststore_sni.pem"));
diff --git a/cppcache/integration/test/CMakeLists.txt b/cppcache/integration/test/CMakeLists.txt
index f5c3a06..f11fc67 100644
--- a/cppcache/integration/test/CMakeLists.txt
+++ b/cppcache/integration/test/CMakeLists.txt
@@ -42,7 +42,6 @@ add_executable(cpp-integration-test
SimpleAuthInitialize.hpp
SimpleCqListener.cpp
SimpleCqListener.hpp
- SNITest.cpp
SslOneWayTest.cpp
SslTwoWayTest.cpp
StructTest.cpp
@@ -97,7 +96,7 @@ configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/func_cacheserver2_pool.xml
${CMAKE_CURRENT_BINARY_DIR}/func_cacheserver2_pool.xml COPYONLY)
- file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/sni-test-config DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+#file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/sni-test-config DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
set_target_properties(cpp-integration-test PROPERTIES
CXX_VISIBILITY_PRESET hidden
@@ -117,7 +116,7 @@ file(GLOB SSL_CERTIFICATES
"${CMAKE_CURRENT_SOURCE_DIR}/*Keys"
)
-file(INSTALL ${SSL_CERTIFICATES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+#file(INSTALL ${SSL_CERTIFICATES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
add_custom_target(run-cpp-integration-test
DEPENDS $<TARGET_FILE:cpp-integration-test>