Skip to content

Commit

Permalink
Fix unit tests on Windows
Browse files Browse the repository at this point in the history
  • Loading branch information
@leonardo-pilastri-sonarsource
leonardo-pilastri-sonarsource committed Nov 4, 2024
1 parent 4982772 commit 1d1dec1
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 39 deletions.
24 changes: 13 additions & 11 deletions src/test/groovy/org/sonarqube/gradle/FunctionalTests.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -390,14 +390,15 @@ class FunctionalTests extends Specification {

var mainSources = ((String) props."sonar.sources").split(",")
mainSources.size() == 3
mainSources[0].endsWith("""$projectDir/build.gradle""")
mainSources[1].endsWith("""$projectDir/gradle.properties""")
mainSources[2].endsWith("""$projectDir/settings.gradle""")
var projectPath = projectDir.toString() + File.separator
mainSources[0].endsWith("""${projectPath}build.gradle""")
mainSources[1].endsWith("""${projectPath}gradle.properties""")
mainSources[2].endsWith("""${projectPath}settings.gradle""")

var testSources = ((String) props."sonar.tests").split(",")
testSources.size() == 2
testSources[0].endsWith("""$projectDir/integrationTests/run-all.sh""")
testSources[1].endsWith("""$projectDir/test-license.sh""")
testSources[0].endsWith("""${projectPath}integrationTests${File.separator}run-all.sh""")
testSources[1].endsWith("""${projectPath}test-license.sh""")
}

def "scan all is enabled but not applied because of overridden properties on the command line"() {
Expand Down Expand Up @@ -538,14 +539,15 @@ class FunctionalTests extends Specification {
// Test that the empty script is is collected but the reports are not collected
var mainSources = ((String) props."sonar.sources").split(",")
mainSources.size() == 4
mainSources[0].endsWith("""$projectDir/build.gradle""")
mainSources[1].endsWith("""$projectDir/empty-script.groovy""")
mainSources[2].endsWith("""$projectDir/gradle.properties""")
mainSources[3].endsWith("""$projectDir/settings.gradle""")
var projectPath = projectDir.toString() + File.separator
mainSources[0].endsWith("""${projectPath}build.gradle""")
mainSources[1].endsWith("""${projectPath}empty-script.groovy""")
mainSources[2].endsWith("""${projectPath}gradle.properties""")
mainSources[3].endsWith("""${projectPath}settings.gradle""")

var testSources = ((String) props."sonar.tests").split(",")
testSources.size() == 2
testSources[0].endsWith("""$projectDir/integrationTests/run-all.sh""")
testSources[1].endsWith("""$projectDir/test-license.sh""")
testSources[0].endsWith("""${projectPath}integrationTests${File.separator}run-all.sh""")
testSources[1].endsWith("""${projectPath}test-license.sh""")
}
}
32 changes: 16 additions & 16 deletions src/test/groovy/org/sonarqube/gradle/SonarQubePluginTest.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -754,13 +754,13 @@ class SonarQubePluginTest extends Specification {
def properties = project.tasks.sonar.properties.get()
then:
relativize(project, "sonar.sources") == """
relativize(project, "sonar.sources").replace(File.separator, '/') == """
src/jsMain/kotlin/Sample.js
src/jvmMain/java/me/user/application/Sample.java
src/jvmMain/kotlin/me.user.application/Sample.kt
""".stripIndent().trim()
relativize(project, "sonar.tests") == "src/jvmTest/java/me/user/application/SampleTest.java"
relativize(project, "sonar.tests").replace(File.separator, '/') == "src/jvmTest/java/me/user/application/SampleTest.java"
properties["sonar.java.binaries"] == null
properties["sonar.java.libraries"] == null
}
Expand All @@ -786,15 +786,15 @@ class SonarQubePluginTest extends Specification {
def properties = project.tasks.sonar.properties.get()
then:
relativize(project, "sonar.sources") == """
relativize(project, "sonar.sources").replace(File.separator, '/') == """
src/jsMain/kotlin/Sample.js
src/jvmMain/java/me/user/application/Sample.java
src/jvmMain/kotlin/me.user.application/Sample.kt
""".stripIndent().trim()
relativize(project, "sonar.tests") == "src/jvmTest/java/me/user/application/SampleTest.java"
relativize(project, "sonar.java.libraries") == "lib/SomeLib.jar"
relativize(project, "sonar.java.binaries") == "build/out"
relativize(project, "sonar.tests").replace(File.separator, '/') == "src/jvmTest/java/me/user/application/SampleTest.java"
relativize(project, "sonar.java.libraries").replace(File.separator, '/') == "lib/SomeLib.jar"
relativize(project, "sonar.java.binaries").replace(File.separator, '/') == "build/out"
}
def "handles root project property correctly if plugin is applied to root project"() {
Expand Down Expand Up @@ -911,7 +911,7 @@ class SonarQubePluginTest extends Specification {
parent.pluginManager.apply(SonarQubePlugin)
then:
relativize(parent, "sonar.sources") == """
relativize(parent, "sonar.sources").replace(File.separator, '/') == """
build.gradle.kts
module1/build.gradle.kts
module2/build.gradle.kts
Expand Down Expand Up @@ -945,7 +945,7 @@ class SonarQubePluginTest extends Specification {
project.pluginManager.apply(SonarQubePlugin)
when:
def mainSources = relativize(project, "sonar.sources")
def mainSources = relativize(project, "sonar.sources").replace(File.separator, '/')
def testSources = relativize(project, "sonar.tests")
then:
Expand Down Expand Up @@ -997,9 +997,9 @@ class SonarQubePluginTest extends Specification {
when:
def props = parent.tasks.sonar.properties.get()
def mainSources = relativize(parent, "sonar.sources")
def testSources = relativize(parent, "sonar.tests")
def module1Sources = relativize(parent, ":module1.sonar.sources")
def mainSources = relativize(parent, "sonar.sources").replace(File.separator, '/')
def testSources = relativize(parent, "sonar.tests").replace(File.separator, '/')
def module1Sources = relativize(parent, ":module1.sonar.sources").replace(File.separator, '/')
then:
mainSources == """
Expand Down Expand Up @@ -1066,11 +1066,11 @@ class SonarQubePluginTest extends Specification {
}
when:
def mainSources = relativize(parent, "sonar.sources")
def testSources = relativize(parent, "sonar.tests")
def module1Sources = relativize(parent, ":module1.sonar.sources")
def module2Sources = relativize(parent, ":module2.sonar.sources")
def submoduleSources = relativize(parent, ":module2.:module2:submodule.sonar.sources")
def mainSources = relativize(parent, "sonar.sources").replace(File.separator, '/')
def testSources = relativize(parent, "sonar.tests").replace(File.separator, '/')
def module1Sources = relativize(parent, ":module1.sonar.sources").replace(File.separator, '/')
def module2Sources = relativize(parent, ":module2.sonar.sources").replace(File.separator, '/')
def submoduleSources = relativize(parent, ":module2.:module2:submodule.sonar.sources").replace(File.separator, '/')
then:
mainSources == """
Expand Down
33 changes: 21 additions & 12 deletions src/test/java/org/sonarqube/gradle/SourceCollectorTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,17 @@
*/
package org.sonarqube.gradle;

import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;

import java.io.IOException;
import java.nio.file.*;
import java.nio.file.FileSystemException;
import java.nio.file.FileVisitResult;
import java.nio.file.FileVisitor;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Collections;
import java.util.Set;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
Expand Down Expand Up @@ -157,16 +160,22 @@ void visitorIgnoresExcludedFiles() throws IOException {

@Test
void visitorIgnoresSymbolicLinks() throws IOException {
boolean isWindows = System.getProperty("os.name").startsWith("Windows");

Path simpleProjectPom = simpleProjectBasedDir.resolve("pom.xml");
simpleProjectPom.toFile().createNewFile();
Path link = simpleProjectBasedDir.resolve("pom.xml.symbolic.link");
Files.createSymbolicLink(link, simpleProjectPom);

SourceCollector visitor = SourceCollector.builder().setRoot(simpleProjectBasedDir).build();
Files.walkFileTree(simpleProjectBasedDir, visitor);
assertThat(visitor.getCollectedSources())
.contains(simpleProjectPom)
.doesNotContain(link);
if (isWindows) {
assertThatThrownBy(() -> Files.createSymbolicLink(link, simpleProjectPom))
.isInstanceOf(FileSystemException.class);
} else {
Files.createSymbolicLink(link, simpleProjectPom);
SourceCollector visitor = SourceCollector.builder().setRoot(simpleProjectBasedDir).build();
Files.walkFileTree(simpleProjectBasedDir, visitor);
assertThat(visitor.getCollectedSources())
.contains(simpleProjectPom)
.doesNotContain(link);
}
}

@Test
Expand Down

0 comments on commit 1d1dec1

Please sign in to comment.