workaround

robstoll · Apr 24, 2020 · 1ba255a · 1ba255a
1 parent 3d8e6a7
commit 1ba255a
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 26 deletions.
diff --git a/...i-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/anyAssertions.kt b/...i-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/anyAssertions.kt
@@ -11,7 +11,7 @@ import ch.tutteli.atrium.reporting.Reporter
  * @return An [Expect] for the current subject of the assertion.
  * @throws AssertionError Might throw an [AssertionError] if the assertion made is not correct.
  */
-fun <T> Expect<T>.toBe(expected: T) = addAssertion(ExpectImpl.any.toBe(this, expected))
+fun <T> Expect<T>.toBe(expected: T) = addAssertion(ExpectImpl.any.notToBe(this, expected))
 
 /**
  * Expects that the subject of the assertion is not (equal to) [expected].

diff --git a/misc/tools/atrium-samples-test/build.gradle b/misc/tools/atrium-samples-test/build.gradle
@@ -1,7 +1,7 @@
-task run {
-    dependsOn gradle.includedBuild('junit5').task(':test')
-    dependsOn gradle.includedBuild('spek').task(':test')
-    dependsOn gradle.includedBuild('multiplatform').task(':check')
-    dependsOn gradle.includedBuild('jasmine').task(':runJasmine')
-    dependsOn gradle.includedBuild('mocha').task(':runMocha')
-}
+task build {
+    dependsOn gradle.includedBuild('junit5').task(':build')
+    dependsOn gradle.includedBuild('spek').task(':build')
+    dependsOn gradle.includedBuild('multiplatform').task(':build')
+    dependsOn gradle.includedBuild('jasmine').task(':build')
+    dependsOn gradle.includedBuild('mocha').task(':build')
+}
diff --git a/misc/tools/atrium-samples-test/gradlew b/misc/tools/atrium-samples-test/gradlew
diff --git a/misc/tools/atrium-samples-test/settings.gradle b/misc/tools/atrium-samples-test/settings.gradle
@@ -1,14 +1,15 @@
-/*
- * This file was generated by the Gradle 'init' task.
- *
- * The settings file is used to specify which projects to include in your build.
- *
- * Detailed information about configuring a multi-project build in Gradle can be found
- * in the user manual at https://docs.gradle.org/6.0.1/userguide/multi_project_builds.html
- */
-
 rootProject.name = "samples-composite"
 
+includeBuild('../../../') {
+    dependencySubstitution {
+        gradle.includedBuild('atrium').getAvailableModules().collect { pair -> pair.right.projectName }
+            .findAll { it.endsWith("-jvm") }
+            .forEach { projectName ->
+                def withoutSuffix = projectName.substring(0, projectName.length() - 4)
+                substitute module("ch.tutteli.atrium:$withoutSuffix") with project(":$projectName")
+            }
+    }
+}
 includeBuild '../../../samples/jvm/junit5'
 includeBuild '../../../samples/jvm/spek'
 includeBuild '../../../samples/multiplatform'

diff --git a/samples/jvm/junit5/settings.gradle b/samples/jvm/junit5/settings.gradle
@@ -1,10 +1 @@
-/*
- * This file was generated by the Gradle 'init' task.
- *
- * The settings file is used to specify which projects to include in your build.
- *
- * Detailed information about configuring a multi-project build in Gradle can be found
- * in the user manual at https://docs.gradle.org/6.0.1/userguide/multi_project_builds.html
- */
-
 rootProject.name = "junit5"