]> source.dussan.org Git - sonar-scanner-cli.git/commitdiff
SQSCANNER-44 - Move to Xoo for testing (#92)
authorMark Rekveld <mark.rekveld@sonarsource.com>
Tue, 29 Sep 2020 08:47:08 +0000 (10:47 +0200)
committerGitHub <noreply@github.com>
Tue, 29 Sep 2020 08:47:08 +0000 (10:47 +0200)
77 files changed:
it/projects/bad-source-dirs/src/Hello.js [deleted file]
it/projects/bad-source-dirs/src/Hello.xoo [new file with mode: 0644]
it/projects/bad-source-dirs/src/Hello.xoo.measures [new file with mode: 0644]
it/projects/basedir-with-source/Hello.js [deleted file]
it/projects/basedir-with-source/Hello.xoo [new file with mode: 0644]
it/projects/basedir-with-source/Hello.xoo.measures [new file with mode: 0644]
it/projects/multi-module/advanced/using-config-file-prop/module1/src/Hello.js [deleted file]
it/projects/multi-module/advanced/using-config-file-prop/module1/src/Hello.xoo [new file with mode: 0644]
it/projects/multi-module/advanced/using-config-file-prop/module1/src/Hello.xoo.measures [new file with mode: 0644]
it/projects/multi-module/advanced/using-config-file-prop/module2/src/Hello.js [deleted file]
it/projects/multi-module/advanced/using-config-file-prop/module2/src/Hello.xoo [new file with mode: 0644]
it/projects/multi-module/advanced/using-config-file-prop/module2/src/Hello.xoo.measures [new file with mode: 0644]
it/projects/multi-module/customization/deep-path-for-modules/modules/module1/src/Hello.js [deleted file]
it/projects/multi-module/customization/deep-path-for-modules/modules/module1/src/Hello.xoo [new file with mode: 0644]
it/projects/multi-module/customization/deep-path-for-modules/modules/module1/src/Hello.xoo.measures [new file with mode: 0644]
it/projects/multi-module/customization/deep-path-for-modules/modules/module2/src/Hello.js [deleted file]
it/projects/multi-module/customization/deep-path-for-modules/modules/module2/src/Hello.xoo [new file with mode: 0644]
it/projects/multi-module/customization/deep-path-for-modules/modules/module2/src/Hello.xoo.measures [new file with mode: 0644]
it/projects/multi-module/customization/module-path-with-space/my module 1/src/Hello.js [deleted file]
it/projects/multi-module/customization/module-path-with-space/my module 1/src/Hello.xoo [new file with mode: 0644]
it/projects/multi-module/customization/module-path-with-space/my module 1/src/Hello.xoo.measures [new file with mode: 0644]
it/projects/multi-module/customization/module-path-with-space/my module 2/src/Hello.js [deleted file]
it/projects/multi-module/customization/module-path-with-space/my module 2/src/Hello.xoo [new file with mode: 0644]
it/projects/multi-module/customization/module-path-with-space/my module 2/src/Hello.xoo.measures [new file with mode: 0644]
it/projects/multi-module/customization/overwriting-parent-properties/module1/src1/Hello.js [deleted file]
it/projects/multi-module/customization/overwriting-parent-properties/module1/src1/Hello.xoo [new file with mode: 0644]
it/projects/multi-module/customization/overwriting-parent-properties/module1/src1/Hello.xoo.measures [new file with mode: 0644]
it/projects/multi-module/customization/overwriting-parent-properties/module2/src2/Hello.js [deleted file]
it/projects/multi-module/customization/overwriting-parent-properties/module2/src2/Hello.xoo [new file with mode: 0644]
it/projects/multi-module/customization/overwriting-parent-properties/module2/src2/Hello.xoo.measures [new file with mode: 0644]
it/projects/multi-module/failures/unexisting-base-dir/module1/src/Hello.js [deleted file]
it/projects/multi-module/failures/unexisting-base-dir/module1/src/Hello.xoo [new file with mode: 0644]
it/projects/multi-module/failures/unexisting-base-dir/module1/src/Hello.xoo.measures [new file with mode: 0644]
it/projects/multi-module/failures/unexisting-base-dir/module2/src/Hello.js [deleted file]
it/projects/multi-module/failures/unexisting-base-dir/module2/src/Hello.xoo [new file with mode: 0644]
it/projects/multi-module/failures/unexisting-base-dir/module2/src/Hello.xoo.measures [new file with mode: 0644]
it/projects/multi-module/failures/unexisting-config-file/module1/src/Hello.js [deleted file]
it/projects/multi-module/failures/unexisting-config-file/module1/src/Hello.xoo [new file with mode: 0644]
it/projects/multi-module/failures/unexisting-config-file/module1/src/Hello.xoo.measures [new file with mode: 0644]
it/projects/multi-module/failures/unexisting-config-file/module2/src/Hello.js [deleted file]
it/projects/multi-module/failures/unexisting-config-file/module2/src/Hello.xoo [new file with mode: 0644]
it/projects/multi-module/failures/unexisting-config-file/module2/src/Hello.xoo.measures [new file with mode: 0644]
it/projects/multi-module/simplest/simplest-with-props-on-each-module/module1/src/Hello.js [deleted file]
it/projects/multi-module/simplest/simplest-with-props-on-each-module/module1/src/Hello.xoo [new file with mode: 0644]
it/projects/multi-module/simplest/simplest-with-props-on-each-module/module1/src/Hello.xoo.measures [new file with mode: 0644]
it/projects/multi-module/simplest/simplest-with-props-on-each-module/module2/src/Hello.js [deleted file]
it/projects/multi-module/simplest/simplest-with-props-on-each-module/module2/src/Hello.xoo [new file with mode: 0644]
it/projects/multi-module/simplest/simplest-with-props-on-each-module/module2/src/Hello.xoo.measures [new file with mode: 0644]
it/projects/multi-module/simplest/simplest-with-props-on-root/module1/src/Hello.js [deleted file]
it/projects/multi-module/simplest/simplest-with-props-on-root/module1/src/Hello.xoo [new file with mode: 0644]
it/projects/multi-module/simplest/simplest-with-props-on-root/module1/src/Hello.xoo.measures [new file with mode: 0644]
it/projects/multi-module/simplest/simplest-with-props-on-root/module2/src/Hello.js [deleted file]
it/projects/multi-module/simplest/simplest-with-props-on-root/module2/src/Hello.xoo [new file with mode: 0644]
it/projects/multi-module/simplest/simplest-with-props-on-root/module2/src/Hello.xoo.measures [new file with mode: 0644]
it/projects/override-project-settings-path/src/basic/Hello.js [deleted file]
it/projects/override-project-settings-path/src/basic/Hello.xoo [new file with mode: 0644]
it/projects/override-project-settings-path/src/basic/Hello.xoo.measures [new file with mode: 0644]
it/projects/override-project-settings-path/src/basic/World.js [deleted file]
it/projects/override-project-settings-path/src/basic/World.xoo [new file with mode: 0644]
it/projects/override-project-settings-path/src/basic/World.xoo.measures [new file with mode: 0644]
it/projects/override-working-dir/src/Hello.js [deleted file]
it/projects/override-working-dir/src/Hello.xoo [new file with mode: 0644]
it/projects/override-working-dir/src/Hello.xoo.measures [new file with mode: 0644]
it/projects/simple-sample-no-properties/src/basic/Hello.js [deleted file]
it/projects/simple-sample-no-properties/src/basic/Hello.xoo [new file with mode: 0644]
it/projects/simple-sample-no-properties/src/basic/Hello.xoo.measures [new file with mode: 0644]
it/projects/simple-sample-no-properties/src/basic/World.js [deleted file]
it/projects/simple-sample-no-properties/src/basic/World.xoo [new file with mode: 0644]
it/projects/simple-sample-no-properties/src/basic/World.xoo.measures [new file with mode: 0644]
it/projects/simple-sample/src/basic/Hello.js [deleted file]
it/projects/simple-sample/src/basic/Hello.xoo [new file with mode: 0644]
it/projects/simple-sample/src/basic/Hello.xoo.measures [new file with mode: 0644]
it/projects/simple-sample/src/basic/World.js [deleted file]
it/projects/simple-sample/src/basic/World.xoo [new file with mode: 0644]
it/projects/simple-sample/src/basic/World.xoo.measures [new file with mode: 0644]
it/src/test/java/com/sonarsource/scanner/it/ScannerTest.java
it/src/test/java/com/sonarsource/scanner/it/SonarScannerTestSuite.java

diff --git a/it/projects/bad-source-dirs/src/Hello.js b/it/projects/bad-source-dirs/src/Hello.js
deleted file mode 100644 (file)
index fd35455..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-function hello() {
-}
diff --git a/it/projects/bad-source-dirs/src/Hello.xoo b/it/projects/bad-source-dirs/src/Hello.xoo
new file mode 100644 (file)
index 0000000..fd35455
--- /dev/null
@@ -0,0 +1,2 @@
+function hello() {
+}
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 (file)
index 0000000..5143bc6
--- /dev/null
@@ -0,0 +1 @@
+ncloc:2
diff --git a/it/projects/basedir-with-source/Hello.js b/it/projects/basedir-with-source/Hello.js
deleted file mode 100644 (file)
index dffa936..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-function hello() {
-    let i=356;
-    if (true) i=5658;
-}
diff --git a/it/projects/basedir-with-source/Hello.xoo b/it/projects/basedir-with-source/Hello.xoo
new file mode 100644 (file)
index 0000000..dffa936
--- /dev/null
@@ -0,0 +1,4 @@
+function hello() {
+    let i=356;
+    if (true) i=5658;
+}
diff --git a/it/projects/basedir-with-source/Hello.xoo.measures b/it/projects/basedir-with-source/Hello.xoo.measures
new file mode 100644 (file)
index 0000000..1738af9
--- /dev/null
@@ -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.js
deleted file mode 100644 (file)
index fd35455..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-function hello() {
-}
diff --git a/it/projects/multi-module/advanced/using-config-file-prop/module1/src/Hello.xoo b/it/projects/multi-module/advanced/using-config-file-prop/module1/src/Hello.xoo
new file mode 100644 (file)
index 0000000..fd35455
--- /dev/null
@@ -0,0 +1,2 @@
+function hello() {
+}
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 (file)
index 0000000..5143bc6
--- /dev/null
@@ -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.js
deleted file mode 100644 (file)
index fd35455..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-function hello() {
-}
diff --git a/it/projects/multi-module/advanced/using-config-file-prop/module2/src/Hello.xoo b/it/projects/multi-module/advanced/using-config-file-prop/module2/src/Hello.xoo
new file mode 100644 (file)
index 0000000..fd35455
--- /dev/null
@@ -0,0 +1,2 @@
+function hello() {
+}
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 (file)
index 0000000..5143bc6
--- /dev/null
@@ -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.js
deleted file mode 100644 (file)
index fd35455..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-function hello() {
-}
diff --git a/it/projects/multi-module/customization/deep-path-for-modules/modules/module1/src/Hello.xoo b/it/projects/multi-module/customization/deep-path-for-modules/modules/module1/src/Hello.xoo
new file mode 100644 (file)
index 0000000..fd35455
--- /dev/null
@@ -0,0 +1,2 @@
+function hello() {
+}
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 (file)
index 0000000..5143bc6
--- /dev/null
@@ -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.js
deleted file mode 100644 (file)
index fd35455..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-function hello() {
-}
diff --git a/it/projects/multi-module/customization/deep-path-for-modules/modules/module2/src/Hello.xoo b/it/projects/multi-module/customization/deep-path-for-modules/modules/module2/src/Hello.xoo
new file mode 100644 (file)
index 0000000..fd35455
--- /dev/null
@@ -0,0 +1,2 @@
+function hello() {
+}
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 (file)
index 0000000..5143bc6
--- /dev/null
@@ -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.js
deleted file mode 100644 (file)
index fd35455..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-function hello() {
-}
diff --git a/it/projects/multi-module/customization/module-path-with-space/my module 1/src/Hello.xoo b/it/projects/multi-module/customization/module-path-with-space/my module 1/src/Hello.xoo
new file mode 100644 (file)
index 0000000..fd35455
--- /dev/null
@@ -0,0 +1,2 @@
+function hello() {
+}
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 (file)
index 0000000..5143bc6
--- /dev/null
@@ -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.js
deleted file mode 100644 (file)
index fd35455..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-function hello() {
-}
diff --git a/it/projects/multi-module/customization/module-path-with-space/my module 2/src/Hello.xoo b/it/projects/multi-module/customization/module-path-with-space/my module 2/src/Hello.xoo
new file mode 100644 (file)
index 0000000..fd35455
--- /dev/null
@@ -0,0 +1,2 @@
+function hello() {
+}
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 (file)
index 0000000..5143bc6
--- /dev/null
@@ -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.js
deleted file mode 100644 (file)
index fd35455..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-function hello() {
-}
diff --git a/it/projects/multi-module/customization/overwriting-parent-properties/module1/src1/Hello.xoo b/it/projects/multi-module/customization/overwriting-parent-properties/module1/src1/Hello.xoo
new file mode 100644 (file)
index 0000000..fd35455
--- /dev/null
@@ -0,0 +1,2 @@
+function hello() {
+}
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 (file)
index 0000000..5143bc6
--- /dev/null
@@ -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.js
deleted file mode 100644 (file)
index fd35455..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-function hello() {
-}
diff --git a/it/projects/multi-module/customization/overwriting-parent-properties/module2/src2/Hello.xoo b/it/projects/multi-module/customization/overwriting-parent-properties/module2/src2/Hello.xoo
new file mode 100644 (file)
index 0000000..fd35455
--- /dev/null
@@ -0,0 +1,2 @@
+function hello() {
+}
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 (file)
index 0000000..5143bc6
--- /dev/null
@@ -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.js
deleted file mode 100644 (file)
index fd35455..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-function hello() {
-}
diff --git a/it/projects/multi-module/failures/unexisting-base-dir/module1/src/Hello.xoo b/it/projects/multi-module/failures/unexisting-base-dir/module1/src/Hello.xoo
new file mode 100644 (file)
index 0000000..fd35455
--- /dev/null
@@ -0,0 +1,2 @@
+function hello() {
+}
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 (file)
index 0000000..5143bc6
--- /dev/null
@@ -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.js
deleted file mode 100644 (file)
index fd35455..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-function hello() {
-}
diff --git a/it/projects/multi-module/failures/unexisting-base-dir/module2/src/Hello.xoo b/it/projects/multi-module/failures/unexisting-base-dir/module2/src/Hello.xoo
new file mode 100644 (file)
index 0000000..fd35455
--- /dev/null
@@ -0,0 +1,2 @@
+function hello() {
+}
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 (file)
index 0000000..5143bc6
--- /dev/null
@@ -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.js
deleted file mode 100644 (file)
index fd35455..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-function hello() {
-}
diff --git a/it/projects/multi-module/failures/unexisting-config-file/module1/src/Hello.xoo b/it/projects/multi-module/failures/unexisting-config-file/module1/src/Hello.xoo
new file mode 100644 (file)
index 0000000..fd35455
--- /dev/null
@@ -0,0 +1,2 @@
+function hello() {
+}
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 (file)
index 0000000..5143bc6
--- /dev/null
@@ -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.js
deleted file mode 100644 (file)
index fd35455..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-function hello() {
-}
diff --git a/it/projects/multi-module/failures/unexisting-config-file/module2/src/Hello.xoo b/it/projects/multi-module/failures/unexisting-config-file/module2/src/Hello.xoo
new file mode 100644 (file)
index 0000000..fd35455
--- /dev/null
@@ -0,0 +1,2 @@
+function hello() {
+}
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 (file)
index 0000000..5143bc6
--- /dev/null
@@ -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.js
deleted file mode 100644 (file)
index fd35455..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-function hello() {
-}
diff --git a/it/projects/multi-module/simplest/simplest-with-props-on-each-module/module1/src/Hello.xoo b/it/projects/multi-module/simplest/simplest-with-props-on-each-module/module1/src/Hello.xoo
new file mode 100644 (file)
index 0000000..fd35455
--- /dev/null
@@ -0,0 +1,2 @@
+function hello() {
+}
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 (file)
index 0000000..5143bc6
--- /dev/null
@@ -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.js
deleted file mode 100644 (file)
index fd35455..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-function hello() {
-}
diff --git a/it/projects/multi-module/simplest/simplest-with-props-on-each-module/module2/src/Hello.xoo b/it/projects/multi-module/simplest/simplest-with-props-on-each-module/module2/src/Hello.xoo
new file mode 100644 (file)
index 0000000..fd35455
--- /dev/null
@@ -0,0 +1,2 @@
+function hello() {
+}
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 (file)
index 0000000..5143bc6
--- /dev/null
@@ -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.js
deleted file mode 100644 (file)
index fd35455..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-function hello() {
-}
diff --git a/it/projects/multi-module/simplest/simplest-with-props-on-root/module1/src/Hello.xoo b/it/projects/multi-module/simplest/simplest-with-props-on-root/module1/src/Hello.xoo
new file mode 100644 (file)
index 0000000..fd35455
--- /dev/null
@@ -0,0 +1,2 @@
+function hello() {
+}
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 (file)
index 0000000..5143bc6
--- /dev/null
@@ -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.js
deleted file mode 100644 (file)
index fd35455..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-function hello() {
-}
diff --git a/it/projects/multi-module/simplest/simplest-with-props-on-root/module2/src/Hello.xoo b/it/projects/multi-module/simplest/simplest-with-props-on-root/module2/src/Hello.xoo
new file mode 100644 (file)
index 0000000..fd35455
--- /dev/null
@@ -0,0 +1,2 @@
+function hello() {
+}
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 (file)
index 0000000..5143bc6
--- /dev/null
@@ -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.js
deleted file mode 100644 (file)
index fd35455..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-function hello() {
-}
diff --git a/it/projects/override-project-settings-path/src/basic/Hello.xoo b/it/projects/override-project-settings-path/src/basic/Hello.xoo
new file mode 100644 (file)
index 0000000..fd35455
--- /dev/null
@@ -0,0 +1,2 @@
+function hello() {
+}
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 (file)
index 0000000..5143bc6
--- /dev/null
@@ -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.js
deleted file mode 100644 (file)
index 1ea849a..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-function world() {
-}
diff --git a/it/projects/override-project-settings-path/src/basic/World.xoo b/it/projects/override-project-settings-path/src/basic/World.xoo
new file mode 100644 (file)
index 0000000..1ea849a
--- /dev/null
@@ -0,0 +1,2 @@
+function world() {
+}
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 (file)
index 0000000..5143bc6
--- /dev/null
@@ -0,0 +1 @@
+ncloc:2
diff --git a/it/projects/override-working-dir/src/Hello.js b/it/projects/override-working-dir/src/Hello.js
deleted file mode 100644 (file)
index fd35455..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-function hello() {
-}
diff --git a/it/projects/override-working-dir/src/Hello.xoo b/it/projects/override-working-dir/src/Hello.xoo
new file mode 100644 (file)
index 0000000..fd35455
--- /dev/null
@@ -0,0 +1,2 @@
+function hello() {
+}
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 (file)
index 0000000..5143bc6
--- /dev/null
@@ -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.js
deleted file mode 100644 (file)
index fd35455..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-function hello() {
-}
diff --git a/it/projects/simple-sample-no-properties/src/basic/Hello.xoo b/it/projects/simple-sample-no-properties/src/basic/Hello.xoo
new file mode 100644 (file)
index 0000000..fd35455
--- /dev/null
@@ -0,0 +1,2 @@
+function hello() {
+}
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 (file)
index 0000000..5143bc6
--- /dev/null
@@ -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.js
deleted file mode 100644 (file)
index 1ea849a..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-function world() {
-}
diff --git a/it/projects/simple-sample-no-properties/src/basic/World.xoo b/it/projects/simple-sample-no-properties/src/basic/World.xoo
new file mode 100644 (file)
index 0000000..1ea849a
--- /dev/null
@@ -0,0 +1,2 @@
+function world() {
+}
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 (file)
index 0000000..5143bc6
--- /dev/null
@@ -0,0 +1 @@
+ncloc:2
diff --git a/it/projects/simple-sample/src/basic/Hello.js b/it/projects/simple-sample/src/basic/Hello.js
deleted file mode 100644 (file)
index fd35455..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-function hello() {
-}
diff --git a/it/projects/simple-sample/src/basic/Hello.xoo b/it/projects/simple-sample/src/basic/Hello.xoo
new file mode 100644 (file)
index 0000000..fd35455
--- /dev/null
@@ -0,0 +1,2 @@
+function hello() {
+}
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 (file)
index 0000000..5143bc6
--- /dev/null
@@ -0,0 +1 @@
+ncloc:2
diff --git a/it/projects/simple-sample/src/basic/World.js b/it/projects/simple-sample/src/basic/World.js
deleted file mode 100644 (file)
index 1ea849a..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-function world() {
-}
diff --git a/it/projects/simple-sample/src/basic/World.xoo b/it/projects/simple-sample/src/basic/World.xoo
new file mode 100644 (file)
index 0000000..1ea849a
--- /dev/null
@@ -0,0 +1,2 @@
+function world() {
+}
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 (file)
index 0000000..5143bc6
--- /dev/null
@@ -0,0 +1 @@
+ncloc:2
index abb79675fcb306d4bbf9f205cf4158810d411c8e..89e0d8206b22c096988b7c55a30c47b53bbd152e 100644 (file)
@@ -215,10 +215,10 @@ public class ScannerTest extends ScannerTestCase {
     assertThat(getComponent("sample").getDescription())
       .isEqualTo("This is a sample");
     Map<String, Measure> 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
index 232f43cfe0cb8f07014624ceb232c91c483f7463..2ff3538baa7cd2c316aaf13189b42190eef28f1e 100644 (file)
@@ -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();
   }
 
 }