From 1a4b37d333d312a97c7979b1203c6246a28e601b Mon Sep 17 00:00:00 2001 From: Colin Nolan Date: Fri, 18 Sep 2015 12:04:58 +0100 Subject: [PATCH] 7204: Minor refactoring of methods supporting `arv get` test cases. --- sdk/cli/test/test_arv-get.rb | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/sdk/cli/test/test_arv-get.rb b/sdk/cli/test/test_arv-get.rb index a1d49a66ad..ccc1e1666e 100644 --- a/sdk/cli/test/test_arv-get.rb +++ b/sdk/cli/test/test_arv-get.rb @@ -116,19 +116,24 @@ class TestArvGet < Minitest::Test return out end - # Checks whether the Arvados object, represented in JSON format, with the - # given uuid, uses the given value. + # Checks whether the Arvados object, represented in JSON format, uses the + # given value. def does_arv_object_as_json_use_value(obj, value) parsed = JSON.parse(obj) - stored_value = parsed["name"] - return (value == stored_value) + return does_arv_object_as_object_use_value(parsed, value) end - # Checks whether the Arvados object, represented in YAML format, with the - # given uuid, uses the given value. + # Checks whether the Arvados object, represented in YAML format, uses the + # given value. def does_arv_object_as_yaml_use_value(obj, value) parsed = YAML.load(obj) - stored_value = parsed["name"] + return does_arv_object_as_object_use_value(parsed, value) + end + + # Checks whether the Arvados object, represented as a Ruby object, uses the + # given value. + def does_arv_object_as_object_use_value(obj, value) + stored_value = obj["name"] return (value == stored_value) end end -- 2.30.2