Merge pull request #851 from hdoupe/update_csv_tests

Merged #851
ospc-org · Mar 19, 2018 · 8756910 · 8756910
2 parents b17e47e + 29cd302
commit 8756910
Showing 1 changed file with 50 additions and 30 deletions.
diff --git a/webapp/apps/taxbrain/tests/test_all.py b/webapp/apps/taxbrain/tests/test_all.py
@@ -86,7 +86,6 @@ def test_expand2d(self):
         exp = [[1, 2, 3], [4, 5, 6], [None, None, None]]
         assert expand_list(x, 3) == exp
 
-    @pytest.mark.xfail
     def test_format_csv(self):
         c = cycler(40)
         tab_types = ["dist2_xdec", "dist1_xdec", "diff_itax_xdec", "diff_ptax_xdec",
@@ -95,48 +94,60 @@ def test_format_csv(self):
                      "aggr_1", "aggr_2"]
 
         bin_keys = [
+            '<$0K_0',
+            '<$0K_1',
+            '<$0K_2',
+            '=$0K_0',
+            '=$0K_1',
+            '=$0K_2',
+            '$0-10K_0',
+            '$0-10K_1',
+            '$0-10K_2',
             '$10-20K_0',
             '$10-20K_1',
             '$10-20K_2',
-            '$100-200K_0',
-            '$100-200K_1',
-            '$100-200K_2',
             '$20-30K_0',
             '$20-30K_1',
             '$20-30K_2',
-            '$200-500K_0',
-            '$200-500K_1',
-            '$200-500K_2',
-            '$30-40K_0',
+            '$30-40K_0', 
             '$30-40K_1',
             '$30-40K_2',
-            '$40-50K_0',
-            '$40-50K_1',
-            '$40-50K_2',
+            '$40-50K_0', 
+            '$40-50K_1', 
+            '$40-50K_2', 
             '$50-75K_0',
             '$50-75K_1',
-            '$50-75K_2',
-            '$500-1000K_0',
-            '$500-1000K_1',
-            '$500-1000K_2',
+            '$50-75K_2', 
             '$75-100K_0',
             '$75-100K_1',
             '$75-100K_2',
-            '<$10K_0',
-            '<$10K_1',
-            '<$10K_2',
-            '>$1000K_0',
-            '>$1000K_1',
-            '>$1000K_2',
-            'all_0',
-            'all_1',
-            'all_2'
+            '$100-200K_0',
+            '$100-200K_1', 
+            '$100-200K_2',
+            '$200-500K_0',
+            '$200-500K_1',
+            '$200-500K_2',
+            '$500-1000K_0',
+            '$500-1000K_1',
+            '$500-1000K_2',
+            '>$1000K_0', 
+            '>$1000K_1', 
+            '>$1000K_2', 
+            'ALL_0',
+            'ALL_1',
+            'ALL_2'
         ]
 
         dec_keys = [
-            '0-10_0',
-            '0-10_1',
-            '0-10_2',
+            '0-10n_0',
+            '0-10n_1',
+            '0-10n_2',
+            '0-10z_0',
+            '0-10z_1',
+            '0-10z_2',
+            '0-10p_0',
+            '0-10p_1',
+            '0-10p_2',
             '10-20_0',
             '10-20_1',
             '10-20_2',
@@ -164,9 +175,18 @@ def test_format_csv(self):
             '90-100_0',
             '90-100_1',
             '90-100_2',
-            'all_0',
-            'all_1',
-            'all_2'
+            '90-95_0',
+            '90-95_1',
+            '90-95_2', 
+            '95-99_0',
+            '95-99_1',
+            '95-99_2',
+            'Top 1%_0',
+            'Top 1%_1',
+            'Top 1%_2',
+            'ALL_0',
+            'ALL_1',
+            'ALL_2'
         ]
 
         tot_keys = [u'combined_tax', u'ind_tax', u'payroll_tax']