Fix the remaining tests.

neoforged · May 31, 2024 · 9314db5 · 9314db5
1 parent 9fa2813
commit 9314db5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/userdev/src/functionalTest/groovy/net/neoforged/gradle/userdev/RunTests.groovy b/userdev/src/functionalTest/groovy/net/neoforged/gradle/userdev/RunTests.groovy
@@ -204,7 +204,7 @@ class RunTests extends BuilderBasedTestSpecification {
 
         classpathFile.exists()
 
-        classpathFile.text.contains("org.jgrapht/jgrapht-core")
+        classpathFile.text.contains("org.jgrapht${File.separator}jgrapht-core")
     }
 
     def "userdev supports custom run dependencies from configuration"() {
@@ -260,7 +260,7 @@ class RunTests extends BuilderBasedTestSpecification {
 
         classpathFile.exists()
 
-        classpathFile.text.contains("org.jgrapht/jgrapht-core")
+        classpathFile.text.contains("org.jgrapht${File.separator}jgrapht-core")
     }
 
     def "userdev supports custom run dependencies from catalog"() {
@@ -321,6 +321,6 @@ class RunTests extends BuilderBasedTestSpecification {
 
         classpathFile.exists()
 
-        classpathFile.text.contains("org.jgrapht/jgrapht-core")
+        classpathFile.text.contains("org.jgrapht${File.separator}jgrapht-core")
     }
 }
diff --git a/...tionalTest/groovy/net/neoforged/gradle/userdev/convention/SourceSetConventionTests.groovy b/...tionalTest/groovy/net/neoforged/gradle/userdev/convention/SourceSetConventionTests.groovy
@@ -244,11 +244,12 @@ class SourceSetConventionTests extends BuilderBasedTestSpecification {
         when:
         def run = project.run {
             it.tasks(':dependencies')
+            it.shouldFail()
         }
 
         then:
-        run.task(':dependencies').outcome == TaskOutcome.SUCCESS
         run.output.contains("Run sources: []")
+        run.output.contains("Run: client has no source sets configured. Please configure at least one source set.")
     }
 
     def "disabling sourceset conventions prevents registration of main sourceset to run"() {
@@ -285,11 +286,12 @@ class SourceSetConventionTests extends BuilderBasedTestSpecification {
         when:
         def run = project.run {
             it.tasks(':dependencies')
+            it.shouldFail()
         }
 
         then:
-        run.task(':dependencies').outcome == TaskOutcome.SUCCESS
         run.output.contains("Run sources: []")
+        run.output.contains("Run: client has no source sets configured. Please configure at least one source set.")
     }
 
     def "disabling main source set registration conventions prevents registration of main sourceset to run"() {
@@ -326,11 +328,12 @@ class SourceSetConventionTests extends BuilderBasedTestSpecification {
         when:
         def run = project.run {
             it.tasks(':dependencies')
+            it.shouldFail()
         }
 
         then:
-        run.task(':dependencies').outcome == TaskOutcome.SUCCESS
         run.output.contains("Run sources: []")
+        run.output.contains("Run: client has no source sets configured. Please configure at least one source set.")
     }
 
     def "having the conventions for main sourceset registration enabled registers it"() {