From a1b6ead866b3f010084d4a1c50c383bfabb50c06 Mon Sep 17 00:00:00 2001 From: Edwin Jakobs Date: Fri, 27 Jun 2025 07:30:58 +0200 Subject: [PATCH] [orx-fcurve] Workaround for Kotlin 2.2 bug that shows up during testing in javascript mode. The bug shows up like this: TypeError: fc.value$default_ruhk1_k$ is not a function at TestEFCurve.protoOf.testConstantExpression_4i11z6(orx/orx-fcurve/src/commonTest/kotlin/TestEFCurve.kt:59) at .fn(kotlin/orx-orx-fcurve-test.js:121) at Context.(orx/build/js/node_modules/kotlin-web-helpers/src/KotlinTestTeamCityConsoleAdapter.ts:72) at .processImmediate(node:internal/timers:478) --- orx-fcurve/src/commonTest/kotlin/TestEFCurve.kt | 12 ++++++------ orx-fcurve/src/commonTest/kotlin/TestFCurve.kt | 14 +++++++------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/orx-fcurve/src/commonTest/kotlin/TestEFCurve.kt b/orx-fcurve/src/commonTest/kotlin/TestEFCurve.kt index 732c3397..dac64d1f 100644 --- a/orx-fcurve/src/commonTest/kotlin/TestEFCurve.kt +++ b/orx-fcurve/src/commonTest/kotlin/TestEFCurve.kt @@ -43,9 +43,9 @@ class TestEFCurve { fun testConstantValue() { val text = "10.5" val fc = fcurve(efcurve(text)) - assertEquals(10.5, fc.value(0.0)) - assertEquals(10.5, fc.value(1.0)) - assertEquals(10.5, fc.value(-1.0)) + assertEquals(10.5, fc.value(0.0, null)) + assertEquals(10.5, fc.value(1.0, null)) + assertEquals(10.5, fc.value(-1.0, null)) val normalizedSampler = fc.sampler(true) assertEquals(10.5, normalizedSampler(0.0)) @@ -56,9 +56,9 @@ class TestEFCurve { fun testConstantExpression() { val text = "${21.0 / 2.0}" val fc = fcurve(efcurve(text)) - assertEquals(10.5, fc.value(0.0)) - assertEquals(10.5, fc.value(1.0)) - assertEquals(10.5, fc.value(-1.0)) + assertEquals(10.5, fc.value(0.0, null)) + assertEquals(10.5, fc.value(1.0, null)) + assertEquals(10.5, fc.value(-1.0, null)) val normalizedSampler = fc.sampler(true) assertEquals(10.5, normalizedSampler(0.0)) diff --git a/orx-fcurve/src/commonTest/kotlin/TestFCurve.kt b/orx-fcurve/src/commonTest/kotlin/TestFCurve.kt index cf20660a..962ec51b 100644 --- a/orx-fcurve/src/commonTest/kotlin/TestFCurve.kt +++ b/orx-fcurve/src/commonTest/kotlin/TestFCurve.kt @@ -7,9 +7,9 @@ class TestFCurve { fun testConstantExpression() { val text = "10.5" val fc = fcurve(text) - assertEquals(10.5, fc.value(0.0)) - assertEquals(10.5, fc.value(1.0)) - assertEquals(10.5, fc.value(-1.0)) + assertEquals(10.5, fc.value(0.0, null)) + assertEquals(10.5, fc.value(1.0, null)) + assertEquals(10.5, fc.value(-1.0, null)) val normalizedSampler = fc.sampler(true) assertEquals(10.5, normalizedSampler(0.0)) @@ -22,8 +22,8 @@ class TestFCurve { run { val text = "H-1 L 5 5" val fc = fcurve(text) - assertEquals(0.0, fc.value(-1.0)) - assertEquals(5.0, fc.value(4.0)) + assertEquals(0.0, fc.value(-1.0, null)) + assertEquals(5.0, fc.value(4.0, null)) assertEquals(-1.0, fc.start) assertEquals(4.0, fc.end) assertEquals(5.0, fc.duration) @@ -31,8 +31,8 @@ class TestFCurve { run { val text = "H1 L 5 5" val fc = fcurve(text) - assertEquals(0.0, fc.value(1.0)) - assertEquals(5.0, fc.value(6.0)) + assertEquals(0.0, fc.value(1.0, null)) + assertEquals(5.0, fc.value(6.0, null)) assertEquals(1.0, fc.start) assertEquals(6.0, fc.end) assertEquals(5.0, fc.duration)