Fix for wgt smoke tests

There is a one conflict in pkgid and one pkgid which
is not compatible with pkgid name convention

Change-Id: I0b1b1ac66ec1bee0ab0bc888d55329d1bd096390

diff --git a/src/unit_tests/smoke_test.cc b/src/unit_tests/smoke_test.cc
index 2555a80..3f18a52 100644 (file)
--- a/src/unit_tests/smoke_test.cc
+++ b/src/unit_tests/smoke_test.cc
@@ -976,8 +976,8 @@ TEST_F(SmokeTest, UpdateMode_Rollback) {
 TEST_F(SmokeTest, DeltaMode_Rollback) {
   bf::path path = kSmokePackagesDirectory / "DeltaMode_Rollback.wgt";
   bf::path delta_package = kSmokePackagesDirectory / "DeltaMode_Rollback.delta";
-  std::string pkgid = "smokeapp37";
-  std::string appid = "smokeapp37.DeltaMode";
+  std::string pkgid = "smokewgt01";
+  std::string appid = "smokewgt01.DeltaMode";
   ASSERT_EQ(Install(path, PackageType::WGT), ci::AppInstaller::Result::OK);
   AddDataFiles(pkgid, kTestUserId);
   ASSERT_EQ(Install(delta_package, PackageType::WGT, RequestResult::FAIL),
@@ -1221,12 +1221,10 @@ TEST_F(SmokeTest, MountUpdateMode_Rollback) {
   ValidateDataFiles(pkgid, kTestUserId);
 }
 
-// TODO(b.kunikowski): Change pkgid to "smokewgt##" like others pkgids, because
-//                     it is needed for properly test environment tear-down
 TEST_F(SmokeTest, UserDefinedPlugins) {
   bf::path path = kSmokePackagesDirectory / "SimpleEchoPrivilege.wgt";
-  std::string pkgid = "0CSPVhKmRk";
-  std::string appid = "0CSPVhKmRk.SimpleEcho";
+  std::string pkgid = "smokewgt02";
+  std::string appid = "smokewgt02.SimpleEcho";
   std::string call_privilege = "http://tizen.org/privilege/call";
   std::string location_privilege = "http://tizen.org/privilege/location";
   std::string power_privilege = "http://tizen.org/privilege/power";

diff --git a/src/unit_tests/test_samples/smoke/DeltaMode_Rollback.delta b/src/unit_tests/test_samples/smoke/DeltaMode_Rollback.delta
index b4a756b..1a82c80 100644 (file)
Binary files a/src/unit_tests/test_samples/smoke/DeltaMode_Rollback.delta and b/src/unit_tests/test_samples/smoke/DeltaMode_Rollback.delta differ

diff --git a/src/unit_tests/test_samples/smoke/DeltaMode_Rollback.wgt b/src/unit_tests/test_samples/smoke/DeltaMode_Rollback.wgt
index 8a787f8..6372e27 100644 (file)
Binary files a/src/unit_tests/test_samples/smoke/DeltaMode_Rollback.wgt and b/src/unit_tests/test_samples/smoke/DeltaMode_Rollback.wgt differ

diff --git a/src/unit_tests/test_samples/smoke/DeltaMode_Rollback_2.wgt b/src/unit_tests/test_samples/smoke/DeltaMode_Rollback_2.wgt
index c26c9c8..88a57ae 100644 (file)
Binary files a/src/unit_tests/test_samples/smoke/DeltaMode_Rollback_2.wgt and b/src/unit_tests/test_samples/smoke/DeltaMode_Rollback_2.wgt differ

diff --git a/src/unit_tests/test_samples/smoke/SimpleEchoPrivilege.wgt b/src/unit_tests/test_samples/smoke/SimpleEchoPrivilege.wgt
index e48d684..824502e 100644 (file)
Binary files a/src/unit_tests/test_samples/smoke/SimpleEchoPrivilege.wgt and b/src/unit_tests/test_samples/smoke/SimpleEchoPrivilege.wgt differ