X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/062d4e06b5003f348e055314fffdef525b5403cb..b4860265ff2c49e81267577112092c9fd66d94ab:/sdk/python/tests/test_vocabulary.py diff --git a/sdk/python/tests/test_vocabulary.py b/sdk/python/tests/test_vocabulary.py index 003bd32092..aa2e739e20 100644 --- a/sdk/python/tests/test_vocabulary.py +++ b/sdk/python/tests/test_vocabulary.py @@ -65,6 +65,7 @@ class VocabularyTest(unittest.TestCase): {'label': 'Comment'}, {'label': 'Notes'}, ], + 'values': None, }, }, } @@ -147,6 +148,20 @@ class VocabularyTest(unittest.TestCase): "failing test case: {}".format(case) ) + def test_convert_to_identifiers_value_lists(self): + cases = [ + {'IDTAGIMPORTANCES': ['IDVALIMPORTANCE1', 'IDVALIMPORTANCE2']}, + {'IDTAGIMPORTANCES': ['High', 'Medium']}, + {'importance': ['IDVALIMPORTANCE1', 'IDVALIMPORTANCE2']}, + {'priority': ['high', 'medium']}, + ] + for case in cases: + self.assertEqual( + self.voc.convert_to_identifiers(case), + {'IDTAGIMPORTANCES': ['IDVALIMPORTANCE1', 'IDVALIMPORTANCE2']}, + "failing test case: {}".format(case) + ) + def test_convert_to_identifiers_unknown_key(self): # Non-strict vocabulary self.assertEqual(self.voc.strict_keys, False) @@ -154,18 +169,52 @@ class VocabularyTest(unittest.TestCase): # Strict vocabulary strict_voc = arvados.vocabulary.Vocabulary(self.EXAMPLE_VOC) strict_voc.strict_keys = True - with self.assertRaises(KeyError): + with self.assertRaises(vocabulary.VocabularyKeyError): strict_voc.convert_to_identifiers({'foo': 'bar'}) + def test_convert_to_identifiers_invalid_key(self): + with self.assertRaises(vocabulary.VocabularyKeyError): + self.voc.convert_to_identifiers({42: 'bar'}) + with self.assertRaises(vocabulary.VocabularyKeyError): + self.voc.convert_to_identifiers({None: 'bar'}) + with self.assertRaises(vocabulary.VocabularyKeyError): + self.voc.convert_to_identifiers({('f', 'o', 'o'): 'bar'}) + def test_convert_to_identifiers_unknown_value(self): # Non-strict key self.assertEqual(self.voc['animal'].strict, False) self.assertEqual(self.voc.convert_to_identifiers({'Animal': 'foo'}), {'IDTAGANIMALS': 'foo'}) # Strict key self.assertEqual(self.voc['priority'].strict, True) - with self.assertRaises(ValueError): + with self.assertRaises(vocabulary.VocabularyValueError): self.voc.convert_to_identifiers({'Priority': 'foo'}) + def test_convert_to_identifiers_invalid_value(self): + with self.assertRaises(vocabulary.VocabularyValueError): + self.voc.convert_to_identifiers({'Animal': 42}) + with self.assertRaises(vocabulary.VocabularyValueError): + self.voc.convert_to_identifiers({'Animal': None}) + with self.assertRaises(vocabulary.VocabularyValueError): + self.voc.convert_to_identifiers({'Animal': {'hello': 'world'}}) + with self.assertRaises(vocabulary.VocabularyValueError): + self.voc.convert_to_identifiers({'Animal': [42]}) + with self.assertRaises(vocabulary.VocabularyValueError): + self.voc.convert_to_identifiers({'Animal': [None]}) + with self.assertRaises(vocabulary.VocabularyValueError): + self.voc.convert_to_identifiers({'Animal': [{'hello': 'world'}]}) + + def test_convert_to_identifiers_unknown_value_list(self): + # Non-strict key + self.assertEqual(self.voc['animal'].strict, False) + self.assertEqual( + self.voc.convert_to_identifiers({'Animal': ['foo', 'loxodonta']}), + {'IDTAGANIMALS': ['foo', 'IDVALANIMAL2']} + ) + # Strict key + self.assertEqual(self.voc['priority'].strict, True) + with self.assertRaises(vocabulary.VocabularyValueError): + self.voc.convert_to_identifiers({'Priority': ['foo', 'bar']}) + def test_convert_to_labels(self): cases = [ {'IDTAGIMPORTANCES': 'IDVALIMPORTANCE1'}, @@ -194,11 +243,19 @@ class VocabularyTest(unittest.TestCase): "failing test case: {}".format(case) ) - def test_convert_roundtrip(self): - initial = {'IDTAGIMPORTANCES': 'IDVALIMPORTANCE1', 'IDTAGANIMALS': 'IDVALANIMAL1', 'IDTAGCOMMENTS': 'Very important person'} - converted = self.voc.convert_to_labels(initial) - self.assertNotEqual(converted, initial) - self.assertEqual(self.voc.convert_to_identifiers(converted), initial) + def test_convert_to_labels_value_lists(self): + cases = [ + {'IDTAGIMPORTANCES': ['IDVALIMPORTANCE1', 'IDVALIMPORTANCE2']}, + {'IDTAGIMPORTANCES': ['High', 'Medium']}, + {'importance': ['IDVALIMPORTANCE1', 'IDVALIMPORTANCE2']}, + {'priority': ['high', 'medium']}, + ] + for case in cases: + self.assertEqual( + self.voc.convert_to_labels(case), + {'Importance': ['High', 'Medium']}, + "failing test case: {}".format(case) + ) def test_convert_to_labels_unknown_key(self): # Non-strict vocabulary @@ -207,14 +264,56 @@ class VocabularyTest(unittest.TestCase): # Strict vocabulary strict_voc = arvados.vocabulary.Vocabulary(self.EXAMPLE_VOC) strict_voc.strict_keys = True - with self.assertRaises(KeyError): + with self.assertRaises(vocabulary.VocabularyKeyError): strict_voc.convert_to_labels({'foo': 'bar'}) + def test_convert_to_labels_invalid_key(self): + with self.assertRaises(vocabulary.VocabularyKeyError): + self.voc.convert_to_labels({42: 'bar'}) + with self.assertRaises(vocabulary.VocabularyKeyError): + self.voc.convert_to_labels({None: 'bar'}) + with self.assertRaises(vocabulary.VocabularyKeyError): + self.voc.convert_to_labels({('f', 'o', 'o'): 'bar'}) + def test_convert_to_labels_unknown_value(self): # Non-strict key self.assertEqual(self.voc['animal'].strict, False) self.assertEqual(self.voc.convert_to_labels({'IDTAGANIMALS': 'foo'}), {'Animal': 'foo'}) # Strict key self.assertEqual(self.voc['priority'].strict, True) - with self.assertRaises(ValueError): - self.voc.convert_to_labels({'IDTAGIMPORTANCES': 'foo'}) \ No newline at end of file + with self.assertRaises(vocabulary.VocabularyValueError): + self.voc.convert_to_labels({'IDTAGIMPORTANCES': 'foo'}) + + def test_convert_to_labels_invalid_value(self): + with self.assertRaises(vocabulary.VocabularyValueError): + self.voc.convert_to_labels({'IDTAGIMPORTANCES': {'high': True}}) + with self.assertRaises(vocabulary.VocabularyValueError): + self.voc.convert_to_labels({'IDTAGIMPORTANCES': None}) + with self.assertRaises(vocabulary.VocabularyValueError): + self.voc.convert_to_labels({'IDTAGIMPORTANCES': 42}) + with self.assertRaises(vocabulary.VocabularyValueError): + self.voc.convert_to_labels({'IDTAGIMPORTANCES': False}) + with self.assertRaises(vocabulary.VocabularyValueError): + self.voc.convert_to_labels({'IDTAGIMPORTANCES': [42]}) + with self.assertRaises(vocabulary.VocabularyValueError): + self.voc.convert_to_labels({'IDTAGIMPORTANCES': [None]}) + with self.assertRaises(vocabulary.VocabularyValueError): + self.voc.convert_to_labels({'IDTAGIMPORTANCES': [{'high': True}]}) + + def test_convert_to_labels_unknown_value_list(self): + # Non-strict key + self.assertEqual(self.voc['animal'].strict, False) + self.assertEqual( + self.voc.convert_to_labels({'IDTAGANIMALS': ['foo', 'IDVALANIMAL1']}), + {'Animal': ['foo', 'Human']} + ) + # Strict key + self.assertEqual(self.voc['priority'].strict, True) + with self.assertRaises(vocabulary.VocabularyValueError): + self.voc.convert_to_labels({'IDTAGIMPORTANCES': ['foo', 'bar']}) + + def test_convert_roundtrip(self): + initial = {'IDTAGIMPORTANCES': 'IDVALIMPORTANCE1', 'IDTAGANIMALS': 'IDVALANIMAL1', 'IDTAGCOMMENTS': 'Very important person'} + converted = self.voc.convert_to_labels(initial) + self.assertNotEqual(converted, initial) + self.assertEqual(self.voc.convert_to_identifiers(converted), initial)