From 412720ec0a8f27ddd4af00f771df3aa4d3529625 Mon Sep 17 00:00:00 2001 From: Yaroslav Stefinko Date: Fri, 28 Mar 2025 15:59:50 +0200 Subject: [PATCH] Update FV/NV jobs Remove mock-server and usage of it on Github. Remove docs builds on NV and ARMHF FV jobs as redundant. Remove scripts used to test network with mock-server. Relates-To: OCMAM-177 Signed-off-by: Yaroslav Stefinko --- scripts/android/build-test-emulator.sh | 107 -------- .../ios/fv/gh-actions-build-with-tests-fv.sh | 36 --- .../fv/gh-actions-functional-network-test.sh | 140 ---------- scripts/linux-armhf/fv/build_armhf_fv.sh | 5 +- .../fv/olp-cpp-sdk-functional-test-mock.sh | 65 ----- scripts/linux/fv/test_fv.sh | 5 +- scripts/linux/nv/build_valgrind.sh | 4 +- tests/utils/mock-server/.gitignore | 23 -- tests/utils/mock-server/README.md | 21 -- tests/utils/mock-server/mock-server-cert.pem | 22 -- tests/utils/mock-server/package-lock.json | 254 ------------------ tests/utils/mock-server/package.json | 23 -- tests/utils/mock-server/server.js | 41 --- 13 files changed, 5 insertions(+), 741 deletions(-) delete mode 100755 scripts/android/build-test-emulator.sh delete mode 100755 scripts/ios/fv/gh-actions-build-with-tests-fv.sh delete mode 100755 scripts/ios/fv/gh-actions-functional-network-test.sh delete mode 100755 scripts/linux/fv/olp-cpp-sdk-functional-test-mock.sh delete mode 100644 tests/utils/mock-server/.gitignore delete mode 100644 tests/utils/mock-server/README.md delete mode 100644 tests/utils/mock-server/mock-server-cert.pem delete mode 100644 tests/utils/mock-server/package-lock.json delete mode 100644 tests/utils/mock-server/package.json delete mode 100644 tests/utils/mock-server/server.js diff --git a/scripts/android/build-test-emulator.sh b/scripts/android/build-test-emulator.sh deleted file mode 100755 index 2d269aac2..000000000 --- a/scripts/android/build-test-emulator.sh +++ /dev/null @@ -1,107 +0,0 @@ -#!/bin/bash -ex -# -# Copyright (C) 2020-2025 HERE Europe B.V. -# -# Licensed 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. -# -# SPDX-License-Identifier: Apache-2.0 -# License-Filename: LICENSE - -${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --list -${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "ndk;22.1.7171670" --sdk_root=${ANDROID_HOME} >/dev/null -${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "platforms;android-21" -${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "platform-tools" -${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "ndk-bundle" -${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --list - -# -# API / ABI / NDK are hardcoded below -# -# Variables -export ANDROID_ABI="x86_64" -export ANDROID_API=21 -export ANDROID_NDK_ROOT="/usr/local/lib/android/sdk/ndk/22.1.7171670" -export ANDROID_NDK="/usr/local/lib/android/sdk/ndk/22.1.7171670" -export ANDROID_NDK_HOME="/usr/local/lib/android/sdk/ndk/22.1.7171670" -ls -la android-ndk-r22b-linux || true -ls -la /usr/local/lib/android/sdk/ndk/22.1.7171670 || true -ls -la /usr/local/lib/android/sdk/ndk/22.1.7171670/android-ndk-r22b-linux || true -export NDK_ROOT=$ANDROID_NDK_ROOT/ndk-bundle # This var is not exist on Azure MacOS image, step can be skipped on other CI -echo "NDK_ROOT is ${NDK_ROOT} , ANDROID_HOME is ${ANDROID_HOME} " # as we already set this var inside docker image. -ls -la $ANDROID_HOME -export PATH=$PATH:$ANDROID_HOME/tools/bin/:$ANDROID_HOME/emulator:$ANDROID_HOME/platform-tools:$ANDROID_HOME/cmdline-tools/latest/bin/ - -# Start compilation -mkdir -p build && cd build - -echo "" -echo "" -echo "*************** $VARIANT Build SDK for C++ ********** Start ***************" -CMAKE_COMMAND="cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DBUILD_TYPE=${BUILD_TYPE} -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_ROOT/build/cmake/android.toolchain.cmake \ --DANDROID_PLATFORM=android-$ANDROID_API -DANDROID_STL=c++_static -DANDROID_ABI=$ANDROID_ABI" -BUILD_COMMAND="cmake --build . -- -j4" - -echo "" -echo " ---- Calling $CMAKE_COMMAND" -${CMAKE_COMMAND} - -# Run CMake. Warnings and errors are saved to build/CMakeFiles/CMakeOutput.log and -# build/CMakeFiles/CMakeError.log. -# -- We link Edge SDK as shared libraries in order to use shadowing for unit tests. -# -- We build the examples. -echo "" -echo " ---- Calling ${BUILD_COMMAND}" -${BUILD_COMMAND} -cd - - -${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --list - -# Add emulator if not already added. Needed for docker. -echo "y" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager "emulator" "platforms;android-$ANDROID_API" - -# Install AVD files -echo "y" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "system-images;android-$ANDROID_API;google_apis;$ANDROID_ABI" - -# Create emulator -echo "yes" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/avdmanager create avd -n android_emulator -k "system-images;android-$ANDROID_API;google_apis;$ANDROID_ABI" --force -echo "AVD created" -emulator -list-avds - -cd $ANDROID_HOME/emulator -echo "Starting emulator in background" -nohup emulator -avd android_emulator -no-snapshot -noaudio \ --no-boot-anim -gpu off -no-accel -no-window -camera-back none -camera-front none -selinux permissive \ --qemu -m 2048 & - -# Below are special commands for wait until emulator actually loads and boot completed -adb wait-for-device -A=$(adb shell getprop init.svc.adbd | tr -d '\r' ) -while [ "$A" != "running" ]; do sleep 3; A=$(adb shell getprop init.svc.adbd | tr -d '\r' ); done - -# Showing list of devices connected to host -adb devices - -# At this moment we assume that Android Virtual Device is started in emulation, ready for our commands. -# Running some trivial command like pressing Menu button. -adb shell input keyevent 82 - -# example of network usage check: -# to find network usage for the app 'com.example.myapp', run the following commands: -# adb shell dumpsys package com.example.myapp | grep userId -# adb shell dumpsys connectivity - -# Showing list of devices connected to host -adb devices - -### In this place, we plan to run .apk as test application inside emulator. -echo "Emulator started" diff --git a/scripts/ios/fv/gh-actions-build-with-tests-fv.sh b/scripts/ios/fv/gh-actions-build-with-tests-fv.sh deleted file mode 100755 index 30f88eb1e..000000000 --- a/scripts/ios/fv/gh-actions-build-with-tests-fv.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash -e -# -# Copyright (C) 2021-2024 HERE Europe B.V. -# -# Licensed 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. -# -# SPDX-License-Identifier: Apache-2.0 -# License-Filename: LICENSE - -# Getting rid of boost installed to the CI image (not clear when it appeared) -# asciidoc and source-highlight are using it so dependencies are ignored. -# Sometimes there is no boost and there is no need to fail in this case. -brew uninstall --ignore-dependencies boost || true - -mkdir -p build && cd build - -cmake ../ -GXcode \ - -DCMAKE_TOOLCHAIN_FILE=../cmake/toolchains/iOS.cmake \ - -DCMAKE_BUILD_TYPE=$BUILD_TYPE \ - -DBUILD_TYPE=${BUILD_TYPE} \ - -DPLATFORM=iphoneos \ - -DOLP_SDK_ENABLE_TESTING=ON \ - -DSIMULATOR=YES \ - -DOLP_SDK_BUILD_EXAMPLES=OFF - -xcodebuild diff --git a/scripts/ios/fv/gh-actions-functional-network-test.sh b/scripts/ios/fv/gh-actions-functional-network-test.sh deleted file mode 100755 index 7d39a1248..000000000 --- a/scripts/ios/fv/gh-actions-functional-network-test.sh +++ /dev/null @@ -1,140 +0,0 @@ -#!/bin/bash -ex -# -# Copyright (C) 2021-2025 HERE Europe B.V. -# -# Licensed 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. -# -# SPDX-License-Identifier: Apache-2.0 -# License-Filename: LICENSE - -### -### Script starts Mock server, install certificate, add it to trusted and -### run FV functional test against it inside iOS Simulator (more info in OLPEDGE-1773) -### NOTE: Simulator fails during application launch, so step is disabled until OLPEDGE-2543 is DONE. -### -### # TODO in OLPEDGE-2543 : -## 1. Find out how to save xml report after Simulator test done. -## 2. Fix `xcrun simctl launch` cmd below: errors from app like -999 etc. -## 3. Functional test should be able to use this variable : IP_ADDR for connecting to Mock Server. It's possible solution for error -999 when connecting to Server. -## 4. Need to find out how to parse `xcrun simctl spawn booted log stream` and catch finish of test-run. Otherwise it goes to infinite loop. -## -## export IP_ADDR=$(ipconfig getifaddr en0) -## curl -s http://${IP_ADDR}:1080 -## -## - - -# For core dump backtrace -ulimit -c unlimited - -# Set workspace location -if [[ ${CI_PROJECT_DIR} == "" ]]; then - export CI_PROJECT_DIR=$(pwd) -fi - -if [[ ${GITHUB_RUN_ID} == "" ]]; then - # Local run - export GITHUB_RUN_ID=$(date '+%s') - pushd tests/utils/mock-server - echo ">>> Installing mock server SSL certificate into OS... >>>" - # Import and Make trusted - security import mock-server-cert.pem || true - security add-trusted-cert -d -r trustRoot -k /Library/Keychains/System.keychain mock-server-cert.pem || true - # Validate cert: if trusted - succeeded , if not trusted - fails - security verify-cert -c mock-server-cert.pem - echo ">>> Starting Mock Server... >>>" - npm install - node server.js & export SERVER_PID=$! - popd -else - # CI run - pushd tests/utils/mock-server - echo ">>> Installing mock server SSL certificate into OS... >>>" - # Import and Make trusted - sudo security import mock-server-cert.pem - sudo security authorizationdb write com.apple.trust-settings.admin allow; sudo security add-trusted-cert -d -r trustRoot -k /Library/Keychains/System.keychain mock-server-cert.pem ; sudo security authorizationdb remove com.apple.trust-settings.admin || true - # Validate cert: if trusted - succeeded , if not trusted - fails - sudo security verify-cert -c mock-server-cert.pem - echo ">>> Starting Mock Server... >>>" - npm install - node server.js & export SERVER_PID=$! - popd -fi - - -# Node can start server in 1 second, but not faster. -# Add waiter for server to be started. No other way to solve that. -# Curl returns code 1 - means server still down. Curl returns 0 when server is up -RC=1 -while [[ ${RC} -ne 0 ]]; -do - set +e - curl -s http://localhost:1080 - RC=$? - sleep 0.2 - set -e -done - -# Functional test should be able to use this variable : IP_ADDR for connecting to Mock Server. -# Looks like localhost is not reachable for Simulator. -export IP_ADDR=$(ipconfig getifaddr en0) -curl -s http://${IP_ADDR}:1080 - -echo ">>> Start network tests ... >>>" -# List available devices, runtimes on MacOS node -xcrun simctl list -xcrun simctl list devices -xcrun simctl list runtimes - -export CurrentDeviceUDID=$(xcrun simctl list devices | grep "iPhone 15 (" | grep -v "unavailable" | grep -v "com.apple.CoreSimulator.SimDeviceType" | cut -d'(' -f2 | cut -d')' -f1 | head -1) - -# Create new Simulator device - -xcrun simctl list devices | grep ${CurrentDeviceUDID} -xcrun simctl boot ${CurrentDeviceUDID} || true -xcrun simctl list devices | grep ${CurrentDeviceUDID} -xcrun simctl create ${GITHUB_RUN_ID}_iphone15 "com.apple.CoreSimulator.SimDeviceType.iPhone-15" -xcrun simctl list devices | grep ${CurrentDeviceUDID} -echo "Simulator created" - -/Applications/Xcode.app/Contents/Developer/Applications/Simulator.app/Contents/MacOS/Simulator -CurrentDeviceUDID ${CurrentDeviceUDID} & export SIMULATOR_PID=$! || /Applications/Xcode_15.0.1.app/Contents/Developer/Applications/Simulator.app/Contents/MacOS/Simulator -CurrentDeviceUDID ${CurrentDeviceUDID} & export SIMULATOR_PID=$! -echo "Simulator started device" -# -xcrun simctl logverbose enable -xcrun simctl install ${CurrentDeviceUDID} ./build/tests/functional/network/ios/olp-cpp-sdk-functional-network-tests-tester/Debug-iphonesimulator/olp-ios-olp-cpp-sdk-functional-network-tests-lib-tester.app -echo "App installed" -xcrun simctl launch ${CurrentDeviceUDID} com.here.olp.olp-ios-olp-cpp-sdk-functional-network-tests-lib-tester -# TODO: Need to find out how to parse `xcrun simctl spawn booted log stream` and catch finish of test-run. Otherwise it goes to infinite loop. -#xcrun simctl spawn booted log stream | grep "olp-ios-olp-cpp-sdk-functional-network-tests-lib-tester:" -# TODO: Need to find out how to fix issue with Mock Server: OLPEDGE-2543 -xcrun simctl spawn booted log stream | grep "error" & -# collect log data -xcrun simctl spawn booted log collect -# open location -cd `xcrun simctl getenv booted SIMULATOR_SHARED_RESOURCES_DIRECTORY` -ls -la /Users/runner/Library/Logs/CoreSimulator/AC3F6347-30F3-40CA-948A-58390550C1D1/system_logs.logarchive || true -tail /Users/runner/Library/Logs/CoreSimulator/AC3F6347-30F3-40CA-948A-58390550C1D1/system_logs.logarchive || true -result=$? -echo "App launched" -xcrun simctl shutdown ${CurrentDeviceUDID} -echo "Simulator shutdown done" - -echo ">>> Finished network tests >>>" - -# Terminate the mock server -kill -TERM $SERVER_PID || true -kill -TERM $SIMULATOR_PID || true - -#wait - -exit ${result} diff --git a/scripts/linux-armhf/fv/build_armhf_fv.sh b/scripts/linux-armhf/fv/build_armhf_fv.sh index b5749270c..0437ee0f9 100755 --- a/scripts/linux-armhf/fv/build_armhf_fv.sh +++ b/scripts/linux-armhf/fv/build_armhf_fv.sh @@ -1,6 +1,6 @@ #!/bin/bash -e # -# Copyright (C) 2019 HERE Europe B.V. +# Copyright (C) 2019-2025 HERE Europe B.V. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -24,7 +24,6 @@ export CXX=arm-linux-gnueabihf-g++-7 export LD=arm-linux-gnueabihf-ld mkdir -p build && cd build -cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DOLP_SDK_BUILD_DOC=ON -DBUILD_SHARED_LIBS=ON -OLP_SDK_BUILD_EXAMPLES=OFF -DOLP_SDK_ENABLE_TESTING=OFF .. +cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_SHARED_LIBS=ON -OLP_SDK_BUILD_EXAMPLES=OFF -DOLP_SDK_ENABLE_TESTING=OFF .. make -j$(nproc) -make docs echo "ARM HF build succeeded." diff --git a/scripts/linux/fv/olp-cpp-sdk-functional-test-mock.sh b/scripts/linux/fv/olp-cpp-sdk-functional-test-mock.sh deleted file mode 100755 index 9363e67bc..000000000 --- a/scripts/linux/fv/olp-cpp-sdk-functional-test-mock.sh +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/bash -ex -# -# Copyright (C) 2020 HERE Europe B.V. -# -# Licensed 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. -# -# SPDX-License-Identifier: Apache-2.0 -# License-Filename: LICENSE - -# This script is for running functional tests against Mock Server -# https://www.mock-server.com/ - -# For core dump backtrace -ulimit -c unlimited - -echo ">>> Starting Mock Server... >>>" -pushd tests/utils/mock-server -npm install -node server.js & export SERVER_PID=$! -popd - -# Node can start server in ~1 second, but not faster. -# Add waiter for server to be started. No other way to solve that. -# When curl returns code 1 , means server still down. Curl returns 0 when server is up. -RC=1 -while [[ ${RC} -ne 0 ]]; -do - set +e - curl -s http://localhost:1080 - RC=$? - sleep 0.3 - set -e -done - -echo ">>> Installing mock server SSL certificate into OS... >>>" -#download cert -curl https://raw.githubusercontent.com/mock-server/mockserver/master/mockserver-core/src/main/resources/org/mockserver/socket/CertificateAuthorityCertificate.pem --output mock-server-cert.pem -#verify cert is in place -ls -la /usr/share/ca-certificates/mock-server-cert.pem -cat /etc/ca-certificates.conf -#install certificate -sudo update-ca-certificates - -echo ">>> Starting Functional Test against Mock Server... >>>" -$REPO_HOME/build/tests/functional/olp-cpp-sdk-functional-tests \ - --gtest_output="xml:$REPO_HOME/reports/olp-functional-test-mock-report.xml" \ - --gtest_filter="VersionedLayerClientTest.GetPartitions":"VersionedLayerClientTest.GetAggregatedData":"CatalogClientTest.*":"VersionedLayerClientPrefetchTest.*":"VersionedLayerClientProtectTest.*":"VersionedLayerClientGetDataTest.*" -result=$? -echo "Functional test with Mock finished with status: ${result}" - -# Terminate the mock server -kill -TERM $SERVER_PID -wait - -exit ${result} diff --git a/scripts/linux/fv/test_fv.sh b/scripts/linux/fv/test_fv.sh index a60303635..ba151f45d 100755 --- a/scripts/linux/fv/test_fv.sh +++ b/scripts/linux/fv/test_fv.sh @@ -1,6 +1,6 @@ #!/bin/bash -ex # -# Copyright (C) 2019-2021 HERE Europe B.V. +# Copyright (C) 2019-2025 HERE Europe B.V. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -71,9 +71,6 @@ do done # End of retry part. This part can be removed any time later or after all online tests are stable. -# Run functional tests with Mock Server -${FV_HOME}/olp-cpp-sdk-functional-test-mock.sh || TEST_FAILURE=1 - # Run integration tests source ${FV_HOME}/olp-cpp-sdk-integration-test.variables ${FV_HOME}/olp-cpp-sdk-integration-test.sh || TEST_FAILURE=1 diff --git a/scripts/linux/nv/build_valgrind.sh b/scripts/linux/nv/build_valgrind.sh index b10742178..907a1d833 100755 --- a/scripts/linux/nv/build_valgrind.sh +++ b/scripts/linux/nv/build_valgrind.sh @@ -1,6 +1,6 @@ #!/bin/bash -e # -# Copyright (C) 2019 HERE Europe B.V. +# Copyright (C) 2019-2025 HERE Europe B.V. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -19,5 +19,5 @@ mkdir -p build && cd build -cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DOLP_SDK_NO_EXCEPTION=ON -DOLP_SDK_BUILD_EXAMPLES=ON -DOLP_SDK_BUILD_DOC=ON -DBUILD_SHARED_LIBS=ON -DOLP_SDK_ENABLE_TESTING=ON .. +cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DOLP_SDK_NO_EXCEPTION=ON -DOLP_SDK_BUILD_EXAMPLES=ON -DBUILD_SHARED_LIBS=ON -DOLP_SDK_ENABLE_TESTING=ON .. make -j$(nproc) diff --git a/tests/utils/mock-server/.gitignore b/tests/utils/mock-server/.gitignore deleted file mode 100644 index 999a9b7a0..000000000 --- a/tests/utils/mock-server/.gitignore +++ /dev/null @@ -1,23 +0,0 @@ -# Logs -logs -*.log -npm-debug.log* - -# Diagnostic reports (https://nodejs.org/api/report.html) -report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json - -# Runtime data -pids -*.pid -*.seed -*.pid.lock - -# Dependency directories -node_modules/ - -# Optional npm cache directory -.npm - -# dotenv environment variables file -.env -.env.test diff --git a/tests/utils/mock-server/README.md b/tests/utils/mock-server/README.md deleted file mode 100644 index fbee918c5..000000000 --- a/tests/utils/mock-server/README.md +++ /dev/null @@ -1,21 +0,0 @@ -# MockServer - -## What is MockServer - -Read more at - -## Mocking Responses and Setting Expectations - -Follow the [documentation](https://mock-server.com/mock_server/creating_expectations.html) for the MockServer. - -**Note:** MockServer will play expectations in the exact order they are added. For example, if an expectation `A` is added with `Times.exactly(3)` then expectation `B` is added with `Times.exactly(2)` with the same request matcher they will be applied in the following order `A, A, A, B, B`. - -## Getting Started - -You can start this server very easily - -```bash -cd tests/utils/mock-server -npm install -node server.js -``` diff --git a/tests/utils/mock-server/mock-server-cert.pem b/tests/utils/mock-server/mock-server-cert.pem deleted file mode 100644 index 33a8b2862..000000000 --- a/tests/utils/mock-server/mock-server-cert.pem +++ /dev/null @@ -1,22 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDqDCCApCgAwIBAgIEPhwe6TANBgkqhkiG9w0BAQsFADBiMRswGQYDVQQDDBJ3 -d3cubW9ja3NlcnZlci5jb20xEzARBgNVBAoMCk1vY2tTZXJ2ZXIxDzANBgNVBAcM -BkxvbmRvbjEQMA4GA1UECAwHRW5nbGFuZDELMAkGA1UEBhMCVUswIBcNMTYwNjIw -MTYzNDE0WhgPMjExNzA1MjcxNjM0MTRaMGIxGzAZBgNVBAMMEnd3dy5tb2Nrc2Vy -dmVyLmNvbTETMBEGA1UECgwKTW9ja1NlcnZlcjEPMA0GA1UEBwwGTG9uZG9uMRAw -DgYDVQQIDAdFbmdsYW5kMQswCQYDVQQGEwJVSzCCASIwDQYJKoZIhvcNAQEBBQAD -ggEPADCCAQoCggEBAPGORrdkwTY1H1dvQPYaA+RpD+pSbsvHTtUSU6H7NQS2qu1p -sE6TEG2fE+Vb0QIXkeH+jjKzcfzHGCpIU/0qQCu4RVycrIW4CCdXjl+T3L4C0I3R -mIMciTig5qcAvY9P5bQAdWDkU36YGrCjGaX3QlndGxD9M974JdpVK4cqFyc6N4gA -Onys3uS8MMmSHTjTFAgR/WFeJiciQnal+Zy4ZF2x66CdjN+hP8ch2yH/CBwrSBc0 -ZeH2flbYGgkh3PwKEqATqhVa+mft4dCrvqBwGhBTnzEGWK/qrl9xB4mTs4GQ/Z5E -8rXzlvpKzVJbfDHfqVzgFw4fQFGV0XMLTKyvOX0CAwEAAaNkMGIwHQYDVR0OBBYE -FH3W3sL4XRDM/VnRayaSamVLISndMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQD -AgG2MCMGA1UdJQQcMBoGCCsGAQUFBwMBBggrBgEFBQcDAgYEVR0lADANBgkqhkiG -9w0BAQsFAAOCAQEAecfgKuMxCBe/NxVqoc4kzacf9rjgz2houvXdZU2UDBY3hCs4 -MBbM7U9Oi/3nAoU1zsA8Rg2nBwc76T8kSsfG1TK3iJkfGIOVjcwOoIjy3Z8zLM2V -YjYbOUyAQdO/s2uShAmzzjh9SV2NKtcNNdoE9e6udvwDV8s3NGMTUpY5d7BHYQqV -sqaPGlsKi8dN+gdLcRbtQo29bY8EYR5QJm7QJFDI1njODEnrUjjMvWw2yjFlje59 -j/7LBRe2wfNmjXFYm5GqWft10UJ7Ypb3XYoGwcDac+IUvrgmgTHD+E3klV3SUi8i -Gm5MBedhPkXrLWmwuoMJd7tzARRHHT6PBH/ZGw== ------END CERTIFICATE----- diff --git a/tests/utils/mock-server/package-lock.json b/tests/utils/mock-server/package-lock.json deleted file mode 100644 index f182f4a3d..000000000 --- a/tests/utils/mock-server/package-lock.json +++ /dev/null @@ -1,254 +0,0 @@ -{ - "name": "@here/mock-server", - "version": "0.0.1", - "lockfileVersion": 2, - "requires": true, - "packages": { - "": { - "name": "@here/mock-server", - "version": "0.0.1", - "license": "Apache-2.0", - "dependencies": { - "mockserver-node": "^5.15.0" - } - }, - "node_modules/asap": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", - "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=" - }, - "node_modules/balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" - }, - "node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/follow-redirects": { - "version": "1.15.6", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz", - "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==", - "funding": [ - { - "type": "individual", - "url": "https://github.com/sponsors/RubenVerborgh" - } - ], - "engines": { - "node": ">=4.0" - }, - "peerDependenciesMeta": { - "debug": { - "optional": true - } - } - }, - "node_modules/fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" - }, - "node_modules/glob": { - "version": "8.0.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-8.0.3.tgz", - "integrity": "sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==", - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^5.0.1", - "once": "^1.3.0" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", - "dependencies": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "node_modules/inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" - }, - "node_modules/minimatch": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/mockserver-node": { - "version": "5.15.0", - "resolved": "https://registry.npmjs.org/mockserver-node/-/mockserver-node-5.15.0.tgz", - "integrity": "sha512-Po442dwW5GpTSgP2T2FbGFv8vp07llfTVJSZBZQZ2VoTFvkhRgCN1D1FqRFhTFZ/42aCTYsWxQnjp1Tt1nISxA==", - "dependencies": { - "follow-redirects": "~1.15.2", - "glob": "~8.0.3", - "q": "~2.0.3" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "dependencies": { - "wrappy": "1" - } - }, - "node_modules/pop-iterate": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/pop-iterate/-/pop-iterate-1.0.1.tgz", - "integrity": "sha1-zqz9q0q/NT16DyqqLB/Hs/lBO6M=" - }, - "node_modules/q": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/q/-/q-2.0.3.tgz", - "integrity": "sha1-dbjbAlWhpa+C9Yw/Oqoe/sfQ0TQ=", - "dependencies": { - "asap": "^2.0.0", - "pop-iterate": "^1.0.1", - "weak-map": "^1.0.5" - } - }, - "node_modules/weak-map": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/weak-map/-/weak-map-1.0.8.tgz", - "integrity": "sha512-lNR9aAefbGPpHO7AEnY0hCFjz1eTkWCXYvkTRrTHs9qv8zJp+SkVYpzfLIFXQQiG3tVvbNFQgVg2bQS8YGgxyw==" - }, - "node_modules/wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" - } - }, - "dependencies": { - "asap": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", - "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=" - }, - "balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" - }, - "brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "requires": { - "balanced-match": "^1.0.0" - } - }, - "follow-redirects": { - "version": "1.15.6", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz", - "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==" - }, - "fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" - }, - "glob": { - "version": "8.0.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-8.0.3.tgz", - "integrity": "sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==", - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^5.0.1", - "once": "^1.3.0" - } - }, - "inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", - "requires": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" - }, - "minimatch": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", - "requires": { - "brace-expansion": "^2.0.1" - } - }, - "mockserver-node": { - "version": "5.15.0", - "resolved": "https://registry.npmjs.org/mockserver-node/-/mockserver-node-5.15.0.tgz", - "integrity": "sha512-Po442dwW5GpTSgP2T2FbGFv8vp07llfTVJSZBZQZ2VoTFvkhRgCN1D1FqRFhTFZ/42aCTYsWxQnjp1Tt1nISxA==", - "requires": { - "follow-redirects": "~1.15.2", - "glob": "~8.0.3", - "q": "~2.0.3" - } - }, - "once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "requires": { - "wrappy": "1" - } - }, - "pop-iterate": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/pop-iterate/-/pop-iterate-1.0.1.tgz", - "integrity": "sha1-zqz9q0q/NT16DyqqLB/Hs/lBO6M=" - }, - "q": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/q/-/q-2.0.3.tgz", - "integrity": "sha1-dbjbAlWhpa+C9Yw/Oqoe/sfQ0TQ=", - "requires": { - "asap": "^2.0.0", - "pop-iterate": "^1.0.1", - "weak-map": "^1.0.5" - } - }, - "weak-map": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/weak-map/-/weak-map-1.0.8.tgz", - "integrity": "sha512-lNR9aAefbGPpHO7AEnY0hCFjz1eTkWCXYvkTRrTHs9qv8zJp+SkVYpzfLIFXQQiG3tVvbNFQgVg2bQS8YGgxyw==" - }, - "wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" - } - } -} diff --git a/tests/utils/mock-server/package.json b/tests/utils/mock-server/package.json deleted file mode 100644 index 14477b6ed..000000000 --- a/tests/utils/mock-server/package.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "name": "@here/mock-server", - "description": "MockServer runner", - "author": { - "name": "HERE Global B.V. and its affiliate(s)", - "url": "https://here.com" - }, - "license": "Apache-2.0", - "private": true, - "version": "0.0.1", - "repository": { - "type": "git", - "url": "git@github.com:heremaps/here-olp-sdk-cpp.git", - "directory": "tests/utils/mock-server" - }, - "keywords": [ - "HERE", - "HERE Technologies" - ], - "dependencies": { - "mockserver-node": "^5.15.0" - } -} diff --git a/tests/utils/mock-server/server.js b/tests/utils/mock-server/server.js deleted file mode 100644 index aedf06597..000000000 --- a/tests/utils/mock-server/server.js +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (C) 2020 HERE Europe B.V. - * - * Licensed 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. - * - * SPDX-License-Identifier: Apache-2.0 - * License-Filename: LICENSE - */ - -var mockserver = require('mockserver-node'); -var port = 1080; - -mockserver - .start_mockserver({ - serverPort: port, - verbose: false - }) - .then( - function () { - console.log("MockServer started"); - }, - function (error) { - console.log(JSON.stringify(error)); - } - ); - -process.on('SIGTERM', function () { - mockserver.stop_mockserver({ - serverPort: port - }); -});