CKM: Get rid of GrabageCollector in initial values test

[Problem] GarbageCollector launched for System user will revoke all "System"
rules.
[Solution] GarbageCollector replaced by Env class for test.

[Verification] Run ckm-tests --group=T60_INITIAL_VALUES. There should be no
smack denials in logs.

Change-Id: Ie2c3090286bfc412201b6b46cf4e7cb1596d1c2b

diff --git a/src/ckm/initial-values.cpp b/src/ckm/initial-values.cpp
index 9d6f179a027f0016b85492d7f6346e0f519d455a..b8c3192cf9c1beaab02e943a058b1a9db29acc7f 100644 (file)
--- a/src/ckm/initial-values.cpp
+++ b/src/ckm/initial-values.cpp
@@ -63,20 +63,6 @@ std::string XML_3_EXPECTED_KEY_2_RSA    = aliasWithLabel(ckmc_owner_id_system, "
 std::string XML_3_EXPECTED_CERT_1       = aliasWithLabel(ckmc_owner_id_system, "test3-cert1");
 std::string XML_3_EXPECTED_DATA_1       = aliasWithLabel(ckmc_owner_id_system, "test3-data1");
 
-void feedGarbageCollector(GarbageCollector & gc)
-{
-    // [prepare]
-    gc.add(XML_1_EXPECTED_KEY_1_RSA.c_str());
-    gc.add(XML_1_EXPECTED_KEY_2_RSA.c_str());
-    //gc.add(XML_1_EXPECTED_KEY_3_AES);
-    gc.add(XML_1_EXPECTED_CERT_1.c_str());
-    gc.add(XML_1_EXPECTED_DATA_1.c_str());
-    gc.add(XML_2_EXPECTED_KEY_1_RSA.c_str());
-    gc.add(XML_2_EXPECTED_KEY_2_RSA.c_str());
-    //gc.add(XML_2_EXPECTED_KEY_3_AES);
-    gc.add(XML_2_EXPECTED_CERT_1.c_str());
-    gc.add(XML_2_EXPECTED_DATA_1.c_str());
-}
 
 std::string format_src_path(const char *file)
 {
@@ -115,7 +101,7 @@ void test_exists(const std::string& name, bool expected) {
 
 RUNNER_TEST_GROUP_INIT(T60_INITIAL_VALUES);
 
-RUNNER_TEST(T6010_PARSE_XML_FILE_AT_STARTUP)
+RUNNER_TEST(T6010_PARSE_XML_FILE_AT_STARTUP, RemoveDataEnv<0>)
 {
     // [prepare]
     // remove database 0
@@ -133,10 +119,6 @@ RUNNER_TEST(T6010_PARSE_XML_FILE_AT_STARTUP)
 
 
     // [prepare]
-    GarbageCollector gc;
-    feedGarbageCollector(gc);
-
-    remove_user_data(0);
     copy_file(format_src_path(XML_1_okay), format_dest_path(XML_1_okay));
 
     // [test0]
@@ -180,7 +162,7 @@ RUNNER_TEST(T6010_PARSE_XML_FILE_AT_STARTUP)
     }
 }
 
-RUNNER_TEST(T6020_PARSE_TWO_XML_FILES_AT_STARTUP)
+RUNNER_TEST(T6020_PARSE_TWO_XML_FILES_AT_STARTUP, RemoveDataEnv<0>)
 {
     // [prepare]
     // remove database 0
@@ -193,10 +175,6 @@ RUNNER_TEST(T6020_PARSE_TWO_XML_FILES_AT_STARTUP)
     // check items existence as system service
 
     // [prepare]
-    GarbageCollector gc;
-    feedGarbageCollector(gc);
-
-    remove_user_data(0);
     copy_file(format_src_path(XML_1_okay), format_dest_path(XML_1_okay));
     copy_file(format_src_path(XML_2_okay), format_dest_path(XML_2_okay));
 
@@ -220,7 +198,7 @@ RUNNER_TEST(T6020_PARSE_TWO_XML_FILES_AT_STARTUP)
     check_read_allowed(XML_2_EXPECTED_DATA_1.c_str(), XML_2_EXPECTED_DATA_1_DATA);
 }
 
-RUNNER_TEST(T6030_PARSE_FAIL_XML_AT_STARTUP)
+RUNNER_TEST(T6030_PARSE_FAIL_XML_AT_STARTUP, RemoveDataEnv<0>)
 {
     // [prepare]
     // remove database 0
@@ -233,7 +211,6 @@ RUNNER_TEST(T6030_PARSE_FAIL_XML_AT_STARTUP)
     // check items existence as system service - nothing should be available
 
     // [prepare]
-    remove_user_data(0);
     copy_file(format_src_path(XML_3_wrong), format_dest_path(XML_3_wrong));
 
     // [test0]
@@ -249,7 +226,7 @@ RUNNER_TEST(T6030_PARSE_FAIL_XML_AT_STARTUP)
     check_read_not_visible(XML_3_EXPECTED_DATA_1.c_str());
 }
 
-RUNNER_TEST(T6040_CHECK_KEYS_VALID)
+RUNNER_TEST(T6040_CHECK_KEYS_VALID, RemoveDataEnv<0>)
 {
     // [prepare]
     // remove database 0
@@ -259,9 +236,6 @@ RUNNER_TEST(T6040_CHECK_KEYS_VALID)
     // check if key can create & verify signature
 
     // [prepare]
-    GarbageCollector gc;
-    feedGarbageCollector(gc);
-    remove_user_data(0);
     copy_file(format_src_path(XML_1_okay), format_dest_path(XML_1_okay));
     restart_key_manager();