From c347e99a8b96cee0a14ed16e1cbd2e2fc65903b0 Mon Sep 17 00:00:00 2001 From: Mark Rekveld Date: Tue, 29 Sep 2020 10:47:08 +0200 Subject: [PATCH] SQSCANNER-44 - Move to Xoo for testing (#92) --- .../src/{Hello.js => Hello.xoo} | 0 .../bad-source-dirs/src/Hello.xoo.measures | 1 + .../{Hello.js => Hello.xoo} | 0 .../basedir-with-source/Hello.xoo.measures | 1 + .../module1/src/{Hello.js => Hello.xoo} | 0 .../module1/src/Hello.xoo.measures | 1 + .../module2/src/{Hello.js => Hello.xoo} | 0 .../module2/src/Hello.xoo.measures | 1 + .../module1/src/{Hello.js => Hello.xoo} | 0 .../modules/module1/src/Hello.xoo.measures | 1 + .../module2/src/{Hello.js => Hello.xoo} | 0 .../modules/module2/src/Hello.xoo.measures | 1 + .../my module 1/src/{Hello.js => Hello.xoo} | 0 .../my module 1/src/Hello.xoo.measures | 1 + .../my module 2/src/{Hello.js => Hello.xoo} | 0 .../my module 2/src/Hello.xoo.measures | 1 + .../module1/src1/{Hello.js => Hello.xoo} | 0 .../module1/src1/Hello.xoo.measures | 1 + .../module2/src2/{Hello.js => Hello.xoo} | 0 .../module2/src2/Hello.xoo.measures | 1 + .../module1/src/{Hello.js => Hello.xoo} | 0 .../module1/src/Hello.xoo.measures | 1 + .../module2/src/{Hello.js => Hello.xoo} | 0 .../module2/src/Hello.xoo.measures | 1 + .../module1/src/{Hello.js => Hello.xoo} | 0 .../module1/src/Hello.xoo.measures | 1 + .../module2/src/{Hello.js => Hello.xoo} | 0 .../module2/src/Hello.xoo.measures | 1 + .../module1/src/{Hello.js => Hello.xoo} | 0 .../module1/src/Hello.xoo.measures | 1 + .../module2/src/{Hello.js => Hello.xoo} | 0 .../module2/src/Hello.xoo.measures | 1 + .../module1/src/{Hello.js => Hello.xoo} | 0 .../module1/src/Hello.xoo.measures | 1 + .../module2/src/{Hello.js => Hello.xoo} | 0 .../module2/src/Hello.xoo.measures | 1 + .../src/basic/{Hello.js => Hello.xoo} | 0 .../src/basic/Hello.xoo.measures | 1 + .../src/basic/{World.js => World.xoo} | 0 .../src/basic/World.xoo.measures | 1 + .../src/{Hello.js => Hello.xoo} | 0 .../src/Hello.xoo.measures | 1 + .../src/basic/{Hello.js => Hello.xoo} | 0 .../src/basic/Hello.xoo.measures | 1 + .../src/basic/{World.js => World.xoo} | 0 .../src/basic/World.xoo.measures | 1 + .../src/basic/{Hello.js => Hello.xoo} | 0 .../src/basic/Hello.xoo.measures | 1 + .../src/basic/{World.js => World.xoo} | 0 .../src/basic/World.xoo.measures | 1 + .../sonarsource/scanner/it/ScannerTest.java | 4 ++-- .../scanner/it/SonarScannerTestSuite.java | 21 ++++--------------- 52 files changed, 31 insertions(+), 19 deletions(-) rename it/projects/bad-source-dirs/src/{Hello.js => Hello.xoo} (100%) create mode 100644 it/projects/bad-source-dirs/src/Hello.xoo.measures rename it/projects/basedir-with-source/{Hello.js => Hello.xoo} (100%) create mode 100644 it/projects/basedir-with-source/Hello.xoo.measures rename it/projects/multi-module/advanced/using-config-file-prop/module1/src/{Hello.js => Hello.xoo} (100%) create mode 100644 it/projects/multi-module/advanced/using-config-file-prop/module1/src/Hello.xoo.measures rename it/projects/multi-module/advanced/using-config-file-prop/module2/src/{Hello.js => Hello.xoo} (100%) create mode 100644 it/projects/multi-module/advanced/using-config-file-prop/module2/src/Hello.xoo.measures rename it/projects/multi-module/customization/deep-path-for-modules/modules/module1/src/{Hello.js => Hello.xoo} (100%) create mode 100644 it/projects/multi-module/customization/deep-path-for-modules/modules/module1/src/Hello.xoo.measures rename it/projects/multi-module/customization/deep-path-for-modules/modules/module2/src/{Hello.js => Hello.xoo} (100%) create mode 100644 it/projects/multi-module/customization/deep-path-for-modules/modules/module2/src/Hello.xoo.measures rename it/projects/multi-module/customization/module-path-with-space/my module 1/src/{Hello.js => Hello.xoo} (100%) create mode 100644 it/projects/multi-module/customization/module-path-with-space/my module 1/src/Hello.xoo.measures rename it/projects/multi-module/customization/module-path-with-space/my module 2/src/{Hello.js => Hello.xoo} (100%) create mode 100644 it/projects/multi-module/customization/module-path-with-space/my module 2/src/Hello.xoo.measures rename it/projects/multi-module/customization/overwriting-parent-properties/module1/src1/{Hello.js => Hello.xoo} (100%) create mode 100644 it/projects/multi-module/customization/overwriting-parent-properties/module1/src1/Hello.xoo.measures rename it/projects/multi-module/customization/overwriting-parent-properties/module2/src2/{Hello.js => Hello.xoo} (100%) create mode 100644 it/projects/multi-module/customization/overwriting-parent-properties/module2/src2/Hello.xoo.measures rename it/projects/multi-module/failures/unexisting-base-dir/module1/src/{Hello.js => Hello.xoo} (100%) create mode 100644 it/projects/multi-module/failures/unexisting-base-dir/module1/src/Hello.xoo.measures rename it/projects/multi-module/failures/unexisting-base-dir/module2/src/{Hello.js => Hello.xoo} (100%) create mode 100644 it/projects/multi-module/failures/unexisting-base-dir/module2/src/Hello.xoo.measures rename it/projects/multi-module/failures/unexisting-config-file/module1/src/{Hello.js => Hello.xoo} (100%) create mode 100644 it/projects/multi-module/failures/unexisting-config-file/module1/src/Hello.xoo.measures rename it/projects/multi-module/failures/unexisting-config-file/module2/src/{Hello.js => Hello.xoo} (100%) create mode 100644 it/projects/multi-module/failures/unexisting-config-file/module2/src/Hello.xoo.measures rename it/projects/multi-module/simplest/simplest-with-props-on-each-module/module1/src/{Hello.js => Hello.xoo} (100%) create mode 100644 it/projects/multi-module/simplest/simplest-with-props-on-each-module/module1/src/Hello.xoo.measures rename it/projects/multi-module/simplest/simplest-with-props-on-each-module/module2/src/{Hello.js => Hello.xoo} (100%) create mode 100644 it/projects/multi-module/simplest/simplest-with-props-on-each-module/module2/src/Hello.xoo.measures rename it/projects/multi-module/simplest/simplest-with-props-on-root/module1/src/{Hello.js => Hello.xoo} (100%) create mode 100644 it/projects/multi-module/simplest/simplest-with-props-on-root/module1/src/Hello.xoo.measures rename it/projects/multi-module/simplest/simplest-with-props-on-root/module2/src/{Hello.js => Hello.xoo} (100%) create mode 100644 it/projects/multi-module/simplest/simplest-with-props-on-root/module2/src/Hello.xoo.measures rename it/projects/override-project-settings-path/src/basic/{Hello.js => Hello.xoo} (100%) create mode 100644 it/projects/override-project-settings-path/src/basic/Hello.xoo.measures rename it/projects/override-project-settings-path/src/basic/{World.js => World.xoo} (100%) create mode 100644 it/projects/override-project-settings-path/src/basic/World.xoo.measures rename it/projects/override-working-dir/src/{Hello.js => Hello.xoo} (100%) create mode 100644 it/projects/override-working-dir/src/Hello.xoo.measures rename it/projects/simple-sample-no-properties/src/basic/{Hello.js => Hello.xoo} (100%) create mode 100644 it/projects/simple-sample-no-properties/src/basic/Hello.xoo.measures rename it/projects/simple-sample-no-properties/src/basic/{World.js => World.xoo} (100%) create mode 100644 it/projects/simple-sample-no-properties/src/basic/World.xoo.measures rename it/projects/simple-sample/src/basic/{Hello.js => Hello.xoo} (100%) create mode 100644 it/projects/simple-sample/src/basic/Hello.xoo.measures rename it/projects/simple-sample/src/basic/{World.js => World.xoo} (100%) create mode 100644 it/projects/simple-sample/src/basic/World.xoo.measures diff --git a/it/projects/bad-source-dirs/src/Hello.js b/it/projects/bad-source-dirs/src/Hello.xoo similarity index 100% rename from it/projects/bad-source-dirs/src/Hello.js rename to it/projects/bad-source-dirs/src/Hello.xoo diff --git a/it/projects/bad-source-dirs/src/Hello.xoo.measures b/it/projects/bad-source-dirs/src/Hello.xoo.measures new file mode 100644 index 0000000..5143bc6 --- /dev/null +++ b/it/projects/bad-source-dirs/src/Hello.xoo.measures @@ -0,0 +1 @@ +ncloc:2 diff --git a/it/projects/basedir-with-source/Hello.js b/it/projects/basedir-with-source/Hello.xoo similarity index 100% rename from it/projects/basedir-with-source/Hello.js rename to it/projects/basedir-with-source/Hello.xoo diff --git a/it/projects/basedir-with-source/Hello.xoo.measures b/it/projects/basedir-with-source/Hello.xoo.measures new file mode 100644 index 0000000..1738af9 --- /dev/null +++ b/it/projects/basedir-with-source/Hello.xoo.measures @@ -0,0 +1 @@ +ncloc:4 diff --git a/it/projects/multi-module/advanced/using-config-file-prop/module1/src/Hello.js b/it/projects/multi-module/advanced/using-config-file-prop/module1/src/Hello.xoo similarity index 100% rename from it/projects/multi-module/advanced/using-config-file-prop/module1/src/Hello.js rename to it/projects/multi-module/advanced/using-config-file-prop/module1/src/Hello.xoo diff --git a/it/projects/multi-module/advanced/using-config-file-prop/module1/src/Hello.xoo.measures b/it/projects/multi-module/advanced/using-config-file-prop/module1/src/Hello.xoo.measures new file mode 100644 index 0000000..5143bc6 --- /dev/null +++ b/it/projects/multi-module/advanced/using-config-file-prop/module1/src/Hello.xoo.measures @@ -0,0 +1 @@ +ncloc:2 diff --git a/it/projects/multi-module/advanced/using-config-file-prop/module2/src/Hello.js b/it/projects/multi-module/advanced/using-config-file-prop/module2/src/Hello.xoo similarity index 100% rename from it/projects/multi-module/advanced/using-config-file-prop/module2/src/Hello.js rename to it/projects/multi-module/advanced/using-config-file-prop/module2/src/Hello.xoo diff --git a/it/projects/multi-module/advanced/using-config-file-prop/module2/src/Hello.xoo.measures b/it/projects/multi-module/advanced/using-config-file-prop/module2/src/Hello.xoo.measures new file mode 100644 index 0000000..5143bc6 --- /dev/null +++ b/it/projects/multi-module/advanced/using-config-file-prop/module2/src/Hello.xoo.measures @@ -0,0 +1 @@ +ncloc:2 diff --git a/it/projects/multi-module/customization/deep-path-for-modules/modules/module1/src/Hello.js b/it/projects/multi-module/customization/deep-path-for-modules/modules/module1/src/Hello.xoo similarity index 100% rename from it/projects/multi-module/customization/deep-path-for-modules/modules/module1/src/Hello.js rename to it/projects/multi-module/customization/deep-path-for-modules/modules/module1/src/Hello.xoo diff --git a/it/projects/multi-module/customization/deep-path-for-modules/modules/module1/src/Hello.xoo.measures b/it/projects/multi-module/customization/deep-path-for-modules/modules/module1/src/Hello.xoo.measures new file mode 100644 index 0000000..5143bc6 --- /dev/null +++ b/it/projects/multi-module/customization/deep-path-for-modules/modules/module1/src/Hello.xoo.measures @@ -0,0 +1 @@ +ncloc:2 diff --git a/it/projects/multi-module/customization/deep-path-for-modules/modules/module2/src/Hello.js b/it/projects/multi-module/customization/deep-path-for-modules/modules/module2/src/Hello.xoo similarity index 100% rename from it/projects/multi-module/customization/deep-path-for-modules/modules/module2/src/Hello.js rename to it/projects/multi-module/customization/deep-path-for-modules/modules/module2/src/Hello.xoo diff --git a/it/projects/multi-module/customization/deep-path-for-modules/modules/module2/src/Hello.xoo.measures b/it/projects/multi-module/customization/deep-path-for-modules/modules/module2/src/Hello.xoo.measures new file mode 100644 index 0000000..5143bc6 --- /dev/null +++ b/it/projects/multi-module/customization/deep-path-for-modules/modules/module2/src/Hello.xoo.measures @@ -0,0 +1 @@ +ncloc:2 diff --git a/it/projects/multi-module/customization/module-path-with-space/my module 1/src/Hello.js b/it/projects/multi-module/customization/module-path-with-space/my module 1/src/Hello.xoo similarity index 100% rename from it/projects/multi-module/customization/module-path-with-space/my module 1/src/Hello.js rename to it/projects/multi-module/customization/module-path-with-space/my module 1/src/Hello.xoo diff --git a/it/projects/multi-module/customization/module-path-with-space/my module 1/src/Hello.xoo.measures b/it/projects/multi-module/customization/module-path-with-space/my module 1/src/Hello.xoo.measures new file mode 100644 index 0000000..5143bc6 --- /dev/null +++ b/it/projects/multi-module/customization/module-path-with-space/my module 1/src/Hello.xoo.measures @@ -0,0 +1 @@ +ncloc:2 diff --git a/it/projects/multi-module/customization/module-path-with-space/my module 2/src/Hello.js b/it/projects/multi-module/customization/module-path-with-space/my module 2/src/Hello.xoo similarity index 100% rename from it/projects/multi-module/customization/module-path-with-space/my module 2/src/Hello.js rename to it/projects/multi-module/customization/module-path-with-space/my module 2/src/Hello.xoo diff --git a/it/projects/multi-module/customization/module-path-with-space/my module 2/src/Hello.xoo.measures b/it/projects/multi-module/customization/module-path-with-space/my module 2/src/Hello.xoo.measures new file mode 100644 index 0000000..5143bc6 --- /dev/null +++ b/it/projects/multi-module/customization/module-path-with-space/my module 2/src/Hello.xoo.measures @@ -0,0 +1 @@ +ncloc:2 diff --git a/it/projects/multi-module/customization/overwriting-parent-properties/module1/src1/Hello.js b/it/projects/multi-module/customization/overwriting-parent-properties/module1/src1/Hello.xoo similarity index 100% rename from it/projects/multi-module/customization/overwriting-parent-properties/module1/src1/Hello.js rename to it/projects/multi-module/customization/overwriting-parent-properties/module1/src1/Hello.xoo diff --git a/it/projects/multi-module/customization/overwriting-parent-properties/module1/src1/Hello.xoo.measures b/it/projects/multi-module/customization/overwriting-parent-properties/module1/src1/Hello.xoo.measures new file mode 100644 index 0000000..5143bc6 --- /dev/null +++ b/it/projects/multi-module/customization/overwriting-parent-properties/module1/src1/Hello.xoo.measures @@ -0,0 +1 @@ +ncloc:2 diff --git a/it/projects/multi-module/customization/overwriting-parent-properties/module2/src2/Hello.js b/it/projects/multi-module/customization/overwriting-parent-properties/module2/src2/Hello.xoo similarity index 100% rename from it/projects/multi-module/customization/overwriting-parent-properties/module2/src2/Hello.js rename to it/projects/multi-module/customization/overwriting-parent-properties/module2/src2/Hello.xoo diff --git a/it/projects/multi-module/customization/overwriting-parent-properties/module2/src2/Hello.xoo.measures b/it/projects/multi-module/customization/overwriting-parent-properties/module2/src2/Hello.xoo.measures new file mode 100644 index 0000000..5143bc6 --- /dev/null +++ b/it/projects/multi-module/customization/overwriting-parent-properties/module2/src2/Hello.xoo.measures @@ -0,0 +1 @@ +ncloc:2 diff --git a/it/projects/multi-module/failures/unexisting-base-dir/module1/src/Hello.js b/it/projects/multi-module/failures/unexisting-base-dir/module1/src/Hello.xoo similarity index 100% rename from it/projects/multi-module/failures/unexisting-base-dir/module1/src/Hello.js rename to it/projects/multi-module/failures/unexisting-base-dir/module1/src/Hello.xoo diff --git a/it/projects/multi-module/failures/unexisting-base-dir/module1/src/Hello.xoo.measures b/it/projects/multi-module/failures/unexisting-base-dir/module1/src/Hello.xoo.measures new file mode 100644 index 0000000..5143bc6 --- /dev/null +++ b/it/projects/multi-module/failures/unexisting-base-dir/module1/src/Hello.xoo.measures @@ -0,0 +1 @@ +ncloc:2 diff --git a/it/projects/multi-module/failures/unexisting-base-dir/module2/src/Hello.js b/it/projects/multi-module/failures/unexisting-base-dir/module2/src/Hello.xoo similarity index 100% rename from it/projects/multi-module/failures/unexisting-base-dir/module2/src/Hello.js rename to it/projects/multi-module/failures/unexisting-base-dir/module2/src/Hello.xoo diff --git a/it/projects/multi-module/failures/unexisting-base-dir/module2/src/Hello.xoo.measures b/it/projects/multi-module/failures/unexisting-base-dir/module2/src/Hello.xoo.measures new file mode 100644 index 0000000..5143bc6 --- /dev/null +++ b/it/projects/multi-module/failures/unexisting-base-dir/module2/src/Hello.xoo.measures @@ -0,0 +1 @@ +ncloc:2 diff --git a/it/projects/multi-module/failures/unexisting-config-file/module1/src/Hello.js b/it/projects/multi-module/failures/unexisting-config-file/module1/src/Hello.xoo similarity index 100% rename from it/projects/multi-module/failures/unexisting-config-file/module1/src/Hello.js rename to it/projects/multi-module/failures/unexisting-config-file/module1/src/Hello.xoo diff --git a/it/projects/multi-module/failures/unexisting-config-file/module1/src/Hello.xoo.measures b/it/projects/multi-module/failures/unexisting-config-file/module1/src/Hello.xoo.measures new file mode 100644 index 0000000..5143bc6 --- /dev/null +++ b/it/projects/multi-module/failures/unexisting-config-file/module1/src/Hello.xoo.measures @@ -0,0 +1 @@ +ncloc:2 diff --git a/it/projects/multi-module/failures/unexisting-config-file/module2/src/Hello.js b/it/projects/multi-module/failures/unexisting-config-file/module2/src/Hello.xoo similarity index 100% rename from it/projects/multi-module/failures/unexisting-config-file/module2/src/Hello.js rename to it/projects/multi-module/failures/unexisting-config-file/module2/src/Hello.xoo diff --git a/it/projects/multi-module/failures/unexisting-config-file/module2/src/Hello.xoo.measures b/it/projects/multi-module/failures/unexisting-config-file/module2/src/Hello.xoo.measures new file mode 100644 index 0000000..5143bc6 --- /dev/null +++ b/it/projects/multi-module/failures/unexisting-config-file/module2/src/Hello.xoo.measures @@ -0,0 +1 @@ +ncloc:2 diff --git a/it/projects/multi-module/simplest/simplest-with-props-on-each-module/module1/src/Hello.js b/it/projects/multi-module/simplest/simplest-with-props-on-each-module/module1/src/Hello.xoo similarity index 100% rename from it/projects/multi-module/simplest/simplest-with-props-on-each-module/module1/src/Hello.js rename to it/projects/multi-module/simplest/simplest-with-props-on-each-module/module1/src/Hello.xoo diff --git a/it/projects/multi-module/simplest/simplest-with-props-on-each-module/module1/src/Hello.xoo.measures b/it/projects/multi-module/simplest/simplest-with-props-on-each-module/module1/src/Hello.xoo.measures new file mode 100644 index 0000000..5143bc6 --- /dev/null +++ b/it/projects/multi-module/simplest/simplest-with-props-on-each-module/module1/src/Hello.xoo.measures @@ -0,0 +1 @@ +ncloc:2 diff --git a/it/projects/multi-module/simplest/simplest-with-props-on-each-module/module2/src/Hello.js b/it/projects/multi-module/simplest/simplest-with-props-on-each-module/module2/src/Hello.xoo similarity index 100% rename from it/projects/multi-module/simplest/simplest-with-props-on-each-module/module2/src/Hello.js rename to it/projects/multi-module/simplest/simplest-with-props-on-each-module/module2/src/Hello.xoo diff --git a/it/projects/multi-module/simplest/simplest-with-props-on-each-module/module2/src/Hello.xoo.measures b/it/projects/multi-module/simplest/simplest-with-props-on-each-module/module2/src/Hello.xoo.measures new file mode 100644 index 0000000..5143bc6 --- /dev/null +++ b/it/projects/multi-module/simplest/simplest-with-props-on-each-module/module2/src/Hello.xoo.measures @@ -0,0 +1 @@ +ncloc:2 diff --git a/it/projects/multi-module/simplest/simplest-with-props-on-root/module1/src/Hello.js b/it/projects/multi-module/simplest/simplest-with-props-on-root/module1/src/Hello.xoo similarity index 100% rename from it/projects/multi-module/simplest/simplest-with-props-on-root/module1/src/Hello.js rename to it/projects/multi-module/simplest/simplest-with-props-on-root/module1/src/Hello.xoo diff --git a/it/projects/multi-module/simplest/simplest-with-props-on-root/module1/src/Hello.xoo.measures b/it/projects/multi-module/simplest/simplest-with-props-on-root/module1/src/Hello.xoo.measures new file mode 100644 index 0000000..5143bc6 --- /dev/null +++ b/it/projects/multi-module/simplest/simplest-with-props-on-root/module1/src/Hello.xoo.measures @@ -0,0 +1 @@ +ncloc:2 diff --git a/it/projects/multi-module/simplest/simplest-with-props-on-root/module2/src/Hello.js b/it/projects/multi-module/simplest/simplest-with-props-on-root/module2/src/Hello.xoo similarity index 100% rename from it/projects/multi-module/simplest/simplest-with-props-on-root/module2/src/Hello.js rename to it/projects/multi-module/simplest/simplest-with-props-on-root/module2/src/Hello.xoo diff --git a/it/projects/multi-module/simplest/simplest-with-props-on-root/module2/src/Hello.xoo.measures b/it/projects/multi-module/simplest/simplest-with-props-on-root/module2/src/Hello.xoo.measures new file mode 100644 index 0000000..5143bc6 --- /dev/null +++ b/it/projects/multi-module/simplest/simplest-with-props-on-root/module2/src/Hello.xoo.measures @@ -0,0 +1 @@ +ncloc:2 diff --git a/it/projects/override-project-settings-path/src/basic/Hello.js b/it/projects/override-project-settings-path/src/basic/Hello.xoo similarity index 100% rename from it/projects/override-project-settings-path/src/basic/Hello.js rename to it/projects/override-project-settings-path/src/basic/Hello.xoo diff --git a/it/projects/override-project-settings-path/src/basic/Hello.xoo.measures b/it/projects/override-project-settings-path/src/basic/Hello.xoo.measures new file mode 100644 index 0000000..5143bc6 --- /dev/null +++ b/it/projects/override-project-settings-path/src/basic/Hello.xoo.measures @@ -0,0 +1 @@ +ncloc:2 diff --git a/it/projects/override-project-settings-path/src/basic/World.js b/it/projects/override-project-settings-path/src/basic/World.xoo similarity index 100% rename from it/projects/override-project-settings-path/src/basic/World.js rename to it/projects/override-project-settings-path/src/basic/World.xoo diff --git a/it/projects/override-project-settings-path/src/basic/World.xoo.measures b/it/projects/override-project-settings-path/src/basic/World.xoo.measures new file mode 100644 index 0000000..5143bc6 --- /dev/null +++ b/it/projects/override-project-settings-path/src/basic/World.xoo.measures @@ -0,0 +1 @@ +ncloc:2 diff --git a/it/projects/override-working-dir/src/Hello.js b/it/projects/override-working-dir/src/Hello.xoo similarity index 100% rename from it/projects/override-working-dir/src/Hello.js rename to it/projects/override-working-dir/src/Hello.xoo diff --git a/it/projects/override-working-dir/src/Hello.xoo.measures b/it/projects/override-working-dir/src/Hello.xoo.measures new file mode 100644 index 0000000..5143bc6 --- /dev/null +++ b/it/projects/override-working-dir/src/Hello.xoo.measures @@ -0,0 +1 @@ +ncloc:2 diff --git a/it/projects/simple-sample-no-properties/src/basic/Hello.js b/it/projects/simple-sample-no-properties/src/basic/Hello.xoo similarity index 100% rename from it/projects/simple-sample-no-properties/src/basic/Hello.js rename to it/projects/simple-sample-no-properties/src/basic/Hello.xoo diff --git a/it/projects/simple-sample-no-properties/src/basic/Hello.xoo.measures b/it/projects/simple-sample-no-properties/src/basic/Hello.xoo.measures new file mode 100644 index 0000000..5143bc6 --- /dev/null +++ b/it/projects/simple-sample-no-properties/src/basic/Hello.xoo.measures @@ -0,0 +1 @@ +ncloc:2 diff --git a/it/projects/simple-sample-no-properties/src/basic/World.js b/it/projects/simple-sample-no-properties/src/basic/World.xoo similarity index 100% rename from it/projects/simple-sample-no-properties/src/basic/World.js rename to it/projects/simple-sample-no-properties/src/basic/World.xoo diff --git a/it/projects/simple-sample-no-properties/src/basic/World.xoo.measures b/it/projects/simple-sample-no-properties/src/basic/World.xoo.measures new file mode 100644 index 0000000..5143bc6 --- /dev/null +++ b/it/projects/simple-sample-no-properties/src/basic/World.xoo.measures @@ -0,0 +1 @@ +ncloc:2 diff --git a/it/projects/simple-sample/src/basic/Hello.js b/it/projects/simple-sample/src/basic/Hello.xoo similarity index 100% rename from it/projects/simple-sample/src/basic/Hello.js rename to it/projects/simple-sample/src/basic/Hello.xoo diff --git a/it/projects/simple-sample/src/basic/Hello.xoo.measures b/it/projects/simple-sample/src/basic/Hello.xoo.measures new file mode 100644 index 0000000..5143bc6 --- /dev/null +++ b/it/projects/simple-sample/src/basic/Hello.xoo.measures @@ -0,0 +1 @@ +ncloc:2 diff --git a/it/projects/simple-sample/src/basic/World.js b/it/projects/simple-sample/src/basic/World.xoo similarity index 100% rename from it/projects/simple-sample/src/basic/World.js rename to it/projects/simple-sample/src/basic/World.xoo diff --git a/it/projects/simple-sample/src/basic/World.xoo.measures b/it/projects/simple-sample/src/basic/World.xoo.measures new file mode 100644 index 0000000..5143bc6 --- /dev/null +++ b/it/projects/simple-sample/src/basic/World.xoo.measures @@ -0,0 +1 @@ +ncloc:2 diff --git a/it/src/test/java/com/sonarsource/scanner/it/ScannerTest.java b/it/src/test/java/com/sonarsource/scanner/it/ScannerTest.java index abb7967..89e0d82 100644 --- a/it/src/test/java/com/sonarsource/scanner/it/ScannerTest.java +++ b/it/src/test/java/com/sonarsource/scanner/it/ScannerTest.java @@ -215,10 +215,10 @@ public class ScannerTest extends ScannerTestCase { assertThat(getComponent("sample").getDescription()) .isEqualTo("This is a sample"); Map projectMeasures = getMeasures("sample", "files", - "ncloc", "classes", "violations"); + "ncloc", "violations"); assertThat(projectMeasures.values().stream() .filter(measure -> measure.getValue() != null) - .collect(Collectors.toList())).hasSize(4); + .collect(Collectors.toList())).hasSize(3); } @Test diff --git a/it/src/test/java/com/sonarsource/scanner/it/SonarScannerTestSuite.java b/it/src/test/java/com/sonarsource/scanner/it/SonarScannerTestSuite.java index 232f43c..2ff3538 100644 --- a/it/src/test/java/com/sonarsource/scanner/it/SonarScannerTestSuite.java +++ b/it/src/test/java/com/sonarsource/scanner/it/SonarScannerTestSuite.java @@ -20,7 +20,6 @@ package com.sonarsource.scanner.it; import com.sonar.orchestrator.Orchestrator; -import com.sonar.orchestrator.OrchestratorBuilder; import com.sonar.orchestrator.locator.MavenLocation; import org.junit.ClassRule; import org.junit.runner.RunWith; @@ -38,23 +37,11 @@ public class SonarScannerTestSuite { private static Orchestrator createOrchestrator() { String sonarVersion = System .getProperty("sonar.runtimeVersion", "LATEST_RELEASE[7.9]"); - OrchestratorBuilder builder = Orchestrator.builderEnv() + return Orchestrator.builderEnv() .setSonarVersion( - sonarVersion); - // The javascript language plugin needs to be installed to allow for - // tests to pass. If not installed test fail with a "no languages - // installed" error. - MavenLocation javascriptPlugin = MavenLocation - .of("org.sonarsource.javascript", "sonar-javascript-plugin", - "5.2.1.7778"); - // Since version 8.5 languages are bundled and located in a different - // location then other plugins. So install this in the correct location. - if (sonarVersion.startsWith("LATEST_RELEASE[7.9]")) { - builder.addPlugin(javascriptPlugin); - } else { - builder.addBundledPlugin(javascriptPlugin); - } - return builder.build(); + sonarVersion).addPlugin(MavenLocation + .of("org.sonarsource.sonarqube", "sonar-xoo-plugin", + sonarVersion)).build(); } } -- 2.39.5