DOPE-240: fixed merge and moved test files into correct directory

ergon · Aug 27, 2024 · 563c973 · 563c973
1 parent eb09978
commit 563c973
Show file tree

Hide file tree

Showing 69 changed files with 120 additions and 228 deletions.
diff --git a/.../kotlin/ch/ergon/dope/resolvable/expression/unaliased/type/function/FunctionExpression.kt b/.../kotlin/ch/ergon/dope/resolvable/expression/unaliased/type/function/FunctionExpression.kt
@@ -1,6 +1,7 @@
 package ch.ergon.dope.resolvable.expression.unaliased.type.function
 
 import ch.ergon.dope.DopeQuery
+import ch.ergon.dope.DopeQueryManager
 import ch.ergon.dope.resolvable.expression.TypeExpression
 import ch.ergon.dope.resolvable.expression.UnaliasedExpression
 import ch.ergon.dope.resolvable.operator.FunctionOperator
@@ -10,8 +11,8 @@ abstract class FunctionExpression<T : ValidType>(
     private val symbol: String,
     private vararg val expressions: UnaliasedExpression<T>,
 ) : TypeExpression<T>, FunctionOperator {
-    override fun toDopeQuery(): DopeQuery {
-        val expressionsDopeQuery = expressions.map { it.toDopeQuery() }
+    override fun toDopeQuery(manager: DopeQueryManager): DopeQuery {
+        val expressionsDopeQuery = expressions.map { it.toDopeQuery(manager) }
         return DopeQuery(
             queryString = toFunctionQueryString(
                 symbol,

diff --git a/...gon/dope/resolvable/expression/unaliased/type/function/stringfunction/TokensExpression.kt b/...gon/dope/resolvable/expression/unaliased/type/function/stringfunction/TokensExpression.kt
@@ -15,7 +15,7 @@ class TokensExpression(
     private val opt: CustomTokenOptions = CustomTokenOptions(),
 ) : TypeExpression<StringType>, FunctionOperator {
     override fun toDopeQuery(manager: DopeQueryManager): DopeQuery {
-        val optDopeQuery = opt.toDopeQuery(manager)
+        val optDopeQuery = opt.toDopeQuery()
         return DopeQuery(
             queryString = toFunctionQueryString(
                 symbol = "TOKENS",

diff --git a/...ergon/dope/resolvable/expression/unaliased/type/function/stringfunction/factory/Tokens.kt b/...ergon/dope/resolvable/expression/unaliased/type/function/stringfunction/factory/Tokens.kt
@@ -1,7 +1,6 @@
 package ch.ergon.dope.resolvable.expression.unaliased.type.function.stringfunction.factory
 
 import ch.ergon.dope.DopeQuery
-import ch.ergon.dope.DopeQueryManager
 import ch.ergon.dope.resolvable.expression.unaliased.type.function.stringfunction.TokensExpression
 
 enum class TOKEN_CASES { LOWER, UPPER }
@@ -21,7 +20,7 @@ data class CustomTokenOptions(var name: Boolean = false, private val specials: B
         queryString = "{\"name\": $name, \"case\": \"$case\", \"specials\": $specials}"
     }
 
-    fun toDopeQuery(manager: DopeQueryManager) = DopeQuery(queryString, emptyMap())
+    fun toDopeQuery() = DopeQuery(queryString, emptyMap())
 }
 
 fun tokens(inStr: List<String>, opt: CustomTokenOptions = CustomTokenOptions()) = TokensExpression(inStr, opt)
diff --git a/core/src/test/kotlin/ch/ergon/dope/buildTest/NumberFunctionsTest.kt b/core/src/test/kotlin/ch/ergon/dope/buildTest/NumberFunctionsTest.kt
@@ -12,6 +12,12 @@ import ch.ergon.dope.resolvable.expression.unaliased.type.function.numeric.atan
 import ch.ergon.dope.resolvable.expression.unaliased.type.function.numeric.atan2
 import ch.ergon.dope.resolvable.expression.unaliased.type.function.numeric.ceil
 import ch.ergon.dope.resolvable.expression.unaliased.type.function.numeric.cos
+import ch.ergon.dope.resolvable.expression.unaliased.type.function.numeric.degrees
+import ch.ergon.dope.resolvable.expression.unaliased.type.function.numeric.e
+import ch.ergon.dope.resolvable.expression.unaliased.type.function.numeric.exp
+import ch.ergon.dope.resolvable.expression.unaliased.type.function.numeric.floor
+import ch.ergon.dope.resolvable.expression.unaliased.type.function.numeric.ln
+import ch.ergon.dope.resolvable.expression.unaliased.type.function.numeric.log
 import ch.ergon.dope.resolvable.expression.unaliased.type.function.numeric.pi
 import ch.ergon.dope.resolvable.expression.unaliased.type.function.numeric.power
 import ch.ergon.dope.resolvable.expression.unaliased.type.function.numeric.radians
@@ -199,7 +205,7 @@ class NumberFunctionsTest : ManagerDependentTest {
     fun `should support DEGREES expression`() {
         val expected = "DEGREES(-1)"
 
-        val actual = ch.ergon.dope.resolvable.expression.unaliased.type.function.numeric.degrees(-1).toDopeQuery(manager).queryString
+        val actual = degrees(-1).toDopeQuery(manager).queryString
 
         assertEquals(expected, actual)
     }
@@ -208,7 +214,7 @@ class NumberFunctionsTest : ManagerDependentTest {
     fun `should support DEGREES expression with number field`() {
         val expected = "DEGREES(`numberField`)"
 
-        val actual = ch.ergon.dope.resolvable.expression.unaliased.type.function.numeric.degrees(someNumberField()).toDopeQuery(manager).queryString
+        val actual = degrees(someNumberField()).toDopeQuery(manager).queryString
 
         assertEquals(expected, actual)
     }
@@ -217,7 +223,7 @@ class NumberFunctionsTest : ManagerDependentTest {
     fun `should support E (euler) expression`() {
         val expected = "E()"
 
-        val actual = ch.ergon.dope.resolvable.expression.unaliased.type.function.numeric.e().toDopeQuery(manager).queryString
+        val actual = e().toDopeQuery(manager).queryString
 
         assertEquals(expected, actual)
     }
@@ -226,7 +232,7 @@ class NumberFunctionsTest : ManagerDependentTest {
     fun `should support EXP expression`() {
         val expected = "EXP(-1)"
 
-        val actual = ch.ergon.dope.resolvable.expression.unaliased.type.function.numeric.exp(-1).toDopeQuery(manager).queryString
+        val actual = exp(-1).toDopeQuery(manager).queryString
 
         assertEquals(expected, actual)
     }
@@ -235,7 +241,7 @@ class NumberFunctionsTest : ManagerDependentTest {
     fun `should support EXP expression with number field`() {
         val expected = "EXP(`numberField`)"
 
-        val actual = ch.ergon.dope.resolvable.expression.unaliased.type.function.numeric.exp(someNumberField()).toDopeQuery(manager).queryString
+        val actual = exp(someNumberField()).toDopeQuery(manager).queryString
 
         assertEquals(expected, actual)
     }
@@ -244,7 +250,7 @@ class NumberFunctionsTest : ManagerDependentTest {
     fun `should support LN expression`() {
         val expected = "LN(1)"
 
-        val actual = ch.ergon.dope.resolvable.expression.unaliased.type.function.numeric.ln(1).toDopeQuery(manager).queryString
+        val actual = ln(1).toDopeQuery(manager).queryString
 
         assertEquals(expected, actual)
     }
@@ -253,7 +259,7 @@ class NumberFunctionsTest : ManagerDependentTest {
     fun `should support LN expression with number field`() {
         val expected = "LN(`numberField`)"
 
-        val actual = ch.ergon.dope.resolvable.expression.unaliased.type.function.numeric.ln(someNumberField()).toDopeQuery(manager).queryString
+        val actual = ln(someNumberField()).toDopeQuery(manager).queryString
 
         assertEquals(expected, actual)
     }
@@ -262,7 +268,7 @@ class NumberFunctionsTest : ManagerDependentTest {
     fun `should support LOG expression`() {
         val expected = "LOG(1)"
 
-        val actual = ch.ergon.dope.resolvable.expression.unaliased.type.function.numeric.log(1).toDopeQuery(manager).queryString
+        val actual = log(1).toDopeQuery(manager).queryString
 
         assertEquals(expected, actual)
     }
@@ -271,7 +277,7 @@ class NumberFunctionsTest : ManagerDependentTest {
     fun `should support LOG expression with number field`() {
         val expected = "LOG(`numberField`)"
 
-        val actual = ch.ergon.dope.resolvable.expression.unaliased.type.function.numeric.log(someNumberField()).toDopeQuery(manager).queryString
+        val actual = log(someNumberField()).toDopeQuery(manager).queryString
 
         assertEquals(expected, actual)
     }
@@ -280,7 +286,7 @@ class NumberFunctionsTest : ManagerDependentTest {
     fun `should support FLOOR expression`() {
         val expected = "FLOOR(3.14)"
 
-        val actual = ch.ergon.dope.resolvable.expression.unaliased.type.function.numeric.floor(3.14).toDopeQuery(manager).queryString
+        val actual = floor(3.14).toDopeQuery(manager).queryString
 
         assertEquals(expected, actual)
     }
@@ -289,7 +295,7 @@ class NumberFunctionsTest : ManagerDependentTest {
     fun `should support FLOOR expression with number field`() {
         val expected = "FLOOR(`numberField`)"
 
-        val actual = ch.ergon.dope.resolvable.expression.unaliased.type.function.numeric.floor(someNumberField()).toDopeQuery(manager).queryString
+        val actual = floor(someNumberField()).toDopeQuery(manager).queryString
 
         assertEquals(expected, actual)
     }

diff --git a/core/src/test/kotlin/ch/ergon/dope/operators/collection/SatisfiesTest.kt b/core/src/test/kotlin/ch/ergon/dope/operators/collection/SatisfiesTest.kt
@@ -15,7 +15,6 @@ import ch.ergon.dope.resolvable.expression.unaliased.type.collection.every
 import ch.ergon.dope.resolvable.expression.unaliased.type.function.stringfunction.upper
 import ch.ergon.dope.resolvable.expression.unaliased.type.logical.and
 import ch.ergon.dope.resolvable.expression.unaliased.type.relational.isEqualTo
-import ch.ergon.dope.resolvable.expression.unaliased.type.stringfunction.upper
 import kotlin.test.Test
 import kotlin.test.assertEquals
 

diff --git a/...rrayfunction/ArrayAppendExpressionTest.kt → ...rrayfunction/ArrayAppendExpressionTest.kt b/...rrayfunction/ArrayAppendExpressionTest.kt → ...rrayfunction/ArrayAppendExpressionTest.kt
@@ -1,4 +1,4 @@
-package ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction
+package ch.ergon.dope.resolvable.expression.unaliased.type.function.arrayfunction
 
 import ch.ergon.dope.DopeQuery
 import ch.ergon.dope.DopeQueryManager
@@ -11,8 +11,6 @@ import ch.ergon.dope.helper.someNumberField
 import ch.ergon.dope.helper.someString
 import ch.ergon.dope.helper.someStringArrayField
 import ch.ergon.dope.resolvable.expression.unaliased.type.asParameter
-import ch.ergon.dope.resolvable.expression.unaliased.type.function.arrayfunction.ArrayAppendExpression
-import ch.ergon.dope.resolvable.expression.unaliased.type.function.arrayfunction.arrayAppend
 import ch.ergon.dope.resolvable.expression.unaliased.type.toDopeType
 import kotlin.test.Test
 import kotlin.test.assertEquals

diff --git a/...rayfunction/ArrayAverageExpressionTest.kt → ...rayfunction/ArrayAverageExpressionTest.kt b/...rayfunction/ArrayAverageExpressionTest.kt → ...rayfunction/ArrayAverageExpressionTest.kt
@@ -1,12 +1,10 @@
-package ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction
+package ch.ergon.dope.resolvable.expression.unaliased.type.function.arrayfunction
 
 import ch.ergon.dope.DopeQuery
 import ch.ergon.dope.DopeQueryManager
 import ch.ergon.dope.helper.ManagerDependentTest
 import ch.ergon.dope.helper.someNumberArrayField
 import ch.ergon.dope.resolvable.expression.unaliased.type.asParameter
-import ch.ergon.dope.resolvable.expression.unaliased.type.function.arrayfunction.ArrayAverageExpression
-import ch.ergon.dope.resolvable.expression.unaliased.type.function.arrayfunction.arrayAverage
 import kotlin.test.Test
 import kotlin.test.assertEquals
 

diff --git a/...nction/ArrayBinarySearchExpressionTest.kt → ...nction/ArrayBinarySearchExpressionTest.kt b/...nction/ArrayBinarySearchExpressionTest.kt → ...nction/ArrayBinarySearchExpressionTest.kt
@@ -1,4 +1,4 @@
-package ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction
+package ch.ergon.dope.resolvable.expression.unaliased.type.function.arrayfunction
 
 import ch.ergon.dope.DopeQuery
 import ch.ergon.dope.DopeQueryManager
@@ -11,8 +11,6 @@ import ch.ergon.dope.helper.someNumberField
 import ch.ergon.dope.helper.someString
 import ch.ergon.dope.helper.someStringArrayField
 import ch.ergon.dope.resolvable.expression.unaliased.type.asParameter
-import ch.ergon.dope.resolvable.expression.unaliased.type.function.arrayfunction.ArrayBinarySearchExpression
-import ch.ergon.dope.resolvable.expression.unaliased.type.function.arrayfunction.arrayBinarySearch
 import ch.ergon.dope.resolvable.expression.unaliased.type.toDopeType
 import kotlin.test.Test
 import kotlin.test.assertEquals

diff --git a/...rrayfunction/ArrayConcatExpressionTest.kt → ...rrayfunction/ArrayConcatExpressionTest.kt b/...rrayfunction/ArrayConcatExpressionTest.kt → ...rrayfunction/ArrayConcatExpressionTest.kt
@@ -1,12 +1,10 @@
-package ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction
+package ch.ergon.dope.resolvable.expression.unaliased.type.function.arrayfunction
 
 import ch.ergon.dope.DopeQuery
 import ch.ergon.dope.DopeQueryManager
 import ch.ergon.dope.helper.ManagerDependentTest
 import ch.ergon.dope.helper.someNumberArrayField
 import ch.ergon.dope.resolvable.expression.unaliased.type.asParameter
-import ch.ergon.dope.resolvable.expression.unaliased.type.function.arrayfunction.ArrayConcatExpression
-import ch.ergon.dope.resolvable.expression.unaliased.type.function.arrayfunction.arrayConcat
 import kotlin.test.Test
 import kotlin.test.assertEquals
 

diff --git a/...ayfunction/ArrayContainsExpressionTest.kt → ...ayfunction/ArrayContainsExpressionTest.kt b/...ayfunction/ArrayContainsExpressionTest.kt → ...ayfunction/ArrayContainsExpressionTest.kt
@@ -1,4 +1,4 @@
-package ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction
+package ch.ergon.dope.resolvable.expression.unaliased.type.function.arrayfunction
 
 import ch.ergon.dope.DopeQuery
 import ch.ergon.dope.DopeQueryManager
@@ -8,8 +8,6 @@ import ch.ergon.dope.helper.someNumberArrayField
 import ch.ergon.dope.helper.someNumberField
 import ch.ergon.dope.helper.someStringArrayField
 import ch.ergon.dope.resolvable.expression.unaliased.type.asParameter
-import ch.ergon.dope.resolvable.expression.unaliased.type.function.arrayfunction.ArrayContainsExpression
-import ch.ergon.dope.resolvable.expression.unaliased.type.function.arrayfunction.arrayContains
 import ch.ergon.dope.resolvable.expression.unaliased.type.toDopeType
 import kotlin.test.Test
 import kotlin.test.assertEquals

diff --git a/...arrayfunction/ArrayCountExpressionTest.kt → ...arrayfunction/ArrayCountExpressionTest.kt b/...arrayfunction/ArrayCountExpressionTest.kt → ...arrayfunction/ArrayCountExpressionTest.kt
@@ -1,12 +1,10 @@
-package ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction
+package ch.ergon.dope.resolvable.expression.unaliased.type.function.arrayfunction
 
 import ch.ergon.dope.DopeQuery
 import ch.ergon.dope.DopeQueryManager
 import ch.ergon.dope.helper.ManagerDependentTest
 import ch.ergon.dope.helper.someNumberArrayField
 import ch.ergon.dope.resolvable.expression.unaliased.type.asParameter
-import ch.ergon.dope.resolvable.expression.unaliased.type.function.arrayfunction.ArrayCountExpression
-import ch.ergon.dope.resolvable.expression.unaliased.type.function.arrayfunction.arrayCount
 import kotlin.test.Test
 import kotlin.test.assertEquals
 

diff --git a/...ayfunction/ArrayDistinctExpressionTest.kt → ...ayfunction/ArrayDistinctExpressionTest.kt b/...ayfunction/ArrayDistinctExpressionTest.kt → ...ayfunction/ArrayDistinctExpressionTest.kt
@@ -1,12 +1,10 @@
-package ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction
+package ch.ergon.dope.resolvable.expression.unaliased.type.function.arrayfunction
 
 import ch.ergon.dope.DopeQuery
 import ch.ergon.dope.DopeQueryManager
 import ch.ergon.dope.helper.ManagerDependentTest
 import ch.ergon.dope.helper.someNumberArrayField
 import ch.ergon.dope.resolvable.expression.unaliased.type.asParameter
-import ch.ergon.dope.resolvable.expression.unaliased.type.function.arrayfunction.ArrayDistinctExpression
-import ch.ergon.dope.resolvable.expression.unaliased.type.function.arrayfunction.arrayDistinct
 import kotlin.test.Test
 import kotlin.test.assertEquals
 

diff --git a/...rrayfunction/ArrayExceptExpressionTest.kt → ...rrayfunction/ArrayExceptExpressionTest.kt b/...rrayfunction/ArrayExceptExpressionTest.kt → ...rrayfunction/ArrayExceptExpressionTest.kt
@@ -1,12 +1,10 @@
-package ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction
+package ch.ergon.dope.resolvable.expression.unaliased.type.function.arrayfunction
 
 import ch.ergon.dope.DopeQuery
 import ch.ergon.dope.DopeQueryManager
 import ch.ergon.dope.helper.ManagerDependentTest
 import ch.ergon.dope.helper.someNumberArrayField
 import ch.ergon.dope.resolvable.expression.unaliased.type.asParameter
-import ch.ergon.dope.resolvable.expression.unaliased.type.function.arrayfunction.ArrayExceptExpression
-import ch.ergon.dope.resolvable.expression.unaliased.type.function.arrayfunction.arrayExcept
 import kotlin.test.Test
 import kotlin.test.assertEquals
 

diff --git a/...rayfunction/ArrayFlattenExpressionTest.kt → ...rayfunction/ArrayFlattenExpressionTest.kt b/...rayfunction/ArrayFlattenExpressionTest.kt → ...rayfunction/ArrayFlattenExpressionTest.kt
@@ -1,13 +1,11 @@
-package ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction
+package ch.ergon.dope.resolvable.expression.unaliased.type.function.arrayfunction
 
 import ch.ergon.dope.DopeQuery
 import ch.ergon.dope.DopeQueryManager
 import ch.ergon.dope.helper.ManagerDependentTest
 import ch.ergon.dope.helper.someNumberArrayField
 import ch.ergon.dope.helper.someNumberField
 import ch.ergon.dope.resolvable.expression.unaliased.type.asParameter
-import ch.ergon.dope.resolvable.expression.unaliased.type.function.arrayfunction.ArrayFlattenExpression
-import ch.ergon.dope.resolvable.expression.unaliased.type.function.arrayfunction.arrayFlatten
 import ch.ergon.dope.resolvable.expression.unaliased.type.toDopeType
 import kotlin.test.Test
 import kotlin.test.assertEquals

diff --git a/...rrayfunction/ArrayIfNullExpressionTest.kt → ...rrayfunction/ArrayIfNullExpressionTest.kt b/...rrayfunction/ArrayIfNullExpressionTest.kt → ...rrayfunction/ArrayIfNullExpressionTest.kt
@@ -1,12 +1,10 @@
-package ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction
+package ch.ergon.dope.resolvable.expression.unaliased.type.function.arrayfunction
 
 import ch.ergon.dope.DopeQuery
 import ch.ergon.dope.DopeQueryManager
 import ch.ergon.dope.helper.ManagerDependentTest
 import ch.ergon.dope.helper.someNumberArrayField
 import ch.ergon.dope.resolvable.expression.unaliased.type.asParameter
-import ch.ergon.dope.resolvable.expression.unaliased.type.function.arrayfunction.ArrayIfNullExpression
-import ch.ergon.dope.resolvable.expression.unaliased.type.function.arrayfunction.arrayIfNull
 import kotlin.test.Test
 import kotlin.test.assertEquals
 

diff --git a/...rrayfunction/ArrayInsertExpressionTest.kt → ...rrayfunction/ArrayInsertExpressionTest.kt b/...rrayfunction/ArrayInsertExpressionTest.kt → ...rrayfunction/ArrayInsertExpressionTest.kt
@@ -1,4 +1,4 @@
-package ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction
+package ch.ergon.dope.resolvable.expression.unaliased.type.function.arrayfunction
 
 import ch.ergon.dope.DopeQuery
 import ch.ergon.dope.DopeQueryManager
@@ -11,8 +11,6 @@ import ch.ergon.dope.helper.someNumberField
 import ch.ergon.dope.helper.someString
 import ch.ergon.dope.helper.someStringArrayField
 import ch.ergon.dope.resolvable.expression.unaliased.type.asParameter
-import ch.ergon.dope.resolvable.expression.unaliased.type.function.arrayfunction.ArrayInsertExpression
-import ch.ergon.dope.resolvable.expression.unaliased.type.function.arrayfunction.arrayInsert
 import ch.ergon.dope.resolvable.expression.unaliased.type.toDopeType
 import kotlin.test.Test
 import kotlin.test.assertEquals

diff --git a/...yfunction/ArrayIntersectExpressionTest.kt → ...yfunction/ArrayIntersectExpressionTest.kt b/...yfunction/ArrayIntersectExpressionTest.kt → ...yfunction/ArrayIntersectExpressionTest.kt
@@ -1,12 +1,10 @@
-package ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction
+package ch.ergon.dope.resolvable.expression.unaliased.type.function.arrayfunction
 
 import ch.ergon.dope.DopeQuery
 import ch.ergon.dope.DopeQueryManager
 import ch.ergon.dope.helper.ManagerDependentTest
 import ch.ergon.dope.helper.someNumberArrayField
 import ch.ergon.dope.resolvable.expression.unaliased.type.asParameter
-import ch.ergon.dope.resolvable.expression.unaliased.type.function.arrayfunction.ArrayIntersectExpression
-import ch.ergon.dope.resolvable.expression.unaliased.type.function.arrayfunction.arrayIntersect
 import kotlin.test.Test
 import kotlin.test.assertEquals
 

diff --git a/...rrayfunction/ArrayLengthExpressionTest.kt → ...rrayfunction/ArrayLengthExpressionTest.kt b/...rrayfunction/ArrayLengthExpressionTest.kt → ...rrayfunction/ArrayLengthExpressionTest.kt
@@ -1,12 +1,10 @@
-package ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction
+package ch.ergon.dope.resolvable.expression.unaliased.type.function.arrayfunction
 
 import ch.ergon.dope.DopeQuery
 import ch.ergon.dope.DopeQueryManager
 import ch.ergon.dope.helper.ManagerDependentTest
 import ch.ergon.dope.helper.someNumberArrayField
 import ch.ergon.dope.resolvable.expression.unaliased.type.asParameter
-import ch.ergon.dope.resolvable.expression.unaliased.type.function.arrayfunction.ArrayLengthExpression
-import ch.ergon.dope.resolvable.expression.unaliased.type.function.arrayfunction.arrayLength
 import kotlin.test.Test
 import kotlin.test.assertEquals
 

diff --git a/...e/arrayfunction/ArrayMaxExpressionTest.kt → ...n/arrayfunction/ArrayMaxExpressionTest.kt b/...e/arrayfunction/ArrayMaxExpressionTest.kt → ...n/arrayfunction/ArrayMaxExpressionTest.kt
@@ -1,12 +1,10 @@
-package ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction
+package ch.ergon.dope.resolvable.expression.unaliased.type.function.arrayfunction
 
 import ch.ergon.dope.DopeQuery
 import ch.ergon.dope.DopeQueryManager
 import ch.ergon.dope.helper.ManagerDependentTest
 import ch.ergon.dope.helper.someNumberArrayField
 import ch.ergon.dope.resolvable.expression.unaliased.type.asParameter
-import ch.ergon.dope.resolvable.expression.unaliased.type.function.arrayfunction.ArrayMaxExpression
-import ch.ergon.dope.resolvable.expression.unaliased.type.function.arrayfunction.arrayMax
 import kotlin.test.Test
 import kotlin.test.assertEquals
 

diff --git a/...e/arrayfunction/ArrayMinExpressionTest.kt → ...n/arrayfunction/ArrayMinExpressionTest.kt b/...e/arrayfunction/ArrayMinExpressionTest.kt → ...n/arrayfunction/ArrayMinExpressionTest.kt
@@ -1,12 +1,10 @@
-package ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction
+package ch.ergon.dope.resolvable.expression.unaliased.type.function.arrayfunction
 
 import ch.ergon.dope.DopeQuery
 import ch.ergon.dope.DopeQueryManager
 import ch.ergon.dope.helper.ManagerDependentTest
 import ch.ergon.dope.helper.someNumberArrayField
 import ch.ergon.dope.resolvable.expression.unaliased.type.asParameter
-import ch.ergon.dope.resolvable.expression.unaliased.type.function.arrayfunction.ArrayMinExpression
-import ch.ergon.dope.resolvable.expression.unaliased.type.function.arrayfunction.arrayMin
 import kotlin.test.Test
 import kotlin.test.assertEquals
 

diff --git a/.../arrayfunction/ArrayMoveExpressionTest.kt → .../arrayfunction/ArrayMoveExpressionTest.kt b/.../arrayfunction/ArrayMoveExpressionTest.kt → .../arrayfunction/ArrayMoveExpressionTest.kt
@@ -1,12 +1,10 @@
-package ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction
+package ch.ergon.dope.resolvable.expression.unaliased.type.function.arrayfunction
 
 import ch.ergon.dope.DopeQuery
 import ch.ergon.dope.DopeQueryManager
 import ch.ergon.dope.helper.ManagerDependentTest
 import ch.ergon.dope.helper.someNumberArrayField
 import ch.ergon.dope.resolvable.expression.unaliased.type.asParameter
-import ch.ergon.dope.resolvable.expression.unaliased.type.function.arrayfunction.ArrayMoveExpression
-import ch.ergon.dope.resolvable.expression.unaliased.type.function.arrayfunction.arrayMove
 import ch.ergon.dope.resolvable.expression.unaliased.type.toDopeType
 import kotlin.test.Test
 import kotlin.test.assertEquals