From 5f6eec9e0559d28f59ce0c15aac9006b149206ef Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EC=B5=9C=EC=A2=85=ED=97=8C/Common=20Platform=20Lab=28SR=29?= =?utf8?q?/=EC=82=BC=EC=84=B1=EC=A0=84=EC=9E=90?= Date: Wed, 20 Jul 2022 08:53:03 +0900 Subject: [PATCH] Upgrade the nuget(Newtonsoft.Json) version of TC (#422) Change-Id: I9234a89f05489a771f3ea50242d750e71d652951 --- .../Launcher_TC_TAC_02/Launcher_TC_TAC_02.csproj | 24 +++++++++++----------- tests/Apps/README.md | 2 +- tests/TCs/4_TAC/TAC.py | 15 +++++++------- 3 files changed, 20 insertions(+), 21 deletions(-) diff --git a/tests/Apps/Launcher_TC_TAC_02/Launcher_TC_TAC_02/Launcher_TC_TAC_02/Launcher_TC_TAC_02.csproj b/tests/Apps/Launcher_TC_TAC_02/Launcher_TC_TAC_02/Launcher_TC_TAC_02/Launcher_TC_TAC_02.csproj index 2304d7d..d105433 100644 --- a/tests/Apps/Launcher_TC_TAC_02/Launcher_TC_TAC_02/Launcher_TC_TAC_02/Launcher_TC_TAC_02.csproj +++ b/tests/Apps/Launcher_TC_TAC_02/Launcher_TC_TAC_02/Launcher_TC_TAC_02/Launcher_TC_TAC_02.csproj @@ -1,12 +1,12 @@ - - - - netstandard2.0 - - - - - - - - + + + + netstandard2.0 + + + + + + + + diff --git a/tests/Apps/README.md b/tests/Apps/README.md index cea7e95..68447ef 100644 --- a/tests/Apps/README.md +++ b/tests/Apps/README.md @@ -79,7 +79,7 @@ Build complete : org.tizen.example.Launcher_TC_TAC_01.Tizen-1.0.0.tpk Apps(.sln) | PackageID | prefer_dotnet_aot | prefer_nuget_cache | Nuget --------------------|--------------------------------------------|-------------------|--------------------|-----------------------------------------------------| Launcher_TC_TAC_01 | org.tizen.example.Launcher_TC_TAC_01.Tizen | X | True | Xamarin.Forms(4.6.0.967) - Launcher_TC_TAC_02 | org.tizen.example.Launcher_TC_TAC_00.Tizen | X | True | Xamarin.Forms(4.8.0.1364), Newtonsoft.Json(12.0.3) + Launcher_TC_TAC_02 | org.tizen.example.Launcher_TC_TAC_00.Tizen | X | True | Xamarin.Forms(4.8.0.1364), Newtonsoft.Json(13.0.1) Launcher_TC_TAC_03 | org.tizen.example.Launcher_TC_TAC_00.Tizen | X | True | Xamarin.Forms(4.8.0.1687), sqlite-net-base(1.7.335) Launcher_TC_TAC_04 | org.tizen.example.Launcher_TC_TAC_00.Tizen | X | X | Xamarin.Forms(4.8.0.1364) Launcher_TC_TAC_05 | org.tizen.example.Launcher_TC_TAC_05.Tizen | X | True | Xamarin.Forms(5.0.0.1558-pre3) diff --git a/tests/TCs/4_TAC/TAC.py b/tests/TCs/4_TAC/TAC.py index 94fae23..0d8d248 100755 --- a/tests/TCs/4_TAC/TAC.py +++ b/tests/TCs/4_TAC/TAC.py @@ -80,7 +80,7 @@ def TC_02(): lines1 = [l for l in raw.splitlines()] raw = cmd(f"shell find {DOTNET_DIR}Xamarin.Forms/4.8.0.1364/ -name *.dll -not -name *.ni.dll") lines2 = [l for l in raw.splitlines()] - raw = cmd(f"shell find {DOTNET_DIR}Newtonsoft.Json/12.0.1/ -name *.dll -not -name *.ni.dll") + raw = cmd(f"shell find {DOTNET_DIR}Newtonsoft.Json/13.0.1/ -name *.dll -not -name *.ni.dll") lines3 = [l for l in raw.splitlines()] if len(lines1) != len(lines2)+len(lines3): return "FAIL : The number of .dll in the .tac_symlink and .dll in the TAC must match" @@ -103,7 +103,7 @@ def TC_02(): return "FAIL : The Xamarin.Forms in the TAC should be loaded when running the application" raw = cmd(f"shell cat /proc/{pid}/smaps | grep Newtonsoft.Json.dll") - if f"{DOTNET_DIR}Newtonsoft.Json/12.0.1/Newtonsoft.Json.dll" not in raw: + if f"{DOTNET_DIR}Newtonsoft.Json/13.0.1/Newtonsoft.Json.dll" not in raw: return "FAIL : The Newtonsoft.Json in the TAC should be loaded when running the application" cmd(f"shell app_launcher -t {pkg_id}") @@ -151,8 +151,8 @@ def TC_03(): if exist(f"{DOTNET_DIR}Xamarin.Forms/4.8.0.1364/ -name *.dll"): return f"FAIL : The Xamarin.Forms/4.8.0.1364 nuget should not exist in {DOTNET_DIR}" - if exist(f"{DOTNET_DIR}Newtonsoft.Json/12.0.1/ -name *.dll"): - return f"FAIL : The Newtonsoft.Json/12.0.1 nuget should not exist in {DOTNET_DIR}" + if exist(f"{DOTNET_DIR}Newtonsoft.Json/13.0.1/ -name *.dll"): + return f"FAIL : The Newtonsoft.Json/13.0.1 nuget should not exist in {DOTNET_DIR}" pid = launch_and_get_pid(f"-e", f"{pkg_id}") if 0 == pid: @@ -199,8 +199,8 @@ def TC_04(): if exist(f"{DOTNET_DIR}Xamarin.Forms/4.8.0.1364/ -name *.dll"): return f"FAIL : The Xamarin.Forms/4.8.0.1364 nuget should not exist in {DOTNET_DIR}" - if exist(f"{DOTNET_DIR}Newtonsoft.Json/12.0.1/ -name *.dll"): - return f"FAIL : The Newtonsoft.Json/12.0.1 nuget should not exist in {DOTNET_DIR}" + if exist(f"{DOTNET_DIR}Newtonsoft.Json/13.0.1/ -name *.dll"): + return f"FAIL : The Newtonsoft.Json/13.0.1 nuget should not exist in {DOTNET_DIR}" if exist(f"{DOTNET_DIR}sqlite-net-base/1.7.335/ -name *.dll"): return f"FAIL : The sqlite-net-base/1.7.335 nuget should not exist in {DOTNET_DIR}" @@ -461,8 +461,7 @@ def TC_08(): is_exist = False if ("Xamarin.Forms/4.8.0.1560" in rcd) or \ ("Google.Apis.Core/1.49.0" in rcd) or \ - ("Google.Apis/1.49.0" in rcd) or \ - ("Newtonsoft.Json/12.0.3" in rcd): + ("Google.Apis/1.49.0" in rcd): is_exist = True continue if not is_exist: -- 2.7.4