New: Hookup SonarCloud

test.sh

@@ -16,16 +16,12 @@ if [ -d "$TEST_DIR/_tests" ]; then
   TEST_DIR="$TEST_DIR/_tests"
 fi
 
-COVERAGE_RESULT_DIRECTORY="$TEST_DIR/CoverageResults/"
-
 rm -f "$TEST_LOG_FILE"
 
 # Uncomment to log test output to a file instead of the console
 export RADARR_TESTS_LOG_OUTPUT="File"
 
-NUNIT="dotnet vstest"
-NUNIT_COMMAND="$NUNIT"
-NUNIT_PARAMS="--Platform:x64 --logger:nunit;LogFilePath=TestResult.xml"
+VSTEST_PARAMS="--Platform:x64 --logger:nunit;LogFilePath=TestResult.xml"
 
 if [ "$PLATFORM" = "Mac" ]; then
 
@@ -63,20 +59,13 @@ for i in `find $TEST_DIR -name "$TEST_PATTERN"`;
   do ASSEMBLIES="$ASSEMBLIES $i"
 done
 
+DOTNET_PARAMS="$ASSEMBLIES --TestCaseFilter:$WHERE $VSTEST_PARAMS"
+
 if [ "$COVERAGE" = "Coverage" ]; then
-  if [ "$PLATFORM" = "Windows" ] || [ "$PLATFORM" = "Linux" ]; then
-    dotnet tool install coverlet.console --tool-path="$TEST_DIR/coverlet/"
-    mkdir $COVERAGE_RESULT_DIRECTORY
-    OPEN_COVER="$TEST_DIR/coverlet/coverlet"
-    $OPEN_COVER "$TEST_DIR/" --verbosity "detailed" --format "cobertura" --format "opencover" --output "$COVERAGE_RESULT_DIRECTORY" --exclude "[Radarr.*.Test]*" --exclude "[Radarr.Test.*]*" --exclude "[Radarr.Api*]*" --exclude "[Marr.Data]*" --exclude "[MonoTorrent]*" --exclude "[CurlSharp]*" --target "$NUNIT" --targetargs "$NUNIT_PARAMS --where=\"$WHERE\" $ASSEMBLIES";
-    EXIT_CODE=$?
-  else
-    echo "Coverage only supported on Windows and Linux"
-    exit 3
-  fi
+  dotnet vstest $DOTNET_PARAMS --settings:"src/coverlet.runsettings" --ResultsDirectory:./CoverageResults
+  EXIT_CODE=$?
 elif [ "$COVERAGE" = "Test" ] ; then
-  echo "$NUNIT_COMMAND $ASSEMBLIES --TestCaseFilter:$WHERE $NUNIT_PARAMS"
-  $NUNIT_COMMAND $ASSEMBLIES --TestCaseFilter:"$WHERE" $NUNIT_PARAMS
+  dotnet vstest $DOTNET_PARAMS
   EXIT_CODE=$?
 else
   echo "Run Type must be provided as third argument: Coverage or Test"