AppVeyor: Fix the ITs

Author: dbolkensteyn

appveyor.ps1

@@ -115,19 +115,19 @@ CALLSTACK:$(Get-PSCallStack | Out-String)
     }
 }
 
-switch ($env:RUN_ITS)
+switch ($env:TEST)
 {
-	"false"
+	"CI"
 	{
 		mvn verify "--batch-mode" "-B" "-e" "-V"
 		CheckLastExitCode
 	}
 
-	"true"
+	"PLUGIN"
 	{
 		InstallAppveyorTools
 
-		mvn install "--batch-mode" "-Dsource.skip=true" "-Denforcer.skip=true" "-Danimal.sniffer.skip=true" "-Dmaven.test.skip=true"
+		mvn package "--batch-mode" "-Dsource.skip=true" "-Denforcer.skip=true" "-Danimal.sniffer.skip=true" "-Dmaven.test.skip=true"
 		CheckLastExitCode
 
 		if ($env:SQ_VERSION -eq "DEV")
@@ -138,7 +138,7 @@ switch ($env:RUN_ITS)
 		pushd its/plugin
 		try
 		{
-			mvn install "--batch-mode" "-DcsharpVersion=""DEV""" "-Dsonar.runtimeVersion=""$env:SQ_VERSION""" "-Dmaven.test.redirectTestOutputToFile=false" "-Dsonar.jdbc.dialect=embedded" "-Dorchestrator.updateCenterUrl=http://update.sonarsource.org/update-center-dev.properties" "-Dmaven.localRepository=$env:USERPROFILE\.m2\repository"
+			mvn test "--batch-mode" "-DcsharpVersion=""DEV""" "-Dsonar.runtimeVersion=""$env:SQ_VERSION""" "-Dmaven.test.redirectTestOutputToFile=false" "-Dsonar.jdbc.dialect=embedded" "-Dorchestrator.updateCenterUrl=http://update.sonarsource.org/update-center-dev.properties" "-Dmaven.localRepository=$env:USERPROFILE\.m2\repository"
 			CheckLastExitCode
 		}
 		finally
@@ -149,6 +149,6 @@ switch ($env:RUN_ITS)
 
 	default
 	{
-		throw "RUN_ITS should be set to either ""true"" or ""false"", not: ""$env:RUN_ITS"""
+		throw "Unexpected TEST mode: $env:TEST"
 	}
 }

appveyor.yml

@@ -11,13 +11,13 @@ install:
 
 environment:
   matrix:
-  - RUN_ITS: false
-  - RUN_ITS: true
-    SQ_VERSION: LTS_OR_OLDEST_COMPATIBLE
-  - RUN_ITS: true
-    SQ_VERSION: LATEST_RELEASE
-  - RUN_ITS: true
+  - TEST: CI
+  - TEST: PLUGIN
     SQ_VERSION: DEV
+  - TEST: PLUGIN
+    SQ_VERSION: LTS
+  - TEST: PLUGIN
+    SQ_VERSION: LATEST_RELEASE
 
 matrix:
   fast_finish: true

its/plugin/src/test/java/com/sonar/it/csharp/Tests.java

@@ -44,8 +44,7 @@ public class Tests {
 
   @ClassRule
   public static final Orchestrator ORCHESTRATOR = Orchestrator.builderEnv()
-    .addPlugin(PLUGIN_KEY)
-    .setMainPluginKey(PLUGIN_KEY)
+    .addPlugin(FileLocation.of("../../target/sonar-csharp-plugin.jar"))
     .restoreProfileAtStartup(FileLocation.of("profiles/fxcop.xml"))
     .restoreProfileAtStartup(FileLocation.of("profiles/no_rule.xml"))
     .restoreProfileAtStartup(FileLocation.of("profiles/class_name.xml"))

pom.xml

@@ -118,6 +118,7 @@
   </dependencies>
 
   <build>
+    <finalName>${project.artifactId}</finalName>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>