Skip to content

Commit 0b0c91f

Browse files
mickael-caro-sonarsourceduncanp-sonar
mickael-caro-sonarsource
authored and
duncanp-sonar
committed
Added test suite to avoid creation of orchestrator in each test class. (#786)
* Added test suite to avoid creation of orchestrator in each test class.
1 parent b04ea88 commit 0b0c91f

File tree

10 files changed

+339
-285
lines changed

10 files changed

+339
-285
lines changed

‎its/pom.xml‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<inceptionYear>2016</inceptionYear>
1919

2020
<properties>
21-
<jetty.version>9.3.11.v20160721</jetty.version>
21+
<jetty.version>9.4.20.v20190813</jetty.version>
2222
</properties>
2323

2424
<dependencies>
@@ -70,6 +70,21 @@
7070
</dependency>
7171
</dependencies>
7272

73+
<build>
74+
<plugins>
75+
<plugin>
76+
<groupId>org.apache.maven.plugins</groupId>
77+
<artifactId>maven-surefire-plugin</artifactId>
78+
<configuration>
79+
<trimStackTrace>false</trimStackTrace>
80+
<includes>
81+
<include>**/SonarScannerTestSuite.java</include>
82+
</includes>
83+
</configuration>
84+
</plugin>
85+
</plugins>
86+
</build>
87+
7388
<profiles>
7489
<profile>
7590
<id>download-scanner-artifacts</id>

‎its/projects/CppSharedFiles/Project1/Project1.vcxproj‎

Lines changed: 58 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -25,32 +25,64 @@
2525
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
2626
</PropertyGroup>
2727
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
28-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
29-
<ConfigurationType>Application</ConfigurationType>
30-
<UseDebugLibraries>true</UseDebugLibraries>
31-
<PlatformToolset>v140</PlatformToolset>
32-
<CharacterSet>Unicode</CharacterSet>
33-
</PropertyGroup>
34-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
35-
<ConfigurationType>Application</ConfigurationType>
36-
<UseDebugLibraries>false</UseDebugLibraries>
37-
<PlatformToolset>v140</PlatformToolset>
38-
<WholeProgramOptimization>true</WholeProgramOptimization>
39-
<CharacterSet>Unicode</CharacterSet>
40-
</PropertyGroup>
41-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
42-
<ConfigurationType>Application</ConfigurationType>
43-
<UseDebugLibraries>true</UseDebugLibraries>
44-
<PlatformToolset>v140</PlatformToolset>
45-
<CharacterSet>Unicode</CharacterSet>
46-
</PropertyGroup>
47-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
48-
<ConfigurationType>Application</ConfigurationType>
49-
<UseDebugLibraries>false</UseDebugLibraries>
50-
<PlatformToolset>v140</PlatformToolset>
51-
<WholeProgramOptimization>true</WholeProgramOptimization>
52-
<CharacterSet>Unicode</CharacterSet>
53-
</PropertyGroup>
28+
<Choose>
29+
<When Condition="'$(MSBuildToolsVersion)'=='14.0'">
30+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
31+
<ConfigurationType>Application</ConfigurationType>
32+
<UseDebugLibraries>true</UseDebugLibraries>
33+
<PlatformToolset>v140</PlatformToolset>
34+
<CharacterSet>Unicode</CharacterSet>
35+
</PropertyGroup>
36+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
37+
<ConfigurationType>Application</ConfigurationType>
38+
<UseDebugLibraries>false</UseDebugLibraries>
39+
<PlatformToolset>v140</PlatformToolset>
40+
<WholeProgramOptimization>true</WholeProgramOptimization>
41+
<CharacterSet>Unicode</CharacterSet>
42+
</PropertyGroup>
43+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
44+
<ConfigurationType>Application</ConfigurationType>
45+
<UseDebugLibraries>true</UseDebugLibraries>
46+
<PlatformToolset>v140</PlatformToolset>
47+
<CharacterSet>Unicode</CharacterSet>
48+
</PropertyGroup>
49+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
50+
<ConfigurationType>Application</ConfigurationType>
51+
<UseDebugLibraries>false</UseDebugLibraries>
52+
<PlatformToolset>v140</PlatformToolset>
53+
<WholeProgramOptimization>true</WholeProgramOptimization>
54+
<CharacterSet>Unicode</CharacterSet>
55+
</PropertyGroup>
56+
</When>
57+
<When Condition="'$(MSBuildToolsVersion)'=='15.0'">
58+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
59+
<ConfigurationType>Application</ConfigurationType>
60+
<UseDebugLibraries>true</UseDebugLibraries>
61+
<PlatformToolset>v141</PlatformToolset>
62+
<CharacterSet>Unicode</CharacterSet>
63+
</PropertyGroup>
64+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
65+
<ConfigurationType>Application</ConfigurationType>
66+
<UseDebugLibraries>false</UseDebugLibraries>
67+
<PlatformToolset>v141</PlatformToolset>
68+
<WholeProgramOptimization>true</WholeProgramOptimization>
69+
<CharacterSet>Unicode</CharacterSet>
70+
</PropertyGroup>
71+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
72+
<ConfigurationType>Application</ConfigurationType>
73+
<UseDebugLibraries>true</UseDebugLibraries>
74+
<PlatformToolset>v141</PlatformToolset>
75+
<CharacterSet>Unicode</CharacterSet>
76+
</PropertyGroup>
77+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
78+
<ConfigurationType>Application</ConfigurationType>
79+
<UseDebugLibraries>false</UseDebugLibraries>
80+
<PlatformToolset>v141</PlatformToolset>
81+
<WholeProgramOptimization>true</WholeProgramOptimization>
82+
<CharacterSet>Unicode</CharacterSet>
83+
</PropertyGroup>
84+
</When>
85+
</Choose>
5486
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
5587
<ImportGroup Label="ExtensionSettings">
5688
</ImportGroup>

‎its/projects/CppSharedFiles/Project2/Project2.vcxproj‎

Lines changed: 58 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -25,32 +25,64 @@
2525
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
2626
</PropertyGroup>
2727
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
28-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
29-
<ConfigurationType>Application</ConfigurationType>
30-
<UseDebugLibraries>true</UseDebugLibraries>
31-
<PlatformToolset>v140</PlatformToolset>
32-
<CharacterSet>Unicode</CharacterSet>
33-
</PropertyGroup>
34-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
35-
<ConfigurationType>Application</ConfigurationType>
36-
<UseDebugLibraries>false</UseDebugLibraries>
37-
<PlatformToolset>v140</PlatformToolset>
38-
<WholeProgramOptimization>true</WholeProgramOptimization>
39-
<CharacterSet>Unicode</CharacterSet>
40-
</PropertyGroup>
41-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
42-
<ConfigurationType>Application</ConfigurationType>
43-
<UseDebugLibraries>true</UseDebugLibraries>
44-
<PlatformToolset>v140</PlatformToolset>
45-
<CharacterSet>Unicode</CharacterSet>
46-
</PropertyGroup>
47-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
48-
<ConfigurationType>Application</ConfigurationType>
49-
<UseDebugLibraries>false</UseDebugLibraries>
50-
<PlatformToolset>v140</PlatformToolset>
51-
<WholeProgramOptimization>true</WholeProgramOptimization>
52-
<CharacterSet>Unicode</CharacterSet>
53-
</PropertyGroup>
28+
<Choose>
29+
<When Condition="'$(MSBuildToolsVersion)'=='14.0'">
30+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
31+
<ConfigurationType>Application</ConfigurationType>
32+
<UseDebugLibraries>true</UseDebugLibraries>
33+
<PlatformToolset>v140</PlatformToolset>
34+
<CharacterSet>Unicode</CharacterSet>
35+
</PropertyGroup>
36+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
37+
<ConfigurationType>Application</ConfigurationType>
38+
<UseDebugLibraries>false</UseDebugLibraries>
39+
<PlatformToolset>v140</PlatformToolset>
40+
<WholeProgramOptimization>true</WholeProgramOptimization>
41+
<CharacterSet>Unicode</CharacterSet>
42+
</PropertyGroup>
43+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
44+
<ConfigurationType>Application</ConfigurationType>
45+
<UseDebugLibraries>true</UseDebugLibraries>
46+
<PlatformToolset>v140</PlatformToolset>
47+
<CharacterSet>Unicode</CharacterSet>
48+
</PropertyGroup>
49+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
50+
<ConfigurationType>Application</ConfigurationType>
51+
<UseDebugLibraries>false</UseDebugLibraries>
52+
<PlatformToolset>v140</PlatformToolset>
53+
<WholeProgramOptimization>true</WholeProgramOptimization>
54+
<CharacterSet>Unicode</CharacterSet>
55+
</PropertyGroup>
56+
</When>
57+
<When Condition="'$(MSBuildToolsVersion)'=='15.0'">
58+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
59+
<ConfigurationType>Application</ConfigurationType>
60+
<UseDebugLibraries>true</UseDebugLibraries>
61+
<PlatformToolset>v141</PlatformToolset>
62+
<CharacterSet>Unicode</CharacterSet>
63+
</PropertyGroup>
64+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
65+
<ConfigurationType>Application</ConfigurationType>
66+
<UseDebugLibraries>false</UseDebugLibraries>
67+
<PlatformToolset>v141</PlatformToolset>
68+
<WholeProgramOptimization>true</WholeProgramOptimization>
69+
<CharacterSet>Unicode</CharacterSet>
70+
</PropertyGroup>
71+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
72+
<ConfigurationType>Application</ConfigurationType>
73+
<UseDebugLibraries>true</UseDebugLibraries>
74+
<PlatformToolset>v141</PlatformToolset>
75+
<CharacterSet>Unicode</CharacterSet>
76+
</PropertyGroup>
77+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
78+
<ConfigurationType>Application</ConfigurationType>
79+
<UseDebugLibraries>false</UseDebugLibraries>
80+
<PlatformToolset>v141</PlatformToolset>
81+
<WholeProgramOptimization>true</WholeProgramOptimization>
82+
<CharacterSet>Unicode</CharacterSet>
83+
</PropertyGroup>
84+
</When>
85+
</Choose>
5486
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
5587
<ImportGroup Label="ExtensionSettings">
5688
</ImportGroup>

‎its/projects/CppSolution/ConsoleApp/ConsoleApp.vcxproj‎

Lines changed: 58 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -25,32 +25,64 @@
2525
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
2626
</PropertyGroup>
2727
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
28-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
29-
<ConfigurationType>Application</ConfigurationType>
30-
<UseDebugLibraries>true</UseDebugLibraries>
31-
<PlatformToolset>v140</PlatformToolset>
32-
<CharacterSet>Unicode</CharacterSet>
33-
</PropertyGroup>
34-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
35-
<ConfigurationType>Application</ConfigurationType>
36-
<UseDebugLibraries>false</UseDebugLibraries>
37-
<PlatformToolset>v140</PlatformToolset>
38-
<WholeProgramOptimization>true</WholeProgramOptimization>
39-
<CharacterSet>Unicode</CharacterSet>
40-
</PropertyGroup>
41-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
42-
<ConfigurationType>Application</ConfigurationType>
43-
<UseDebugLibraries>true</UseDebugLibraries>
44-
<PlatformToolset>v140</PlatformToolset>
45-
<CharacterSet>Unicode</CharacterSet>
46-
</PropertyGroup>
47-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
48-
<ConfigurationType>Application</ConfigurationType>
49-
<UseDebugLibraries>false</UseDebugLibraries>
50-
<PlatformToolset>v140</PlatformToolset>
51-
<WholeProgramOptimization>true</WholeProgramOptimization>
52-
<CharacterSet>Unicode</CharacterSet>
53-
</PropertyGroup>
28+
<Choose>
29+
<When Condition="'$(VisualStudioVersion)'==='14.0'">
30+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
31+
<ConfigurationType>Application</ConfigurationType>
32+
<UseDebugLibraries>true</UseDebugLibraries>
33+
<PlatformToolset>v140</PlatformToolset>
34+
<CharacterSet>Unicode</CharacterSet>
35+
</PropertyGroup>
36+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
37+
<ConfigurationType>Application</ConfigurationType>
38+
<UseDebugLibraries>false</UseDebugLibraries>
39+
<PlatformToolset>v140</PlatformToolset>
40+
<WholeProgramOptimization>true</WholeProgramOptimization>
41+
<CharacterSet>Unicode</CharacterSet>
42+
</PropertyGroup>
43+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
44+
<ConfigurationType>Application</ConfigurationType>
45+
<UseDebugLibraries>true</UseDebugLibraries>
46+
<PlatformToolset>v140</PlatformToolset>
47+
<CharacterSet>Unicode</CharacterSet>
48+
</PropertyGroup>
49+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
50+
<ConfigurationType>Application</ConfigurationType>
51+
<UseDebugLibraries>false</UseDebugLibraries>
52+
<PlatformToolset>v140</PlatformToolset>
53+
<WholeProgramOptimization>true</WholeProgramOptimization>
54+
<CharacterSet>Unicode</CharacterSet>
55+
</PropertyGroup>
56+
</When>
57+
<When Condition="'$(VisualStudioVersion)'==='15.0'">
58+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
59+
<ConfigurationType>Application</ConfigurationType>
60+
<UseDebugLibraries>true</UseDebugLibraries>
61+
<PlatformToolset>v141</PlatformToolset>
62+
<CharacterSet>Unicode</CharacterSet>
63+
</PropertyGroup>
64+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
65+
<ConfigurationType>Application</ConfigurationType>
66+
<UseDebugLibraries>false</UseDebugLibraries>
67+
<PlatformToolset>v141</PlatformToolset>
68+
<WholeProgramOptimization>true</WholeProgramOptimization>
69+
<CharacterSet>Unicode</CharacterSet>
70+
</PropertyGroup>
71+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
72+
<ConfigurationType>Application</ConfigurationType>
73+
<UseDebugLibraries>true</UseDebugLibraries>
74+
<PlatformToolset>v141</PlatformToolset>
75+
<CharacterSet>Unicode</CharacterSet>
76+
</PropertyGroup>
77+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
78+
<ConfigurationType>Application</ConfigurationType>
79+
<UseDebugLibraries>false</UseDebugLibraries>
80+
<PlatformToolset>v141</PlatformToolset>
81+
<WholeProgramOptimization>true</WholeProgramOptimization>
82+
<CharacterSet>Unicode</CharacterSet>
83+
</PropertyGroup>
84+
</When>
85+
</Choose>
5486
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
5587
<ImportGroup Label="ExtensionSettings">
5688
</ImportGroup>

‎its/src/test/java/com/sonar/it/scanner/SonarScannerTestSuite.java‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
/*
2+
* Scanner for MSBuild :: Integration Tests
3+
* Copyright (C) 2016-2019 SonarSource SA
4+
* mailto:info AT sonarsource DOT com
5+
*
6+
* This program is free software; you can redistribute it and/or
7+
* modify it under the terms of the GNU Lesser General Public
8+
* License as published by the Free Software Foundation; either
9+
* version 3 of the License, or (at your option) any later version.
10+
*
11+
* This program is distributed in the hope that it will be useful,
12+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
14+
* Lesser General Public License for more details.
15+
*
16+
* You should have received a copy of the GNU Lesser General Public License
17+
* along with this program; if not, write to the Free Software Foundation,
18+
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
19+
*/
20+
package com.sonar.it.scanner;
21+
22+
import com.sonar.it.scanner.msbuild.CppTest;
23+
import com.sonar.it.scanner.msbuild.SQLServerTest;
24+
import com.sonar.it.scanner.msbuild.ScannerMSBuildTest;
25+
import com.sonar.it.scanner.msbuild.TestUtils;
26+
import com.sonar.orchestrator.Orchestrator;
27+
import com.sonar.orchestrator.container.Edition;
28+
import com.sonar.orchestrator.locator.FileLocation;
29+
import org.junit.ClassRule;
30+
import org.junit.runner.RunWith;
31+
import org.junit.runners.Suite;
32+
import org.junit.runners.Suite.SuiteClasses;
33+
34+
@RunWith(Suite.class)
35+
@SuiteClasses({CppTest.class, ScannerMSBuildTest.class, SQLServerTest.class})
36+
public class SonarScannerTestSuite {
37+
38+
@ClassRule
39+
public static final Orchestrator ORCHESTRATOR = Orchestrator.builderEnv()
40+
.setSonarVersion(TestUtils.replaceLtsVersion(System.getProperty("sonar.runtimeVersion", "LATEST_RELEASE")))
41+
.setEdition(Edition.DEVELOPER)
42+
.addPlugin(TestUtils.getMavenLocation("com.sonarsource.cpp", "sonar-cfamily-plugin", "LATEST_RELEASE"))
43+
.addPlugin(FileLocation.of(TestUtils.getCustomRoslynPlugin().toFile()))
44+
.addPlugin(TestUtils.getMavenLocation("org.sonarsource.dotnet", "sonar-csharp-plugin", "LATEST_RELEASE"))
45+
.addPlugin(TestUtils.getMavenLocation("org.sonarsource.dotnet", "sonar-vbnet-plugin", "LATEST_RELEASE"))
46+
.activateLicense()
47+
.build();
48+
49+
}

0 commit comments

Comments
 (0)