CATROID-1623 Refactor GlideToAction to Kotlin (small adjustments)

Author: doppem15

catroid/src/main/java/org/catrobat/catroid/content/actions/conditional/GlideToAction.kt

@@ -39,7 +39,7 @@ open class GlideToAction : TemporalAction() {
     lateinit var scope: Scope
 
 
-    private var durationValue = 0f
+    var durationValue = 0f
     private var endXValue = 0f
     private var endYValue = 0f
 
@@ -82,9 +82,11 @@ open class GlideToAction : TemporalAction() {
     override fun update(percent: Float) {
         val deltaX = scope.sprite.look.xInUserInterfaceDimensionUnit - currentXValue
         val deltaY = scope.sprite.look.yInUserInterfaceDimensionUnit - currentYValue
-        if ((-0.1f > deltaX || deltaX > 0.1f) || (-0.1f > deltaY || deltaY > 0.1f)) {
+        if ((kotlin.math.abs(deltaX) > 0.1f) || (kotlin.math.abs(deltaY) > 0.1f)) {
             restart = true
-            setDuration(getDuration() - time)
+            val remainingDuration = getDuration() - time
+            setDuration(remainingDuration)
+            durationValue = remainingDuration
             restart()
         } else {
             currentXValue = startXValue + (endXValue - startXValue) * percent

catroid/src/test/java/org/catrobat/catroid/test/content/actions/GlideToActionTest.kt

@@ -26,6 +26,7 @@ import com.badlogic.gdx.scenes.scene2d.actions.SequenceAction
 import org.junit.Assert.assertEquals
 import org.catrobat.catroid.content.ActionFactory
 import org.catrobat.catroid.content.Sprite
+import org.catrobat.catroid.content.actions.conditional.GlideToAction
 import org.catrobat.catroid.formulaeditor.Formula
 import org.catrobat.catroid.test.StaticSingletonInitializer.Companion.initializeStaticSingletonMethods
 import org.junit.Before
@@ -58,6 +59,34 @@ class GlideToActionTest {
         assertEquals(Y_POSITION, sprite.look.yInUserInterfaceDimensionUnit)
     }
 
+    @Test
+    fun testGlideToBoundaryPositionsImmediate() {
+        val glideToMax = sprite.actionFactory.createGlideToAction(
+            sprite,
+            SequenceAction(),
+            Formula(Int.MAX_VALUE),
+            Formula(Int.MAX_VALUE),
+            Formula(0f)
+        )
+        runActionUntilFinished(glideToMax)
+
+        assertEquals(Int.MAX_VALUE.toFloat(), sprite.look.xInUserInterfaceDimensionUnit)
+        assertEquals(Int.MAX_VALUE.toFloat(), sprite.look.yInUserInterfaceDimensionUnit)
+
+        val glideToMin = sprite.actionFactory.createGlideToAction(
+            sprite,
+            SequenceAction(),
+            Formula(Int.MIN_VALUE),
+            Formula(Int.MIN_VALUE),
+            Formula(0f)
+        )
+        runActionUntilFinished(glideToMin)
+
+        assertEquals(Int.MIN_VALUE.toFloat(), sprite.look.xInUserInterfaceDimensionUnit)
+        assertEquals(Int.MIN_VALUE.toFloat(), sprite.look.yInUserInterfaceDimensionUnit)
+    }
+
+
     @Test(expected = NullPointerException::class)
     fun testNullActor() {
         val xPosition = Formula(X_POSITION)
@@ -120,6 +149,28 @@ class GlideToActionTest {
         assertEquals(0f, sprite.look.yInUserInterfaceDimensionUnit)
     }
 
+    @Test
+    fun testDurationChangesAfterRestart() {
+        val xPosition = Formula(X_POSITION)
+        val yPosition = Formula(Y_POSITION)
+        val duration = Formula(DURATION)
+
+        sprite.look.setPositionInUserInterfaceDimensionUnit(0f, 0f)
+
+        val action = sprite.actionFactory.createGlideToAction(sprite, SequenceAction(), xPosition, yPosition, duration
+        ) as GlideToAction
+
+        action.act(0f)
+        val durationBefore = action.durationValue
+
+        sprite.look.setPositionInUserInterfaceDimensionUnit(10f, 10f)
+
+        action.act(0.5f)
+        val durationAfter = action.durationValue
+
+        assert(durationAfter < durationBefore)
+    }
+
     private fun runActionUntilFinished(action: com.badlogic.gdx.scenes.scene2d.Action) {
         while (!action.act(1.0f)) {
             // does nothing