Skip to content

Commit ba074f2

Browse files
NevazhnovuNevazhnovu
committed
Create separate sh files for platforms
1 parent caa337d commit ba074f2

File tree

5 files changed

+133
-115
lines changed

5 files changed

+133
-115
lines changed

‎.github/workflows/Test.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -177,20 +177,20 @@ jobs:
177177
run: |
178178
cd ~/work/unity-sdk/unity-sdk && chmod -R 777 UI-TESTS
179179
cd UI-TESTS
180-
test-rerun ~/work/unity-sdk/unity-sdk/UI-TESTS -s ~/work/unity-sdk/unity-sdk/UI-TESTS/ios.runsettings --filter Name=ClickAcceptAllButtonTest
181-
test-rerun ~/work/unity-sdk/unity-sdk/UI-TESTS -s ~/work/unity-sdk/unity-sdk/UI-TESTS/ios.runsettings --filter Name=ClickRejectAllButtonTest
182-
test-rerun ~/work/unity-sdk/unity-sdk/UI-TESTS -s ~/work/unity-sdk/unity-sdk/UI-TESTS/ios.runsettings --filter Name=OpenPmLayersTest
183-
test-rerun ~/work/unity-sdk/unity-sdk/UI-TESTS -s ~/work/unity-sdk/unity-sdk/UI-TESTS/ios.runsettings --filter Name=SaveAndExitGDPRTest
184-
test-rerun ~/work/unity-sdk/unity-sdk/UI-TESTS -s ~/work/unity-sdk/unity-sdk/UI-TESTS/ios.runsettings --filter Name=SaveAndExitCCPATest
185-
# :test-rerun ~/work/unity-sdk/unity-sdk/UI-TESTS -s ~/work/unity-sdk/unity-sdk/UI-TESTS/ios.runsettings --filter Name=SaveAndExitUSNATTest
186-
test-rerun ~/work/unity-sdk/unity-sdk/UI-TESTS -s ~/work/unity-sdk/unity-sdk/UI-TESTS/ios.runsettings --filter Name=ClearAllButtonTest
187-
test-rerun ~/work/unity-sdk/unity-sdk/UI-TESTS -s ~/work/unity-sdk/unity-sdk/UI-TESTS/ios.runsettings --filter Name=AuthIdTest
188-
# :test-rerun ~/work/unity-sdk/unity-sdk/UI-TESTS -s ~/work/unity-sdk/unity-sdk/UI-TESTS/ios.runsettings --filter Name=AcceptRejectAllUsnatInPMTest
189-
test-rerun ~/work/unity-sdk/unity-sdk/UI-TESTS -s ~/work/unity-sdk/unity-sdk/UI-TESTS/ios.runsettings --filter Name=ProgramaticRejectAllGDPRTest
190-
test-rerun ~/work/unity-sdk/unity-sdk/UI-TESTS -s ~/work/unity-sdk/unity-sdk/UI-TESTS/ios.runsettings --filter Name=ProgramaticRejectAllCCPATest
191-
test-rerun ~/work/unity-sdk/unity-sdk/UI-TESTS -s ~/work/unity-sdk/unity-sdk/UI-TESTS/ios.runsettings --filter Name=ProgramaticRejectAllUSNATTest
192-
test-rerun ~/work/unity-sdk/unity-sdk/UI-TESTS -s ~/work/unity-sdk/unity-sdk/UI-TESTS/ios.runsettings --filter Name=ProgramaticCustomConsentGDPRTest
193-
test-rerun ~/work/unity-sdk/unity-sdk/UI-TESTS -s ~/work/unity-sdk/unity-sdk/UI-TESTS/ios.runsettings --filter Name=MessageLanguageTest
180+
test-rerun ~/work/unity-sdk/unity-sdk/UI-TESTS -s ~/work/unity-sdk/unity-sdk/UI-TESTS/ios.runsettings --filter Name=ClickAcceptAllButtonTest --rerunMaxAttempts 5
181+
test-rerun ~/work/unity-sdk/unity-sdk/UI-TESTS -s ~/work/unity-sdk/unity-sdk/UI-TESTS/ios.runsettings --filter Name=ClickRejectAllButtonTest --rerunMaxAttempts 5
182+
test-rerun ~/work/unity-sdk/unity-sdk/UI-TESTS -s ~/work/unity-sdk/unity-sdk/UI-TESTS/ios.runsettings --filter Name=OpenPmLayersTest --rerunMaxAttempts 5
183+
test-rerun ~/work/unity-sdk/unity-sdk/UI-TESTS -s ~/work/unity-sdk/unity-sdk/UI-TESTS/ios.runsettings --filter Name=SaveAndExitGDPRTest --rerunMaxAttempts 5
184+
test-rerun ~/work/unity-sdk/unity-sdk/UI-TESTS -s ~/work/unity-sdk/unity-sdk/UI-TESTS/ios.runsettings --filter Name=SaveAndExitCCPATest --rerunMaxAttempts 5
185+
# :test-rerun ~/work/unity-sdk/unity-sdk/UI-TESTS -s ~/work/unity-sdk/unity-sdk/UI-TESTS/ios.runsettings --filter Name=SaveAndExitUSNATTest --rerunMaxAttempts 5
186+
test-rerun ~/work/unity-sdk/unity-sdk/UI-TESTS -s ~/work/unity-sdk/unity-sdk/UI-TESTS/ios.runsettings --filter Name=ClearAllButtonTest --rerunMaxAttempts 5
187+
test-rerun ~/work/unity-sdk/unity-sdk/UI-TESTS -s ~/work/unity-sdk/unity-sdk/UI-TESTS/ios.runsettings --filter Name=AuthIdTest --rerunMaxAttempts 5
188+
# :test-rerun ~/work/unity-sdk/unity-sdk/UI-TESTS -s ~/work/unity-sdk/unity-sdk/UI-TESTS/ios.runsettings --filter Name=AcceptRejectAllUsnatInPMTest --rerunMaxAttempts 5
189+
test-rerun ~/work/unity-sdk/unity-sdk/UI-TESTS -s ~/work/unity-sdk/unity-sdk/UI-TESTS/ios.runsettings --filter Name=ProgramaticRejectAllGDPRTest --rerunMaxAttempts 5
190+
test-rerun ~/work/unity-sdk/unity-sdk/UI-TESTS -s ~/work/unity-sdk/unity-sdk/UI-TESTS/ios.runsettings --filter Name=ProgramaticRejectAllCCPATest --rerunMaxAttempts 5
191+
test-rerun ~/work/unity-sdk/unity-sdk/UI-TESTS -s ~/work/unity-sdk/unity-sdk/UI-TESTS/ios.runsettings --filter Name=ProgramaticRejectAllUSNATTest --rerunMaxAttempts 5
192+
test-rerun ~/work/unity-sdk/unity-sdk/UI-TESTS -s ~/work/unity-sdk/unity-sdk/UI-TESTS/ios.runsettings --filter Name=ProgramaticCustomConsentGDPRTest --rerunMaxAttempts 5
193+
test-rerun ~/work/unity-sdk/unity-sdk/UI-TESTS -s ~/work/unity-sdk/unity-sdk/UI-TESTS/ios.runsettings --filter Name=MessageLanguageTest --rerunMaxAttempts 5
194194
- name: Move dotnet logs
195195
if: always()
196196
run: |

‎Assets/ConsentManagementProvider/Scripts/wrapper/CmpDebugUtil.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ namespace ConsentManagementProvider
44
{
55
public static class CmpDebugUtil
66
{
7-
private static bool enableLogging = true;
8-
private static bool enableDebugging = true;
7+
private static bool enableLogging = false;
8+
private static bool enableDebugging = false;
99
private static bool forceEnableSingleLog;
1010

1111
public static bool IsLogging => enableLogging;

‎UI-TESTS/androidStartup.sh

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
#!/bin/sh
2+
3+
#reruns test up to 4 times if failed
4+
runTest()
5+
{
6+
local i=0
7+
local max=4
8+
while [ $i -lt $max ]
9+
do
10+
if dotnet test -s $1 --filter Name=$2 -l "console;verbosity=detailed"; then
11+
break
12+
else
13+
true $(( i++ ))
14+
fi
15+
done
16+
}
17+
18+
#Make sure adb server working
19+
adb kill-server
20+
adb start-server
21+
sleep 5
22+
23+
#Start Android Emulator
24+
targetWindowName=$(osascript -e 'tell app "Terminal" to do script "~/Library/Android/sdk/emulator/emulator -avd Pixel_XL_API_33"')
25+
androidEmulator_window_id=$(echo ${targetWindowName} | sed 's/.*window id \([0-9]*\).*/\1/')
26+
echo "Android window ${androidEmulator_window_id}"
27+
28+
#Wait for emulators
29+
sleep 60
30+
31+
#Test android
32+
runTest android.runsettings ClickAcceptAllButtonTest
33+
sleep 5
34+
runTest android.runsettings ClickRejectAllButtonTest
35+
sleep 5
36+
runTest android.runsettings OpenPmLayersTest
37+
sleep 5
38+
runTest android.runsettings SaveAndExitGDPRTest
39+
sleep 5
40+
runTest android.runsettings SaveAndExitCCPATest
41+
sleep 5
42+
runTest android.runsettings SaveAndExitUSNATTest
43+
sleep 5
44+
runTest android.runsettings ClearAllButtonTest
45+
sleep 5
46+
runTest android.runsettings AuthIdTest
47+
sleep 5
48+
runTest android.runsettings AcceptRejectAllUsnatInPMTest
49+
sleep 5
50+
runTest android.runsettings ProgramaticRejectAllGDPRTest
51+
sleep 5
52+
runTest android.runsettings ProgramaticRejectAllCCPATest
53+
sleep 5
54+
runTest android.runsettings ProgramaticRejectAllUSNATTest
55+
sleep 5
56+
runTest android.runsettings ProgramaticCustomConsentGDPRTest
57+
sleep 5
58+
runTest android.runsettings MessageLanguageTest
59+
60+
#Kill android emulator
61+
osascript -e 'tell app "Terminal" to close window id '${androidEmulator_window_id}''

‎UI-TESTS/iosStartup.sh

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
#!/bin/sh
2+
3+
#reruns test up to 4 times if failed
4+
runTest()
5+
{
6+
local i=0
7+
local max=4
8+
while [ $i -lt $max ]
9+
do
10+
if dotnet test -s $1 --filter Name=$2 -l "console;verbosity=detailed"; then
11+
break
12+
else
13+
true $(( i++ ))
14+
fi
15+
done
16+
}
17+
18+
#Boot IOS Simulator
19+
targetWindowName=$(osascript -e 'tell app "Terminal" to do script "/Applications/Xcode.app/Contents/Developer/Applications/Simulator.app/Contents/MacOS/Simulator -CurrentDeviceUDID 75EBD8C0-A809-4C7C-B45D-169469835DC4"')
20+
iosEmulator_window_id=$(echo ${targetWindowName} | sed 's/.*window id \([0-9]*\).*/\1/')
21+
echo "IOS window ${iosEmulator_window_id}"
22+
23+
#Wait for emulators
24+
sleep 60
25+
26+
#Test ios
27+
runTest ios.runsettings ClickAcceptAllButtonTest
28+
sleep 5
29+
runTest ios.runsettings ClickRejectAllButtonTest
30+
sleep 5
31+
runTest ios.runsettings OpenPmLayersTest
32+
sleep 5
33+
runTest ios.runsettings SaveAndExitGDPRTest
34+
sleep 5
35+
runTest ios.runsettings SaveAndExitCCPATest
36+
sleep 5
37+
runTest ios.runsettings SaveAndExitUSNATTest
38+
sleep 5
39+
runTest ios.runsettings ClearAllButtonTest
40+
sleep 5
41+
runTest ios.runsettings AuthIdTest
42+
sleep 5
43+
runTest ios.runsettings AcceptRejectAllUsnatInPMTest
44+
sleep 5
45+
runTest ios.runsettings ProgramaticRejectAllGDPRTest
46+
sleep 5
47+
runTest ios.runsettings ProgramaticRejectAllCCPATest
48+
sleep 5
49+
runTest ios.runsettings ProgramaticRejectAllUSNATTest
50+
sleep 5
51+
runTest ios.runsettings ProgramaticCustomConsentGDPRTest
52+
sleep 5
53+
runTest ios.runsettings MessageLanguageTest
54+
55+
#Kill ios emulator
56+
osascript -e 'tell app "Terminal" to close window id '${iosEmulator_window_id}''

‎UI-TESTS/startup.sh

Lines changed: 0 additions & 99 deletions
This file was deleted.

0 commit comments

Comments
 (0)