diff options
24 files changed, 3 insertions, 159 deletions
diff --git a/it/it-projects/measure/xoo-multi-modules-sample/module_a/module_a1/sonar-project.properties b/it/it-projects/measure/xoo-multi-modules-sample/module_a/module_a1/sonar-project.properties deleted file mode 100644 index a081a0e6342..00000000000 --- a/it/it-projects/measure/xoo-multi-modules-sample/module_a/module_a1/sonar-project.properties +++ /dev/null @@ -1 +0,0 @@ -sonar.projectName=Sub-module A1 diff --git a/it/it-projects/measure/xoo-multi-modules-sample/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo b/it/it-projects/measure/xoo-multi-modules-sample/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo deleted file mode 100644 index 74d29a4fa08..00000000000 --- a/it/it-projects/measure/xoo-multi-modules-sample/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo +++ /dev/null @@ -1,16 +0,0 @@ -package com.sonar.it.samples.modules.a1; - -public class HelloA1 { - private int i; - private HelloA1() { - - } - - public void hello() { - System.out.println("hello" + " xoo"); - } - - protected String getHello() { - return "hello"; - } -}
\ No newline at end of file diff --git a/it/it-projects/measure/xoo-multi-modules-sample/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo.measures b/it/it-projects/measure/xoo-multi-modules-sample/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo.measures deleted file mode 100644 index 7812e4167fb..00000000000 --- a/it/it-projects/measure/xoo-multi-modules-sample/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo.measures +++ /dev/null @@ -1,2 +0,0 @@ -ncloc:12 -classes:1 diff --git a/it/it-projects/measure/xoo-multi-modules-sample/module_a/module_a2/sonar-project.properties b/it/it-projects/measure/xoo-multi-modules-sample/module_a/module_a2/sonar-project.properties deleted file mode 100644 index fcedab83843..00000000000 --- a/it/it-projects/measure/xoo-multi-modules-sample/module_a/module_a2/sonar-project.properties +++ /dev/null @@ -1 +0,0 @@ -sonar.projectName=Sub-module A2 diff --git a/it/it-projects/measure/xoo-multi-modules-sample/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo b/it/it-projects/measure/xoo-multi-modules-sample/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo deleted file mode 100644 index 796d90cfad5..00000000000 --- a/it/it-projects/measure/xoo-multi-modules-sample/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo +++ /dev/null @@ -1,20 +0,0 @@ -package com.sonar.it.samples.modules.a2; - -public class HelloA2 { - - public HelloA2(int i) { - int j = i++; - } - - public void hello() { - System.out.println("hello" + " xoo"); - } - - private String myMethod() { - if (foo == bar) { - return "hello"; - } else { - throw new IllegalStateException(); - } - } -} diff --git a/it/it-projects/measure/xoo-multi-modules-sample/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo.measures b/it/it-projects/measure/xoo-multi-modules-sample/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo.measures deleted file mode 100644 index 63df5add6d4..00000000000 --- a/it/it-projects/measure/xoo-multi-modules-sample/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo.measures +++ /dev/null @@ -1,2 +0,0 @@ -ncloc:15 -classes:1 diff --git a/it/it-projects/measure/xoo-multi-modules-sample/module_a/sonar-project.properties b/it/it-projects/measure/xoo-multi-modules-sample/module_a/sonar-project.properties deleted file mode 100644 index 7e6ca9074a4..00000000000 --- a/it/it-projects/measure/xoo-multi-modules-sample/module_a/sonar-project.properties +++ /dev/null @@ -1,4 +0,0 @@ -sonar.projectKey=module_a -sonar.projectName=Module A - -sonar.modules=module_a1,module_a2 diff --git a/it/it-projects/measure/xoo-multi-modules-sample/module_b/module_b1/sonar-project.properties b/it/it-projects/measure/xoo-multi-modules-sample/module_b/module_b1/sonar-project.properties deleted file mode 100644 index ca8404b7bd4..00000000000 --- a/it/it-projects/measure/xoo-multi-modules-sample/module_b/module_b1/sonar-project.properties +++ /dev/null @@ -1 +0,0 @@ -sonar.projectName=Sub-module B1 diff --git a/it/it-projects/measure/xoo-multi-modules-sample/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo b/it/it-projects/measure/xoo-multi-modules-sample/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo deleted file mode 100644 index b83c3af128c..00000000000 --- a/it/it-projects/measure/xoo-multi-modules-sample/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo +++ /dev/null @@ -1,12 +0,0 @@ -package com.sonar.it.samples.modules.b1; - -public class HelloB1 { - private int i; - private HelloB1() { - - } - - public void hello() { - System.out.println("hello" + " world"); - } -}
\ No newline at end of file diff --git a/it/it-projects/measure/xoo-multi-modules-sample/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo.measures b/it/it-projects/measure/xoo-multi-modules-sample/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo.measures deleted file mode 100644 index 3947d3bdbff..00000000000 --- a/it/it-projects/measure/xoo-multi-modules-sample/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo.measures +++ /dev/null @@ -1,2 +0,0 @@ -ncloc:12 -classes:1
\ No newline at end of file diff --git a/it/it-projects/measure/xoo-multi-modules-sample/module_b/module_b2/sonar-project.properties b/it/it-projects/measure/xoo-multi-modules-sample/module_b/module_b2/sonar-project.properties deleted file mode 100644 index e597dab4f33..00000000000 --- a/it/it-projects/measure/xoo-multi-modules-sample/module_b/module_b2/sonar-project.properties +++ /dev/null @@ -1 +0,0 @@ -sonar.projectName=Sub-module B2 diff --git a/it/it-projects/measure/xoo-multi-modules-sample/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo b/it/it-projects/measure/xoo-multi-modules-sample/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo deleted file mode 100644 index 20b8bb3876a..00000000000 --- a/it/it-projects/measure/xoo-multi-modules-sample/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo +++ /dev/null @@ -1,12 +0,0 @@ -package com.sonar.it.samples.modules.b2; - -public class HelloB2 { - private int i; - private HelloB2() { - - } - - public void hello() { - System.out.println("hello" + " world"); - } -}
\ No newline at end of file diff --git a/it/it-projects/measure/xoo-multi-modules-sample/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo.measures b/it/it-projects/measure/xoo-multi-modules-sample/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo.measures deleted file mode 100644 index 3947d3bdbff..00000000000 --- a/it/it-projects/measure/xoo-multi-modules-sample/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo.measures +++ /dev/null @@ -1,2 +0,0 @@ -ncloc:12 -classes:1
\ No newline at end of file diff --git a/it/it-projects/measure/xoo-multi-modules-sample/module_b/sonar-project.properties b/it/it-projects/measure/xoo-multi-modules-sample/module_b/sonar-project.properties deleted file mode 100644 index 21d69f769d3..00000000000 --- a/it/it-projects/measure/xoo-multi-modules-sample/module_b/sonar-project.properties +++ /dev/null @@ -1,4 +0,0 @@ -sonar.projectKey=module_b -sonar.projectName=Module B - -sonar.modules=module_b1,module_b2 diff --git a/it/it-projects/measure/xoo-multi-modules-sample/sonar-project.properties b/it/it-projects/measure/xoo-multi-modules-sample/sonar-project.properties deleted file mode 100644 index 7935cb5ffb0..00000000000 --- a/it/it-projects/measure/xoo-multi-modules-sample/sonar-project.properties +++ /dev/null @@ -1,12 +0,0 @@ -# Root project information -sonar.projectKey=com.sonarsource.it.samples:multi-modules-sample -sonar.projectName=Sonar :: Integration Tests :: Multi-modules Sample -sonar.projectVersion=1.0-SNAPSHOT - -sonar.language=xoo - -# Some properties that will be inherited by the modules -sonar.sources=src/main/xoo - -# List of the module identifiers -sonar.modules=module_a,module_b diff --git a/it/it-projects/measure/xoo-sample/sonar-project.properties b/it/it-projects/measure/xoo-sample/sonar-project.properties deleted file mode 100644 index 9e4aa0e3584..00000000000 --- a/it/it-projects/measure/xoo-sample/sonar-project.properties +++ /dev/null @@ -1,5 +0,0 @@ -sonar.projectKey=sample -sonar.projectName=Sample -sonar.projectVersion=1.0-SNAPSHOT -sonar.sources=src/main/xoo -sonar.language=xoo diff --git a/it/it-projects/measure/xoo-sample/src/main/xoo/sample/Sample.xoo b/it/it-projects/measure/xoo-sample/src/main/xoo/sample/Sample.xoo deleted file mode 100644 index 41871e123a3..00000000000 --- a/it/it-projects/measure/xoo-sample/src/main/xoo/sample/Sample.xoo +++ /dev/null @@ -1,16 +0,0 @@ -package sample; - -public class Sample { - - public Sample(int i) { - int j = i++; - } - - private String myMethod() { - if (foo == bar) { - return "hello"; - } else { - throw new IllegalStateException(); - } - } -} diff --git a/it/it-projects/measure/xoo-sample/src/main/xoo/sample/Sample.xoo.measures b/it/it-projects/measure/xoo-sample/src/main/xoo/sample/Sample.xoo.measures deleted file mode 100644 index 3f73ea8f695..00000000000 --- a/it/it-projects/measure/xoo-sample/src/main/xoo/sample/Sample.xoo.measures +++ /dev/null @@ -1,11 +0,0 @@ -ncloc:13 -#Used by dashboard/widgets tests -complexity:3 -complexity_in_classes:3 -classes:1 -comment_lines:3 -public_api:5 -public_undocumented_api:2 -duplicated_files:1 -duplicated_blocks:2 -duplicated_lines:3 diff --git a/it/it-projects/ui/xoo-sample/sonar-project.properties b/it/it-projects/ui/xoo-sample/sonar-project.properties deleted file mode 100644 index 9e4aa0e3584..00000000000 --- a/it/it-projects/ui/xoo-sample/sonar-project.properties +++ /dev/null @@ -1,5 +0,0 @@ -sonar.projectKey=sample -sonar.projectName=Sample -sonar.projectVersion=1.0-SNAPSHOT -sonar.sources=src/main/xoo -sonar.language=xoo diff --git a/it/it-projects/ui/xoo-sample/src/main/xoo/sample/Sample.xoo b/it/it-projects/ui/xoo-sample/src/main/xoo/sample/Sample.xoo deleted file mode 100644 index 41871e123a3..00000000000 --- a/it/it-projects/ui/xoo-sample/src/main/xoo/sample/Sample.xoo +++ /dev/null @@ -1,16 +0,0 @@ -package sample; - -public class Sample { - - public Sample(int i) { - int j = i++; - } - - private String myMethod() { - if (foo == bar) { - return "hello"; - } else { - throw new IllegalStateException(); - } - } -} diff --git a/it/it-projects/ui/xoo-sample/src/main/xoo/sample/Sample.xoo.measures b/it/it-projects/ui/xoo-sample/src/main/xoo/sample/Sample.xoo.measures deleted file mode 100644 index 3f73ea8f695..00000000000 --- a/it/it-projects/ui/xoo-sample/src/main/xoo/sample/Sample.xoo.measures +++ /dev/null @@ -1,11 +0,0 @@ -ncloc:13 -#Used by dashboard/widgets tests -complexity:3 -complexity_in_classes:3 -classes:1 -comment_lines:3 -public_api:5 -public_undocumented_api:2 -duplicated_files:1 -duplicated_blocks:2 -duplicated_lines:3 diff --git a/it/it-tests/src/test/java/analysis/suite/measure/CustomMeasuresTest.java b/it/it-tests/src/test/java/analysis/suite/measure/CustomMeasuresTest.java index b4dda45aad0..32fdc51c8b9 100644 --- a/it/it-tests/src/test/java/analysis/suite/measure/CustomMeasuresTest.java +++ b/it/it-tests/src/test/java/analysis/suite/measure/CustomMeasuresTest.java @@ -84,7 +84,7 @@ public class CustomMeasuresTest { } private void analyzeProject() { - orchestrator.executeBuild(SonarRunner.create(projectDir("measure/xoo-sample"))); + orchestrator.executeBuild(SonarRunner.create(projectDir("shared/xoo-sample"))); } private void setTeamSize(int i) { diff --git a/it/it-tests/src/test/java/analysis/suite/measure/MeasureFiltersTest.java b/it/it-tests/src/test/java/analysis/suite/measure/MeasureFiltersTest.java index c43f7e589e7..bae341a805a 100644 --- a/it/it-tests/src/test/java/analysis/suite/measure/MeasureFiltersTest.java +++ b/it/it-tests/src/test/java/analysis/suite/measure/MeasureFiltersTest.java @@ -41,7 +41,7 @@ public class MeasureFiltersTest { @BeforeClass public static void scanStruts() { orchestrator.resetData(); - orchestrator.executeBuild(SonarRunner.create(projectDir("measure/xoo-multi-modules-sample"))); + orchestrator.executeBuild(SonarRunner.create(projectDir("shared/xoo-multi-modules-sample"))); createUser("user-measure-filters", "User Measure Filters"); } diff --git a/it/it-tests/src/test/java/ui/I18nTest.java b/it/it-tests/src/test/java/ui/I18nTest.java index f61527f87a5..4168365bd8a 100644 --- a/it/it-tests/src/test/java/ui/I18nTest.java +++ b/it/it-tests/src/test/java/ui/I18nTest.java @@ -49,7 +49,7 @@ public class I18nTest { */ @Test public void test_localization() { - orchestrator.executeBuild(SonarRunner.create(projectDir("ui/xoo-sample"))); + orchestrator.executeBuild(SonarRunner.create(projectDir("shared/xoo-sample"))); Selenese selenese = Selenese.builder().setHtmlTestsInClasspath("ui-i18n", "/ui/i18n/default-locale-is-english.html", |