SONARPY-188 Reduce the threshold of function cyclomatic complexity check (#75)

Author: ivandalbosco

its/ruling/src/test/resources/expected/python-FunctionComplexity.json

@@ -1,6 +1,8 @@
 {
 'project:buildbot-0.8.6p1/buildbot/changes/mail.py':[
 82,
+273,
+409,
 ],
 'project:buildbot-0.8.6p1/buildbot/changes/p4poller.py':[
 101,
@@ -17,24 +19,53 @@
 'project:buildbot-0.8.6p1/buildbot/scripts/runner.py':[
 1143,
 ],
+'project:buildbot-0.8.6p1/buildbot/status/builder.py':[
+352,
+],
+'project:buildbot-0.8.6p1/buildbot/status/logfile.py':[
+445,
+],
 'project:buildbot-0.8.6p1/buildbot/status/mail.py':[
 69,
+169,
+402,
 ],
 'project:buildbot-0.8.6p1/buildbot/status/web/build.py':[
 144,
 ],
+'project:buildbot-0.8.6p1/buildbot/status/web/console.py':[
+413,
+],
+'project:buildbot-0.8.6p1/buildbot/status/web/feeds.py':[
+169,
+],
 'project:buildbot-0.8.6p1/buildbot/status/web/waterfall.py':[
+229,
 534,
 689,
 ],
 'project:buildbot-0.8.6p1/buildbot/steps/python_twisted.py':[
 209,
 409,
+503,
+],
+'project:buildbot-0.8.6p1/buildbot/steps/shell.py':[
+462,
+652,
+],
+'project:buildbot-0.8.6p1/buildbot/steps/subunit.py':[
+36,
+],
+'project:buildbot-0.8.6p1/buildbot/test/fake/fakedb.py':[
+880,
 ],
 'project:buildbot-slave-0.8.6p1/buildslave/runprocess.py':[
+232,
 395,
 ],
 'project:django-1.4/django/contrib/admin/options.py':[
+924,
+1012,
 1103,
 ],
 'project:django-1.4/django/contrib/admin/templatetags/admin_list.py':[
@@ -44,18 +75,43 @@
 14,
 262,
 ],
+'project:django-1.4/django/contrib/admin/views/main.py':[
+80,
+],
+'project:django-1.4/django/contrib/auth/management/commands/createsuperuser.py':[
+46,
+],
+'project:django-1.4/django/contrib/contenttypes/views.py':[
+7,
+],
 'project:django-1.4/django/contrib/gis/db/backends/postgis/operations.py':[
 483,
 ],
 'project:django-1.4/django/contrib/gis/db/models/query.py':[
 571,
 ],
+'project:django-1.4/django/contrib/localflavor/id/forms.py':[
+115,
+],
+'project:django-1.4/django/contrib/staticfiles/management/commands/collectstatic.py':[
+134,
+],
+'project:django-1.4/django/core/handlers/base.py':[
+72,
+],
+'project:django-1.4/django/core/management/commands/dumpdata.py':[
+30,
+119,
+],
 'project:django-1.4/django/core/management/commands/inspectdb.py':[
 27,
 ],
 'project:django-1.4/django/core/management/commands/loaddata.py':[
 37,
 ],
+'project:django-1.4/django/core/management/commands/makemessages.py':[
+263,
+],
 'project:django-1.4/django/core/management/commands/syncdb.py':[
 24,
 ],
@@ -65,35 +121,93 @@
 'project:django-1.4/django/core/management/validation.py':[
 16,
 ],
+'project:django-1.4/django/core/servers/fastcgi.py':[
+90,
+],
 'project:django-1.4/django/db/backends/creation.py':[
 31,
 ],
+'project:django-1.4/django/db/backends/oracle/base.py':[
+151,
+],
 'project:django-1.4/django/db/models/base.py':[
 32,
+278,
 467,
+642,
+],
+'project:django-1.4/django/db/models/deletion.py':[
+225,
 ],
 'project:django-1.4/django/db/models/query.py':[
+165,
 231,
 1240,
+1339,
+1579,
 ],
 'project:django-1.4/django/db/models/sql/compiler.py':[
 53,
+333,
 573,
 ],
 'project:django-1.4/django/db/models/sql/query.py':[
 443,
+559,
+741,
 1030,
+1219,
 1270,
 ],
+'project:django-1.4/django/db/models/sql/where.py':[
+130,
+],
+'project:django-1.4/django/forms/forms.py':[
+141,
+],
+'project:django-1.4/django/forms/models.py':[
+133,
+502,
+],
+'project:django-1.4/django/http/multipartparser.py':[
+92,
+],
+'project:django-1.4/django/middleware/common.py':[
+35,
+],
+'project:django-1.4/django/template/base.py':[
+885,
+],
+'project:django-1.4/django/templatetags/i18n.py':[
+361,
+],
 'project:django-1.4/django/test/_doctest.py':[
 875,
+1177,
+],
+'project:django-1.4/django/utils/dictconfig.py':[
+272,
 ],
 'project:django-1.4/django/utils/html.py':[
 123,
 ],
+'project:django-1.4/django/utils/ipv6.py':[
+143,
+],
+'project:django-1.4/django/utils/numberformat.py':[
+5,
+],
+'project:django-1.4/django/utils/regex_helper.py':[
+42,
+286,
+],
 'project:django-1.4/django/utils/translation/trans_real.py':[
+366,
 449,
 ],
+'project:django-1.4/django/utils/unittest/main.py':[
+114,
+],
 'project:django-1.4/django/views/decorators/http.py':[
 78,
 ],
@@ -102,21 +216,32 @@
 ],
 'project:tornado-2.3/demos/appengine/markdown.py':[
 279,
+441,
 828,
 1578,
+1758,
 ],
 'project:tornado-2.3/demos/blog/markdown.py':[
 279,
+441,
 828,
 1578,
+1758,
 ],
 'project:tornado-2.3/tornado/curl_httpclient.py':[
 275,
 ],
+'project:tornado-2.3/tornado/escape.py':[
+271,
+],
+'project:tornado-2.3/tornado/ioloop.py':[
+251,
+],
 'project:tornado-2.3/tornado/locale.py':[
 261,
 ],
 'project:tornado-2.3/tornado/simple_httpclient.py':[
+128,
 237,
 ],
 'project:tornado-2.3/tornado/template.py':[
@@ -125,21 +250,63 @@
 'project:tornado-2.3/tornado/web.py':[
 496,
 ],
+'project:twisted-12.1.0/twisted/conch/ls.py':[
+16,
+],
+'project:twisted-12.1.0/twisted/conch/scripts/tkconch.py':[
+112,
+],
+'project:twisted-12.1.0/twisted/internet/defer.py':[
+476,
+],
+'project:twisted-12.1.0/twisted/internet/process.py':[
+719,
+],
+'project:twisted-12.1.0/twisted/mail/imap4.py':[
+3916,
+],
 'project:twisted-12.1.0/twisted/mail/scripts/mailmail.py':[
 62,
 ],
+'project:twisted-12.1.0/twisted/mail/smtp.py':[
+372,
+],
+'project:twisted-12.1.0/twisted/names/authority.py':[
+78,
+],
+'project:twisted-12.1.0/twisted/names/common.py':[
+220,
+],
 'project:twisted-12.1.0/twisted/python/failure.py':[
 170,
 ],
 'project:twisted-12.1.0/twisted/python/rebuild.py':[
 130,
 ],
 'project:twisted-12.1.0/twisted/python/usage.py':[
+210,
 859,
 ],
+'project:twisted-12.1.0/twisted/python/util.py':[
+935,
+],
 'project:twisted-12.1.0/twisted/spread/jelly.py':[
 468,
 ],
+'project:twisted-12.1.0/twisted/test/iosim.py':[
+213,
+],
+'project:twisted-12.1.0/twisted/web/http.py':[
+889,
+],
+'project:twisted-12.1.0/twisted/web/microdom.py':[
+546,
+799,
+872,
+],
+'project:twisted-12.1.0/twisted/web/template.py':[
+169,
+],
 'project:twisted-12.1.0/twisted/words/xish/domish.py':[
 58,
 ],

python-checks/src/main/java/org/sonar/python/checks/FunctionComplexityCheck.java

@@ -42,7 +42,7 @@
   effortToFixDescription = "per complexity point above the threshold")
 @ActivatedByDefault
 public class FunctionComplexityCheck extends PythonCheck {
-  private static final int DEFAULT_MAXIMUM_FUNCTION_COMPLEXITY_THRESHOLD = 20;
+  private static final int DEFAULT_MAXIMUM_FUNCTION_COMPLEXITY_THRESHOLD = 15;
   private static final String MESSAGE = "Function has a complexity of %s which is greater than %s authorized.";
 
   @RuleProperty(

python-checks/src/test/java/org/sonar/python/checks/FunctionComplexityCheckTest.java

@@ -31,4 +31,10 @@ public void test() {
     PythonCheckVerifier.verify("src/test/resources/checks/functionComplexity.py", check);
   }
 
+  @Test
+  public void test_with_default_threshold() {
+    FunctionComplexityCheck check = new FunctionComplexityCheck();
+    PythonCheckVerifier.verify("src/test/resources/checks/functionComplexityWithDefaultThreshold.py", check);
+  }
+
 }

python-checks/src/test/resources/checks/functionComplexityWithDefaultThreshold.py

@@ -0,0 +1,15 @@
+def hello1():      # Noncompliant {{Function has a complexity of 16 which is greater than 15 authorized.}}
+    if (1 == 2 and 1 == 2 and 1 == 2 and 1 == 2 and 1 == 2):
+        pass
+    if (1 == 2 and 1 == 2 and 1 == 2 and 1 == 2 and 1 == 2):
+        pass
+    if (1 == 2 and 1 == 2 and 1 == 2 and 1 == 2 and 1 == 2):
+        pass
+    return
+
+def hello2():      # OK, complexity is 11
+    if (1 == 2 and 1 == 2 and 1 == 2 and 1 == 2 and 1 == 2):
+        pass
+    if (1 == 2 and 1 == 2 and 1 == 2 and 1 == 2 and 1 == 2):
+        pass
+    return