From 1e3a579bb9adc83b1c77163e0a6a48f44665cfb3 Mon Sep 17 00:00:00 2001 From: Mark Beierl Date: Thu, 14 Jul 2016 00:11:23 -0400 Subject: Fix missing test All test files must end in _test.py or they don't get executed Change-Id: If3a46a66570f7d07d0e93de72438a8a46b3e0a22 Signed-off-by: Mark Beierl --- storperf/tests/utilities/dictionary.py | 42 ----------------------------- storperf/tests/utilities/dictionary_test.py | 42 +++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 42 deletions(-) delete mode 100644 storperf/tests/utilities/dictionary.py create mode 100644 storperf/tests/utilities/dictionary_test.py diff --git a/storperf/tests/utilities/dictionary.py b/storperf/tests/utilities/dictionary.py deleted file mode 100644 index 0819cef..0000000 --- a/storperf/tests/utilities/dictionary.py +++ /dev/null @@ -1,42 +0,0 @@ -############################################################################## -# Copyright (c) 2016 EMC and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - -import unittest -from storperf.utilities import dictionary - - -class DictionaryTest(unittest.TestCase): - - def setUp(self): - self.dictionary = {} - self.dictionary['key'] = 'value' - pass - - def test_get_no_default(self): - expected = None - actual = dictionary.get_key_from_dict(self.dictionary, 'no-key') - self.assertEqual(expected, actual) - - def test_get_with_default(self): - expected = 'value 2' - actual = dictionary.get_key_from_dict( - self.dictionary, 'no-key', expected) - self.assertEqual(expected, actual) - - def test_get_with_value(self): - expected = 'value' - actual = dictionary.get_key_from_dict( - self.dictionary, 'key') - self.assertEqual(expected, actual) - - def test_get_with_value_and_default(self): - expected = 'value' - actual = dictionary.get_key_from_dict( - self.dictionary, 'key', 'value 2') - self.assertEqual(expected, actual) diff --git a/storperf/tests/utilities/dictionary_test.py b/storperf/tests/utilities/dictionary_test.py new file mode 100644 index 0000000..0819cef --- /dev/null +++ b/storperf/tests/utilities/dictionary_test.py @@ -0,0 +1,42 @@ +############################################################################## +# Copyright (c) 2016 EMC and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +import unittest +from storperf.utilities import dictionary + + +class DictionaryTest(unittest.TestCase): + + def setUp(self): + self.dictionary = {} + self.dictionary['key'] = 'value' + pass + + def test_get_no_default(self): + expected = None + actual = dictionary.get_key_from_dict(self.dictionary, 'no-key') + self.assertEqual(expected, actual) + + def test_get_with_default(self): + expected = 'value 2' + actual = dictionary.get_key_from_dict( + self.dictionary, 'no-key', expected) + self.assertEqual(expected, actual) + + def test_get_with_value(self): + expected = 'value' + actual = dictionary.get_key_from_dict( + self.dictionary, 'key') + self.assertEqual(expected, actual) + + def test_get_with_value_and_default(self): + expected = 'value' + actual = dictionary.get_key_from_dict( + self.dictionary, 'key', 'value 2') + self.assertEqual(expected, actual) -- cgit 1.2.3-korg