summaryrefslogtreecommitdiff
path: root/tools/test_post_process_props.py
diff options
context:
space:
mode:
Diffstat (limited to 'tools/test_post_process_props.py')
-rw-r--r--tools/test_post_process_props.py22
1 files changed, 6 insertions, 16 deletions
diff --git a/tools/test_post_process_props.py b/tools/test_post_process_props.py
index dd5f8ec971..236f9edfdf 100644
--- a/tools/test_post_process_props.py
+++ b/tools/test_post_process_props.py
@@ -258,30 +258,20 @@ class PropListTestcase(unittest.TestCase):
props.put("ro.board.first_api_level","25")
# ro.board.first_api_level must be less than or equal to the sdk version
- self.assertFalse(validate_and_add_grf_props(props, 20))
- self.assertTrue(validate_and_add_grf_props(props, 26))
- # ro.board.api_level is automatically set
- self.assertEqual(props.get_value("ro.board.api_level"), "25")
+ self.assertFalse(validate_grf_props(props, 20))
+ self.assertTrue(validate_grf_props(props, 26))
+ self.assertTrue(validate_grf_props(props, 35))
- props.get_all_props()[-1].make_as_comment()
- self.assertTrue(validate_and_add_grf_props(props, 35))
- # ro.board.api_level is automatically set to the required GRF version
- self.assertEqual(props.get_value("ro.board.api_level"), "33")
-
- props.get_all_props()[-1].make_as_comment()
# manually set ro.board.api_level to an invalid value
props.put("ro.board.api_level","20")
- self.assertFalse(validate_and_add_grf_props(props, 26))
+ self.assertFalse(validate_grf_props(props, 26))
props.get_all_props()[-1].make_as_comment()
# manually set ro.board.api_level to a valid value
props.put("ro.board.api_level","26")
- self.assertTrue(validate_and_add_grf_props(props, 26))
+ self.assertTrue(validate_grf_props(props, 26))
# ro.board.api_level must be less than or equal to the sdk version
- self.assertFalse(validate_and_add_grf_props(props, 25))
- # ro.board.api_level must be greater than or equal to the required GRF
- # version
- self.assertFalse(validate_and_add_grf_props(props, 30))
+ self.assertFalse(validate_grf_props(props, 25))
if __name__ == '__main__':
unittest.main(verbosity=2)