Merge branch '__rultor'

aibolit/ast_framework/computed_fields_catalog/nodes_filter.py

@@ -35,11 +35,9 @@ def nodes_filter_factory(
 
     def filter(base_node: ASTNode) -> Iterator[ASTNode]:
         base_field = getattr(base_node, base_field_name)
-        if isinstance(base_field, list) and all(
-            isinstance(item, ASTNode) for item in base_field
-        ):
+        if isinstance(base_field, list):
             for node in base_field:
-                if node.node_type in node_types:
+                if isinstance(node, ASTNode) and node.node_type in node_types:
                     yield node
         else:
             raise RuntimeError(

aibolit/config.py

@@ -10,6 +10,7 @@
 from aibolit.metrics.maxDiameter.max_diam_of_tree import MaxDiamOfTree as M6
 from aibolit.metrics.ncss.ncss import NCSSMetric as M2
 from aibolit.metrics.spaces.SpaceCounter import IndentationCounter as M3
+from aibolit.metrics.NumberMethods.NumberMethods import NumberMethods as M8
 from aibolit.patterns.array_as_argument.array_as_argument import ArrayAsArgument as P22
 from aibolit.patterns.assert_in_code.assert_in_code import AssertInCode as P1
 from aibolit.patterns.assign_null_finder.assign_null_finder import NullAssignment as P28
@@ -165,7 +166,8 @@ def get_patterns_config():
                 {"name": "Cognitive Complexity", "code": "M4", "make": lambda: M4()},
                 {"name": "LCOM4", "code": "M5", "make": lambda: M5()},
                 {"name": "Max diameter of AST", "code": "M6", "make": lambda: M6()},
-                {"name": "Number of variables", "code": "M7", "make": lambda: M7()}
+                {"name": "Number of variables", "code": "M7", "make": lambda: M7()},
+                {"name": "Number of methods", "code": "M8", "make": lambda: M8()}
             ],
             "target": {
 

aibolit/metrics/NumberMethods/NumberMethods.py

@@ -0,0 +1,34 @@
+# The MIT License (MIT)
+#
+# Copyright (c) 2020 Aibolit
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+from aibolit.ast_framework import AST, ASTNodeType
+from aibolit.utils.ast_builder import build_ast
+
+
+class NumberMethods:
+    def value(self, filename: str) -> int:
+        metric = 0
+        ast = AST.build_from_javalang(build_ast(filename))
+        for class_node in ast.get_proxy_nodes(ASTNodeType.CLASS_DECLARATION):
+            for method_node in class_node.methods:
+                metric += 1
+        return metric

test/metrics/NumberMethods/nested.java

@@ -0,0 +1,25 @@
+// This Java code is taken from a public GitHub repository
+// and is used inside Aibolit only for integration testing
+// purposes. The code is never compiled or executed.
+
+
+class LengthStringComparator implements Comparator<String> {
+    boolean validate() { // +1
+   return new Object() {
+     boolean check(Struct struct) {
+       if (!struct.valid()) return false;
+       for(Struct child : struct.children()) {
+         if (!check(child)) return false;
+       }
+       return true;
+     }
+   }.check(_struct);
+}
+
+	public static void main(String[] args) // +1
+    { 
+        int test = 3; 
+        main(test); 
+    } 
+
+}

test/metrics/NumberMethods/one.java

@@ -0,0 +1,39 @@
+// This Java code is taken from a public GitHub repository
+// and is used inside Aibolit only for integration testing
+// purposes. The code is never compiled or executed.
+
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class Hospital {
+
+	public static List<Instance> readDataGet(String file) throws FileNotFoundException { // +1
+		List<Instance> dataset = new ArrayList<Instance>();
+		Scanner scanner = null;
+		try {
+			scanner = new Scanner(new File(file));
+			while(scanner.hasNextLine()) { 
+				String line = scanner.nextLine();
+				if (line.startsWith("#")) { 
+					continue; // +1
+				}
+				String[] columns = line.split("\\s+");
+
+				// skip first column and last column is the label
+				int i = 1;
+				int[] data = new int[columns.length-2];
+				for (i=1; i<columns.length-1; i++) { 
+					data[i-1] = Integer.parseInt(columns[i]);
+				}
+				int label = Integer.parseInt(columns[i]);
+				Instance instance = new Instance(label, data);
+				dataset.add(instance);
+			}
+		} finally {
+			if (scanner != null)
+				scanner.close();
+		}
+		return dataset;
+	}		
+}

test/metrics/NumberMethods/several.java

@@ -0,0 +1,45 @@
+// This Java code is taken from a public GitHub repository
+// and is used inside Aibolit only for integration testing
+// purposes. The code is never compiled or executed.
+
+
+class LengthStringComparator implements Comparator<String> {
+  	public void recursionFucn() { // +1
+         System.out.println("Miss me?!");
+     recursionFucn(); 
+	}
+
+    public int fact(int n) // +1
+	{
+    // wrong base case (it may cause
+    // stack overflow).
+    if (n == 100)
+        return 1;
+
+    else 
+        return n*fact(n-1);
+	}
+
+    static void printFun(int test) // +1
+    { 
+        if (test < 1) 
+            return; 
+
+        else { 
+            System.out.printf("%d ", test); 
+
+            // Statement 2 
+            printFun(test - 1);
+
+            System.out.printf("%d ", test); 
+            return; 
+        } 
+    } 
+
+    public static void main(String[] args)  // +1
+    { 
+        int test = 3; 
+        printFun(test); 
+    } 
+
+}

test/metrics/NumberMethods/simple.java

@@ -0,0 +1,21 @@
+// This Java code is taken from a public GitHub repository
+// and is used inside Aibolit only for integration testing
+// purposes. The code is never compiled or executed.
+
+
+class Test {
+    public static void main(String[] arg) { // +1
+		int a = 1;
+        if ( a && b && c || d || e && f) {
+			a = 1;
+    }
+}
+
+	public static void main(String[] arg) { // +1
+		int a = 1;
+        if ( a && !(b && c)) {
+			a = 1;
+    }
+}
+
+}

test/metrics/NumberMethods/test_number_methods.py

@@ -0,0 +1,46 @@
+# The MIT License (MIT)
+#
+# Copyright (c) 2020 Aibolit
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+import os
+from unittest import TestCase
+from aibolit.metrics.NumberMethods.NumberMethods import NumberMethods
+from pathlib import Path
+
+
+class TestCognitive(TestCase):
+    dir_path = Path(os.path.realpath(__file__)).parent
+
+    def test_one(self):
+        metric = NumberMethods().value(Path(self.dir_path, 'one.java'))
+        self.assertEqual(metric, 1)
+
+    def test_simple(self):
+        metric = NumberMethods().value(Path(self.dir_path, 'simple.java'))
+        self.assertEqual(metric, 2)
+
+    def test_nested(self):
+        metric = NumberMethods().value(Path(self.dir_path, 'nested.java'))
+        self.assertEqual(metric, 2)
+
+    def test_several(self):
+        metric = NumberMethods().value(Path(self.dir_path, 'several.java'))
+        self.assertEqual(metric, 4)