From 76f425b1e76debe90f723c99594236853b05b979 Mon Sep 17 00:00:00 2001 From: Alexanderlacuna Date: Mon, 26 Oct 2020 21:50:56 +0300 Subject: modified test file --- wqflask/tests/wqflask/show_trait/__init__.py | 0 .../wqflask/show_trait/test_export_trait_data.py | 103 +++++++++++++++++++++ 2 files changed, 103 insertions(+) create mode 100644 wqflask/tests/wqflask/show_trait/__init__.py create mode 100644 wqflask/tests/wqflask/show_trait/test_export_trait_data.py (limited to 'wqflask') diff --git a/wqflask/tests/wqflask/show_trait/__init__.py b/wqflask/tests/wqflask/show_trait/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/wqflask/tests/wqflask/show_trait/test_export_trait_data.py b/wqflask/tests/wqflask/show_trait/test_export_trait_data.py new file mode 100644 index 00000000..f77f11c9 --- /dev/null +++ b/wqflask/tests/wqflask/show_trait/test_export_trait_data.py @@ -0,0 +1,103 @@ +import unittest +from wqflask.show_trait.export_trait_data import dict_to_sorted_list,cmp_samples +class TestDictionaryList(unittest.TestCase): + def setUp(self): + self.sample1={ + "other":"exp1", + "name":"exp2" + } + self.sample2={ + 'se':1, + 'num_cases':4, + 'value':6, + "name":3 + + } + self.reversed={ + "name":3, + 'value':6, + 'num_cases':4, + 'se':1 + } + self.oneItem={ + 'item1':"one" + } + def test_dict_to_sortedlist(self): + '''Test for converting dict to sorted list''' + + self.assertEqual(['exp2','exp1'],dict_to_sorted_list(self.sample1)) + self.assertEqual([3, 6, 1, 4],dict_to_sorted_list(self.sample2)) + self.assertEqual([3, 6, 1, 4],dict_to_sorted_list(self.reversed)) + self.assertEqual(["one"],dict_to_sorted_list(self.oneItem)) + '''test that the func returns the values not the keys''' + self.assertFalse(['other','name']==['exp2','exp1']) + + + +class TestComparison(unittest.TestCase): + def setUp(self): + self.sampleA=[ + [ + ('value','other'), + ('name','test_name') + ] + ] + self.sampleB=[ + [ + ('value','other'), + ('unknown','test_name') + ] + ] + self.sampleC=[ + [('other',"value"), + ('name','value') + ], + [ + ('name',"value"), + ('value',"name") + ], + [ + ('other',"value"), + ('name','value' + )], + [ + ('name',"name1"), + ('se',"valuex") + ], + [( + 'value',"name1"), + ('se',"valuex") + ], + [( + 'other',"name1"), + ('se',"valuex" + ) + ], + [( + 'name',"name_val"), + ('num_cases',"num_val") + ], + [( + "other_a","val_a"), + ('other_b',"val" + ) + ]] + + + + + + def test_cmp_samples(self): + '''Test for func that does sample comparisons''' + + results=[cmp_samples(val[0],val[1]) for val in self.sampleA] + resultB=[cmp_samples(val[0],val[1]) for val in self.sampleB] + resultC=[cmp_samples(val[0],val[1]) for val in self.sampleC] + self.assertEqual(1,*results) + self.assertEqual(-1,*resultB) + self.assertEqual([1, -1, 1, -1, -1, 1, -1, -1],resultC) + + + + + -- cgit v1.2.3 From 09bae9afdde636b84c8e42140f21ba3f60903d9b Mon Sep 17 00:00:00 2001 From: Alexanderlacuna Date: Tue, 27 Oct 2020 12:37:02 +0300 Subject: modified to use pep8 standards --- .../wqflask/show_trait/test_export_trait_data.py | 59 +++++++++++----------- 1 file changed, 30 insertions(+), 29 deletions(-) (limited to 'wqflask') diff --git a/wqflask/tests/wqflask/show_trait/test_export_trait_data.py b/wqflask/tests/wqflask/show_trait/test_export_trait_data.py index f77f11c9..c64196ff 100644 --- a/wqflask/tests/wqflask/show_trait/test_export_trait_data.py +++ b/wqflask/tests/wqflask/show_trait/test_export_trait_data.py @@ -1,54 +1,56 @@ import unittest -from wqflask.show_trait.export_trait_data import dict_to_sorted_list,cmp_samples -class TestDictionaryList(unittest.TestCase): - def setUp(self): - self.sample1={ +from wqflask.show_trait.export_trait_data import dict_to_sorted_list +from wqflask.show_trait.export_trait_data import cmp_samples + +class TestExportTraits(unittest.TestCase): + def test_dict_to_sortedlist(self): + '''Test for conversion of dict to sorted list''' + sample1={ "other":"exp1", "name":"exp2" } - self.sample2={ + sample2={ 'se':1, 'num_cases':4, 'value':6, "name":3 } - self.reversed={ + rever={ "name":3, 'value':6, 'num_cases':4, 'se':1 } - self.oneItem={ + oneItem={ 'item1':"one" } - def test_dict_to_sortedlist(self): - '''Test for converting dict to sorted list''' - - self.assertEqual(['exp2','exp1'],dict_to_sorted_list(self.sample1)) - self.assertEqual([3, 6, 1, 4],dict_to_sorted_list(self.sample2)) - self.assertEqual([3, 6, 1, 4],dict_to_sorted_list(self.reversed)) - self.assertEqual(["one"],dict_to_sorted_list(self.oneItem)) + + + self.assertEqual(['exp2','exp1'],dict_to_sorted_list(sample1)) + self.assertEqual([3, 6, 1, 4],dict_to_sorted_list(sample2)) + self.assertEqual([3, 6, 1, 4],dict_to_sorted_list(rever)) + self.assertEqual(["one"],dict_to_sorted_list(oneItem)) '''test that the func returns the values not the keys''' - self.assertFalse(['other','name']==['exp2','exp1']) + self.assertFalse(['other','name']==dict_to_sorted_list(sample1)) + def test_cmp_samples(self): + '''test for function that does comparisons of samples''' -class TestComparison(unittest.TestCase): - def setUp(self): - self.sampleA=[ + sampleA=[ [ ('value','other'), ('name','test_name') ] ] - self.sampleB=[ + sampleB=[ [ ('value','other'), ('unknown','test_name') ] ] - self.sampleC=[ + sampleC=[ [('other',"value"), ('name','value') ], @@ -82,20 +84,19 @@ class TestComparison(unittest.TestCase): ('other_b',"val" ) ]] + results=[cmp_samples(val[0],val[1]) for val in sampleA] + resultB=[cmp_samples(val[0],val[1]) for val in sampleB] + resultC=[cmp_samples(val[0],val[1]) for val in sampleC] + self.assertEqual(1,*results) + self.assertEqual(-1,*resultB) + self.assertEqual([1, -1, 1, -1, -1, 1, -1, -1],resultC) + + - def test_cmp_samples(self): - '''Test for func that does sample comparisons''' - - results=[cmp_samples(val[0],val[1]) for val in self.sampleA] - resultB=[cmp_samples(val[0],val[1]) for val in self.sampleB] - resultC=[cmp_samples(val[0],val[1]) for val in self.sampleC] - self.assertEqual(1,*results) - self.assertEqual(-1,*resultB) - self.assertEqual([1, -1, 1, -1, -1, 1, -1, -1],resultC) -- cgit v1.2.3 From cf4a7154bd7243aa1cf25e04d03d89cb8b43c7c5 Mon Sep 17 00:00:00 2001 From: Alexanderlacuna Date: Tue, 27 Oct 2020 13:19:27 +0300 Subject: added changes to file --- .../wqflask/show_trait/test_export_trait_data.py | 186 ++++++++++----------- 1 file changed, 87 insertions(+), 99 deletions(-) (limited to 'wqflask') diff --git a/wqflask/tests/wqflask/show_trait/test_export_trait_data.py b/wqflask/tests/wqflask/show_trait/test_export_trait_data.py index c64196ff..2f95d219 100644 --- a/wqflask/tests/wqflask/show_trait/test_export_trait_data.py +++ b/wqflask/tests/wqflask/show_trait/test_export_trait_data.py @@ -2,103 +2,91 @@ import unittest from wqflask.show_trait.export_trait_data import dict_to_sorted_list from wqflask.show_trait.export_trait_data import cmp_samples -class TestExportTraits(unittest.TestCase): - def test_dict_to_sortedlist(self): - '''Test for conversion of dict to sorted list''' - sample1={ - "other":"exp1", - "name":"exp2" - } - sample2={ - 'se':1, - 'num_cases':4, - 'value':6, - "name":3 - - } - rever={ - "name":3, - 'value':6, - 'num_cases':4, - 'se':1 - } - oneItem={ - 'item1':"one" - } - - - self.assertEqual(['exp2','exp1'],dict_to_sorted_list(sample1)) - self.assertEqual([3, 6, 1, 4],dict_to_sorted_list(sample2)) - self.assertEqual([3, 6, 1, 4],dict_to_sorted_list(rever)) - self.assertEqual(["one"],dict_to_sorted_list(oneItem)) - '''test that the func returns the values not the keys''' - self.assertFalse(['other','name']==dict_to_sorted_list(sample1)) - - def test_cmp_samples(self): - '''test for function that does comparisons of samples''' - - - sampleA=[ - [ - ('value','other'), - ('name','test_name') - ] - ] - sampleB=[ - [ - ('value','other'), - ('unknown','test_name') - ] - ] - sampleC=[ - [('other',"value"), - ('name','value') - ], - [ - ('name',"value"), - ('value',"name") - ], - [ - ('other',"value"), - ('name','value' - )], - [ - ('name',"name1"), - ('se',"valuex") - ], - [( - 'value',"name1"), - ('se',"valuex") - ], - [( - 'other',"name1"), - ('se',"valuex" - ) - ], - [( - 'name',"name_val"), - ('num_cases',"num_val") - ], - [( - "other_a","val_a"), - ('other_b',"val" - ) - ]] - results=[cmp_samples(val[0],val[1]) for val in sampleA] - resultB=[cmp_samples(val[0],val[1]) for val in sampleB] - resultC=[cmp_samples(val[0],val[1]) for val in sampleC] - self.assertEqual(1,*results) - self.assertEqual(-1,*resultB) - self.assertEqual([1, -1, 1, -1, -1, 1, -1, -1],resultC) - - - - - - - - - - - +class TestExportTraits(unittest.TestCase): + """Test methods related converting dict to sortedlist""" + def test_dict_to_sortedlist(self): + '''Test for conversion of dict to sorted list''' + sample1 = { + "other": "exp1", + "name": "exp2" + } + sample2 = { + "se": 1, + "num_cases": 4, + "value": 6, + "name": 3 + + } + rever = { + "name": 3, + "value": 6, + "num_cases": 4, + "se": 1 + } + oneItem = { + "item1": "one" + } + + self.assertEqual(["exp2", "exp1"], dict_to_sorted_list(sample1)) + self.assertEqual([3, 6, 1, 4], dict_to_sorted_list(sample2)) + self.assertEqual([3, 6, 1, 4], dict_to_sorted_list(rever)) + self.assertEqual(["one"], dict_to_sorted_list(oneItem)) + '''test that the func returns the values not the keys''' + self.assertFalse(["other", "name"] == dict_to_sorted_list(sample1)) + + def test_cmp_samples(self): + '''test for function that does comparisons of samples''' + + sampleA = [ + [ + ("value", "other"), + ("name", "test_name") + ] + ] + sampleB = [ + [ + ("value", "other"), + ("unknown", "test_name") + ] + ] + sampleC = [ + [("other", "value"), + ("name", "value") + ], + [ + ("name", "value"), + ("value", "name") + ], + [ + ("other", "value"), + ("name", "value" + )], + [ + ("name", "name1"), + ("se", "valuex") + ], + [( + "value", "name1"), + ("se", "valuex") + ], + [( + "other", "name1"), + ("se", "valuex" + ) + ], + [( + "name", "name_val"), + ("num_cases", "num_val") + ], + [( + "other_a", "val_a"), + ("other_b", "val" + ) + ]] + results = [cmp_samples(val[0], val[1]) for val in sampleA] + resultB = [cmp_samples(val[0], val[1]) for val in sampleB] + resultC = [cmp_samples(val[0], val[1]) for val in sampleC] + self.assertEqual(1, *results) + self.assertEqual(-1, *resultB) + self.assertEqual([1, -1, 1, -1, -1, 1, -1, -1], resultC) -- cgit v1.2.3 From 1cf15edbcc3833cd2ec0938d5c6591d7a2e219b7 Mon Sep 17 00:00:00 2001 From: Alexanderlacuna Date: Tue, 27 Oct 2020 14:07:49 +0300 Subject: address failures --- wqflask/tests/wqflask/show_trait/test_export_trait_data.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'wqflask') diff --git a/wqflask/tests/wqflask/show_trait/test_export_trait_data.py b/wqflask/tests/wqflask/show_trait/test_export_trait_data.py index 2f95d219..bc45a213 100644 --- a/wqflask/tests/wqflask/show_trait/test_export_trait_data.py +++ b/wqflask/tests/wqflask/show_trait/test_export_trait_data.py @@ -4,9 +4,10 @@ from wqflask.show_trait.export_trait_data import cmp_samples class TestExportTraits(unittest.TestCase): - """Test methods related converting dict to sortedlist""" + """Test methods related to converting dict to sortedlist""" + def test_dict_to_sortedlist(self): - '''Test for conversion of dict to sorted list''' + '''test for conversion of dict to sorted list''' sample1 = { "other": "exp1", "name": "exp2" @@ -36,8 +37,7 @@ class TestExportTraits(unittest.TestCase): self.assertFalse(["other", "name"] == dict_to_sorted_list(sample1)) def test_cmp_samples(self): - '''test for function that does comparisons of samples''' - + '''test for comparing samples function''' sampleA = [ [ ("value", "other"), @@ -83,10 +83,12 @@ class TestExportTraits(unittest.TestCase): "other_a", "val_a"), ("other_b", "val" ) - ]] + ] + ] results = [cmp_samples(val[0], val[1]) for val in sampleA] resultB = [cmp_samples(val[0], val[1]) for val in sampleB] resultC = [cmp_samples(val[0], val[1]) for val in sampleC] + self.assertEqual(1, *results) self.assertEqual(-1, *resultB) self.assertEqual([1, -1, 1, -1, -1, 1, -1, -1], resultC) -- cgit v1.2.3 From abf3758d86c1ee37e458d79e62be69e4c23e515c Mon Sep 17 00:00:00 2001 From: Alexanderlacuna Date: Tue, 27 Oct 2020 14:26:06 +0300 Subject: switch from single quote to double quote --- wqflask/tests/wqflask/show_trait/test_export_trait_data.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'wqflask') diff --git a/wqflask/tests/wqflask/show_trait/test_export_trait_data.py b/wqflask/tests/wqflask/show_trait/test_export_trait_data.py index bc45a213..98d599b1 100644 --- a/wqflask/tests/wqflask/show_trait/test_export_trait_data.py +++ b/wqflask/tests/wqflask/show_trait/test_export_trait_data.py @@ -7,7 +7,7 @@ class TestExportTraits(unittest.TestCase): """Test methods related to converting dict to sortedlist""" def test_dict_to_sortedlist(self): - '''test for conversion of dict to sorted list''' + """test for conversion of dict to sorted list""" sample1 = { "other": "exp1", "name": "exp2" @@ -33,11 +33,11 @@ class TestExportTraits(unittest.TestCase): self.assertEqual([3, 6, 1, 4], dict_to_sorted_list(sample2)) self.assertEqual([3, 6, 1, 4], dict_to_sorted_list(rever)) self.assertEqual(["one"], dict_to_sorted_list(oneItem)) - '''test that the func returns the values not the keys''' + """test that the func returns the values not the keys""" self.assertFalse(["other", "name"] == dict_to_sorted_list(sample1)) def test_cmp_samples(self): - '''test for comparing samples function''' + """test for comparing samples function""" sampleA = [ [ ("value", "other"), -- cgit v1.2.3