diff options
author | Greg Hackmann <ghackmann@google.com> | 2013-06-24 18:05:18 -0700 |
---|---|---|
committer | Greg Hackmann <ghackmann@google.com> | 2013-06-24 18:05:18 -0700 |
commit | 890aa0d937ae72473c84cc773e77d45e9288b0bc (patch) | |
tree | 774b64dd8a3c9a9c9390eefd073d1c993269ef69 /tests/system_properties_test.cpp | |
parent | fa8cc0629f6227b507434245d237d44d7e119b16 (diff) | |
download | android_bionic-890aa0d937ae72473c84cc773e77d45e9288b0bc.tar.gz android_bionic-890aa0d937ae72473c84cc773e77d45e9288b0bc.tar.bz2 android_bionic-890aa0d937ae72473c84cc773e77d45e9288b0bc.zip |
Revert "bionic: add hierarchical properties test"
This reverts commit 0f76e2340ca53ce458a01f91627651dfe0112969.
Diffstat (limited to 'tests/system_properties_test.cpp')
-rw-r--r-- | tests/system_properties_test.cpp | 78 |
1 files changed, 0 insertions, 78 deletions
diff --git a/tests/system_properties_test.cpp b/tests/system_properties_test.cpp index bafd2c3e1..50bdfdfe4 100644 --- a/tests/system_properties_test.cpp +++ b/tests/system_properties_test.cpp @@ -202,84 +202,6 @@ TEST(properties, find_nth) { ASSERT_EQ((const prop_info *)NULL, __system_property_find_nth(247)); } -static void hierarchical_test_callback(const prop_info *pi, void *cookie) { - bool (*ok)[8][8] = static_cast<bool (*)[8][8]>(cookie); - - char name[PROP_NAME_MAX]; - char value[PROP_VALUE_MAX]; - - __system_property_read(pi, name, value); - - int name_i, name_j, name_k; - int value_i, value_j, value_k; - ASSERT_EQ(3, sscanf(name, "property_%d.%d.%d", &name_i, &name_j, &name_k)); - ASSERT_EQ(3, sscanf(value, "value_%d.%d.%d", &value_i, &value_j, &value_k)); - ASSERT_EQ(name_i, value_i); - ASSERT_GE(name_i, 0); - ASSERT_LT(name_i, 8); - ASSERT_EQ(name_j, value_j); - ASSERT_GE(name_j, 0); - ASSERT_LT(name_j, 8); - ASSERT_EQ(name_k, value_k); - ASSERT_GE(name_k, 0); - ASSERT_LT(name_k, 8); - - ok[name_i][name_j][name_k] = true; -} - -TEST(properties, fill_hierarchical) { - LocalPropertyTestState pa; - ASSERT_TRUE(pa.valid); - char prop_name[PROP_NAME_MAX]; - char prop_value[PROP_VALUE_MAX]; - char prop_value_ret[PROP_VALUE_MAX]; - int ret; - - for (int i = 0; i < 8; i++) { - for (int j = 0; j < 8; j++) { - for (int k = 0; k < 8; k++) { - ret = snprintf(prop_name, PROP_NAME_MAX - 1, "property_%d.%d.%d", i, j, k); - memset(prop_name + ret, 'a', PROP_NAME_MAX - 1 - ret); - ret = snprintf(prop_value, PROP_VALUE_MAX - 1, "value_%d.%d.%d", i, j, k); - memset(prop_value + ret, 'b', PROP_VALUE_MAX - 1 - ret); - prop_name[PROP_NAME_MAX - 1] = 0; - prop_value[PROP_VALUE_MAX - 1] = 0; - - ASSERT_EQ(0, __system_property_add(prop_name, PROP_NAME_MAX - 1, prop_value, PROP_VALUE_MAX - 1)); - } - } - } - - for (int i = 0; i < 8; i++) { - for (int j = 0; j < 8; j++) { - for (int k = 0; k < 8; k++) { - ret = snprintf(prop_name, PROP_NAME_MAX - 1, "property_%d.%d.%d", i, j, k); - memset(prop_name + ret, 'a', PROP_NAME_MAX - 1 - ret); - ret = snprintf(prop_value, PROP_VALUE_MAX - 1, "value_%d.%d.%d", i, j, k); - memset(prop_value + ret, 'b', PROP_VALUE_MAX - 1 - ret); - prop_name[PROP_NAME_MAX - 1] = 0; - prop_value[PROP_VALUE_MAX - 1] = 0; - memset(prop_value_ret, '\0', PROP_VALUE_MAX); - - ASSERT_EQ(PROP_VALUE_MAX - 1, __system_property_get(prop_name, prop_value_ret)); - ASSERT_EQ(0, memcmp(prop_value, prop_value_ret, PROP_VALUE_MAX)); - } - } - } - - bool ok[8][8][8]; - memset(ok, 0, sizeof(ok)); - __system_property_foreach(hierarchical_test_callback, ok); - - for (int i = 0; i < 8; i++) { - for (int j = 0; j < 8; j++) { - for (int k = 0; k < 8; k++) { - ASSERT_TRUE(ok[i][j][k]); - } - } - } -} - TEST(properties, errors) { LocalPropertyTestState pa; ASSERT_TRUE(pa.valid); |