Merge pull request #836 from KachanovYev/issue_810

Fix NPath metric calculating for 'if' conditions

Author: yegor256

aibolit/metrics/npath/main.py

@@ -125,7 +125,7 @@ def _if_npath(self, node: ASTNode) -> int:
             if node.else_statement is not None
             else 1
         )
-        return condition_npath * (then_npath + else_npath)
+        return condition_npath * then_npath + else_npath
 
     def _switch_npath(self, node: ASTNode) -> int:
         def _group_npath(case_group: ASTNode) -> int:

test/metrics/npath/test_all_types.py

@@ -191,15 +191,7 @@ def test_complex_if_else_with_npath_complexity_of_5(self) -> None:
         ).strip()
         assert self._value(content) == 5
 
-    @pytest.mark.xfail(
-        reason='Probably wrong implementation for If',
-        strict=True,
-    )
     def test_if_with_and_condition(self) -> None:
-        # TODO #807:30min/DEV Fix NPath metric for if with AND (&&) condition.
-        #  Refer to https://checkstyle.org/checks/metrics/npathcomplexity.html
-        #  for details on NPath metric.
-        #  Once implemented, remove `xfail` mark from this test.
         content = '''
         class Test {
             void check(int a, int b) {
@@ -213,15 +205,7 @@ class Test {
         '''
         assert self._value(content) == 3
 
-    @pytest.mark.xfail(
-        reason='Probably wrong implementation for If',
-        strict=True,
-    )
     def test_if_with_or_condition(self) -> None:
-        # TODO #807:30min/DEV Fix NPath metric for if with OR (||) condition.
-        #  Refer to https://checkstyle.org/checks/metrics/npathcomplexity.html
-        #  for details on NPath metric.
-        #  Once implemented, remove `xfail` mark from this test.
         content = '''
         class Test {
             void validate(int x, int y) {