chore: fix merge conflicts #4343

Nereboss · Nereboss · commit 8d06b81fd1de · 2025-11-07T11:19:16.000+01:00
diff --git a/analysis/analysers/parsers/UnifiedParser/src/test/resources/languageSamples/cSample.cc.json b/analysis/analysers/parsers/UnifiedParser/src/test/resources/languageSamples/cSample.cc.json
@@ -1,5 +1,5 @@
 {
-  "checksum": "68464c0ccc20394bf81f8afeaff3c6ac",
+  "checksum": "a93c295c6b5eb058f70f5c0921749dfe",
   "data": {
     "projectName": "",
     "nodes": [
@@ -27,9 +27,9 @@
               "min_complexity_per_function": 0.0,
               "mean_complexity_per_function": 1.67,
               "median_complexity_per_function": 1.0,
-              "max_rloc_per_function": 5.0,
+              "max_rloc_per_function": 6.0,
               "min_rloc_per_function": 2.0,
-              "mean_rloc_per_function": 3.67,
+              "mean_rloc_per_function": 4.0,
               "median_rloc_per_function": 4.0,
               "long_method": 0.0,
               "long_parameter_list": 0.0
diff --git a/analysis/analysers/parsers/UnifiedParser/src/test/resources/languageSamples/cppSample.cc.json b/analysis/analysers/parsers/UnifiedParser/src/test/resources/languageSamples/cppSample.cc.json
@@ -1,5 +1,5 @@
 {
-  "checksum": "5e81f6103321e307afa6f500c31ed9a3",
+  "checksum": "1dff0aeafa98d7da752f0dc2539a5304",
   "data": {
     "projectName": "",
     "nodes": [
@@ -27,9 +27,9 @@
               "min_complexity_per_function": 0.0,
               "mean_complexity_per_function": 1.67,
               "median_complexity_per_function": 1.0,
-              "max_rloc_per_function": 5.0,
+              "max_rloc_per_function": 6.0,
               "min_rloc_per_function": 1.0,
-              "mean_rloc_per_function": 3.33,
+              "mean_rloc_per_function": 3.67,
               "median_rloc_per_function": 4.0,
               "long_method": 0.0,
               "long_parameter_list": 0.0
diff --git a/analysis/analysers/parsers/UnifiedParser/src/test/resources/languageSamples/goSample.cc.json b/analysis/analysers/parsers/UnifiedParser/src/test/resources/languageSamples/goSample.cc.json
@@ -1,5 +1,5 @@
 {
-  "checksum": "944f829860f830ab384719ef2e52fd86",
+  "checksum": "2ab9b1dbfe13ff304c208dc8379d9043",
   "data": {
     "projectName": "",
     "nodes": [
@@ -29,8 +29,8 @@
               "median_complexity_per_function": 1.0,
               "max_rloc_per_function": 10.0,
               "min_rloc_per_function": 1.0,
-              "mean_rloc_per_function": 4.67,
-              "median_rloc_per_function": 3.0,
+              "mean_rloc_per_function": 5.33,
+              "median_rloc_per_function": 5.0,
               "long_method": 0.0,
               "long_parameter_list": 0.0
             },
diff --git a/analysis/analysers/parsers/UnifiedParser/src/test/resources/languageSamples/javaSample.cc.json b/analysis/analysers/parsers/UnifiedParser/src/test/resources/languageSamples/javaSample.cc.json
@@ -1,5 +1,5 @@
 {
-  "checksum": "4375a3a19c42aadde2bdeae11771e449",
+  "checksum": "ecdd4579591754b2937bc5f573690edf",
   "data": {
     "projectName": "",
     "nodes": [
@@ -27,10 +27,10 @@
               "min_complexity_per_function": 1.0,
               "mean_complexity_per_function": 1.8,
               "median_complexity_per_function": 1.0,
-              "max_rloc_per_function": 4.0,
-              "min_rloc_per_function": 4.0,
-              "mean_rloc_per_function": 4.0,
-              "median_rloc_per_function": 4.0,
+              "max_rloc_per_function": 10.0,
+              "min_rloc_per_function": 5.0,
+              "mean_rloc_per_function": 6.4,
+              "median_rloc_per_function": 6.0,
               "long_method": 0.0,
               "long_parameter_list": 0.0
             },
diff --git a/analysis/analysers/parsers/UnifiedParser/src/test/resources/languageSamples/javascriptSample.cc.json b/analysis/analysers/parsers/UnifiedParser/src/test/resources/languageSamples/javascriptSample.cc.json
@@ -1,5 +1,5 @@
 {
-  "checksum": "ec19ebef1ca315272ec635f0b82b3dbd",
+  "checksum": "0f7979a7ded8beb88acaf3e0048fafbe",
   "data": {
     "projectName": "",
     "nodes": [
@@ -27,11 +27,11 @@
               "min_complexity_per_function": 0.0,
               "mean_complexity_per_function": 3.29,
               "median_complexity_per_function": 4.0,
-              "max_rloc_per_function": 3.0,
+              "max_rloc_per_function": 23.0,
               "min_rloc_per_function": 1.0,
-              "mean_rloc_per_function": 2.14,
-              "median_rloc_per_function": 2.0,
-              "long_method": 0.0,
+              "mean_rloc_per_function": 11.14,
+              "median_rloc_per_function": 13.0,
+              "long_method": 4.0,
               "long_parameter_list": 0.0
             },
             "link": "",
diff --git a/analysis/analysers/parsers/UnifiedParser/src/test/resources/languageSamples/pythonSample.cc.json b/analysis/analysers/parsers/UnifiedParser/src/test/resources/languageSamples/pythonSample.cc.json
@@ -1,5 +1,5 @@
 {
-  "checksum": "2db97512010dae766ed74a62e5626a68",
+  "checksum": "e6e398d1c6d4a53d47266a07d5ec3d06",
   "data": {
     "projectName": "",
     "nodes": [
@@ -27,11 +27,11 @@
               "min_complexity_per_function": 0.0,
               "mean_complexity_per_function": 1.0,
               "median_complexity_per_function": 1.0,
-              "max_rloc_per_function": 4.0,
+              "max_rloc_per_function": 11.0,
               "min_rloc_per_function": 1.0,
-              "mean_rloc_per_function": 2.17,
-              "median_rloc_per_function": 2.0,
-              "long_method": 0.0,
+              "mean_rloc_per_function": 4.83,
+              "median_rloc_per_function": 4.5,
+              "long_method": 1.0,
               "long_parameter_list": 1.0
             },
             "link": "",
diff --git a/analysis/analysers/parsers/UnifiedParser/src/test/resources/languageSamples/rubySample.cc.json b/analysis/analysers/parsers/UnifiedParser/src/test/resources/languageSamples/rubySample.cc.json
@@ -1,5 +1,5 @@
 {
-  "checksum": "cb1318acb1dc256d637934336c66b718",
+  "checksum": "9b598cc6f9422008293d8151ffb75000",
   "data": {
     "projectName": "",
     "nodes": [
@@ -29,9 +29,9 @@
               "median_complexity_per_function": 0.5,
               "max_rloc_per_function": 22.0,
               "min_rloc_per_function": 1.0,
-              "mean_rloc_per_function": 7.38,
+              "mean_rloc_per_function": 7.62,
               "median_rloc_per_function": 5.5,
-              "long_method": 2.0,
+              "long_method": 3.0,
               "long_parameter_list": 1.0
             },
             "link": "",
diff --git a/analysis/analysers/parsers/UnifiedParser/src/test/resources/languageSamples/typescriptSample.cc.json b/analysis/analysers/parsers/UnifiedParser/src/test/resources/languageSamples/typescriptSample.cc.json
@@ -1,5 +1,5 @@
 {
-  "checksum": "7e084999b4ccce061cbbd4ab1b80c06e",
+  "checksum": "7560d6ecc728c846acbd2e6f1590c536",
   "data": {
     "projectName": "",
     "nodes": [
@@ -27,11 +27,11 @@
               "min_complexity_per_function": 0.0,
               "mean_complexity_per_function": 3.83,
               "median_complexity_per_function": 4.0,
-              "max_rloc_per_function": 3.0,
+              "max_rloc_per_function": 23.0,
               "min_rloc_per_function": 1.0,
-              "mean_rloc_per_function": 2.17,
-              "median_rloc_per_function": 2.0,
-              "long_method": 0.0,
+              "mean_rloc_per_function": 12.67,
+              "median_rloc_per_function": 14.5,
+              "long_method": 4.0,
               "long_parameter_list": 0.0
             },
             "link": "",
