Merge pull request #119 from Kuniwak/fix-style-problem

Fix style problem
Vimjas · Jan 25, 2015 · 95d5471 · 95d5471
2 parents df0e764 + c3ba0d7
commit 95d5471
Show file tree

Hide file tree

Showing 2 changed files with 64 additions and 4 deletions.
diff --git a/test/unit/vint/linting/config/test_config_cmdargs_source.py b/test/unit/vint/linting/config/test_config_cmdargs_source.py
@@ -7,6 +7,15 @@
 
 class TestConfigFileSource(ConfigSourceAssertion, unittest.TestCase):
     def test_get_config_dict(self):
+        env = {
+            'cmdargs': {
+                'verbose': True,
+                'style': True,
+                'warning': True,
+                'max-violations': 10,
+            },
+        }
+
         expected_config_dict = {
             'cmdargs': {
                 'verbose': True,
@@ -15,12 +24,63 @@ def test_get_config_dict(self):
             },
         }
 
+        config_source = self.initialize_config_source_with_env(ConfigCmdargsSource, env)
+        self.assertConfigDict(config_source, expected_config_dict)
+
+
+    def test_get_config_dict_with_no_severity(self):
+        env = {'cmdargs': {}}
+
+        expected_config_dict = {'cmdargs': {}}
+
+        config_source = self.initialize_config_source_with_env(ConfigCmdargsSource, env)
+        self.assertConfigDict(config_source, expected_config_dict)
+
+
+    def test_get_config_dict_with_severity_style_problem(self):
+        env = {
+            'cmdargs': {
+                'style_problem': True,
+            },
+        }
+
+        expected_config_dict = {
+            'cmdargs': {
+                'severity': Level.STYLE_PROBLEM,
+            },
+        }
+
+        config_source = self.initialize_config_source_with_env(ConfigCmdargsSource, env)
+        self.assertConfigDict(config_source, expected_config_dict)
+
+
+    def test_get_config_dict_with_severity_warning(self):
         env = {
             'cmdargs': {
-                'verbose': True,
-                'style': True,
                 'warning': True,
-                'max-violations': 10,
+            },
+        }
+
+        expected_config_dict = {
+            'cmdargs': {
+                'severity': Level.WARNING,
+            },
+        }
+
+        config_source = self.initialize_config_source_with_env(ConfigCmdargsSource, env)
+        self.assertConfigDict(config_source, expected_config_dict)
+
+
+    def test_get_config_dict_with_severity_error(self):
+        env = {
+            'cmdargs': {
+                'error': True,
+            },
+        }
+
+        expected_config_dict = {
+            'cmdargs': {
+                'severity': Level.ERROR,
             },
         }
 

diff --git a/vint/linting/config/config_cmdargs_source.py b/vint/linting/config/config_cmdargs_source.py
@@ -62,7 +62,7 @@ def _normalize_severity(self, env, config_dict):
         #   1. error
         #   2. warning
         #   3. style problem
-        if env_cmdargs.get('style', False):
+        if env_cmdargs.get('style_problem', False):
             config_dict_cmdargs['severity'] = Level.STYLE_PROBLEM
 
         if env_cmdargs.get('warning', False):