DOPE-226: renamed variables, renamed test package

ergon · Jul 11, 2024 · a367c32 · a367c32
1 parent 7996588
commit a367c32
Show file tree

Hide file tree

Showing 29 changed files with 53 additions and 96 deletions.
diff --git a/...ch/ergon/dope/resolvable/expression/unaliased/type/arrayfunction/ArrayAppendExpression.kt b/...ch/ergon/dope/resolvable/expression/unaliased/type/arrayfunction/ArrayAppendExpression.kt
@@ -7,11 +7,11 @@ import ch.ergon.dope.validtype.ValidType
 class ArrayAppendExpression<T : ValidType>(
     array: TypeExpression<ArrayType<T>>,
     value: TypeExpression<T>,
-    vararg values: TypeExpression<T>,
-) : ArrayFunctionExpression<T>("ARRAY_APPEND", array, value, *values)
+    vararg additionalValues: TypeExpression<T>,
+) : ArrayFunctionExpression<T>("ARRAY_APPEND", array, value, *additionalValues)
 
 fun <T : ValidType> arrayAppend(
     array: TypeExpression<ArrayType<T>>,
     value: TypeExpression<T>,
-    vararg values: TypeExpression<T>,
-) = ArrayAppendExpression(array, value, *values)
+    vararg additionalValues: TypeExpression<T>,
+) = ArrayAppendExpression(array, value, *additionalValues)
diff --git a/...ch/ergon/dope/resolvable/expression/unaliased/type/arrayfunction/ArrayInsertExpression.kt b/...ch/ergon/dope/resolvable/expression/unaliased/type/arrayfunction/ArrayInsertExpression.kt
@@ -10,19 +10,19 @@ class ArrayInsertExpression<T : ValidType>(
     array: TypeExpression<ArrayType<T>>,
     position: TypeExpression<NumberType>,
     value: TypeExpression<T>,
-    vararg values: TypeExpression<T>,
-) : ArrayFunctionExpression<T>("ARRAY_INSERT", array, position, value, *values)
+    vararg additionalValues: TypeExpression<T>,
+) : ArrayFunctionExpression<T>("ARRAY_INSERT", array, position, value, *additionalValues)
 
 fun <T : ValidType> arrayInsert(
     array: TypeExpression<ArrayType<T>>,
     position: TypeExpression<NumberType>,
     value: TypeExpression<T>,
-    vararg values: TypeExpression<T>,
-) = ArrayInsertExpression(array, position, value, *values)
+    vararg additionalValues: TypeExpression<T>,
+) = ArrayInsertExpression(array, position, value, *additionalValues)
 
 fun <T : ValidType> arrayInsert(
     array: TypeExpression<ArrayType<T>>,
     position: Number,
     value: TypeExpression<T>,
-    vararg values: TypeExpression<T>,
-) = arrayInsert(array, position.toDopeType(), value, *values)
+    vararg additionalValues: TypeExpression<T>,
+) = arrayInsert(array, position.toDopeType(), value, *additionalValues)
diff --git a/...h/ergon/dope/resolvable/expression/unaliased/type/arrayfunction/ArrayPrependExpression.kt b/...h/ergon/dope/resolvable/expression/unaliased/type/arrayfunction/ArrayPrependExpression.kt
@@ -9,15 +9,20 @@ import ch.ergon.dope.validtype.ValidType
 class ArrayPrependExpression<T : ValidType>(
     private val array: TypeExpression<ArrayType<T>>,
     private val value: TypeExpression<T>,
-    private vararg val values: TypeExpression<T>,
+    private vararg val additionalValues: TypeExpression<T>,
 ) : TypeExpression<ArrayType<T>>, FunctionOperator {
     override fun toDopeQuery(): DopeQuery {
         val arrayDopeQuery = array.toDopeQuery()
         val valueDopeQuery = value.toDopeQuery()
-        val valuesDopeQuery = values.map { it.toDopeQuery() }
+        val additionalValuesDopeQuery = additionalValues.map { it.toDopeQuery() }
         return DopeQuery(
-            queryString = toFunctionQueryString("ARRAY_PREPEND", valueDopeQuery, *valuesDopeQuery.toTypedArray(), arrayDopeQuery),
-            parameters = arrayDopeQuery.parameters + valueDopeQuery.parameters + valuesDopeQuery.fold(
+            queryString = toFunctionQueryString(
+                "ARRAY_PREPEND",
+                valueDopeQuery,
+                *additionalValuesDopeQuery.toTypedArray(),
+                arrayDopeQuery,
+            ),
+            parameters = arrayDopeQuery.parameters + valueDopeQuery.parameters + additionalValuesDopeQuery.fold(
                 emptyMap(),
             ) { argsParameters, field -> argsParameters + field.parameters },
         )
@@ -27,5 +32,5 @@ class ArrayPrependExpression<T : ValidType>(
 fun <T : ValidType> arrayPrepend(
     array: TypeExpression<ArrayType<T>>,
     value: TypeExpression<T>,
-    vararg values: TypeExpression<T>,
-) = ArrayPrependExpression(array, value, *values)
+    vararg additionalValues: TypeExpression<T>,
+) = ArrayPrependExpression(array, value, *additionalValues)
diff --git a/...in/ch/ergon/dope/resolvable/expression/unaliased/type/arrayfunction/ArrayPutExpression.kt b/...in/ch/ergon/dope/resolvable/expression/unaliased/type/arrayfunction/ArrayPutExpression.kt
@@ -7,11 +7,11 @@ import ch.ergon.dope.validtype.ValidType
 class ArrayPutExpression<T : ValidType>(
     array: TypeExpression<ArrayType<T>>,
     value: TypeExpression<T>,
-    vararg values: TypeExpression<T>,
-) : ArrayFunctionExpression<T>("ARRAY_PUT", array, value, *values)
+    vararg additionalValues: TypeExpression<T>,
+) : ArrayFunctionExpression<T>("ARRAY_PUT", array, value, *additionalValues)
 
 fun <T : ValidType> arrayPut(
     array: TypeExpression<ArrayType<T>>,
     value: TypeExpression<T>,
-    vararg values: TypeExpression<T>,
-) = ArrayPutExpression(array, value, *values)
+    vararg additionalValues: TypeExpression<T>,
+) = ArrayPutExpression(array, value, *additionalValues)
diff --git a/...ch/ergon/dope/resolvable/expression/unaliased/type/arrayfunction/ArrayRemoveExpression.kt b/...ch/ergon/dope/resolvable/expression/unaliased/type/arrayfunction/ArrayRemoveExpression.kt
@@ -7,11 +7,11 @@ import ch.ergon.dope.validtype.ValidType
 class ArrayRemoveExpression<T : ValidType>(
     array: TypeExpression<ArrayType<T>>,
     value: TypeExpression<T>,
-    vararg values: TypeExpression<T>,
-) : ArrayFunctionExpression<T>("ARRAY_REMOVE", array, value, *values)
+    vararg additionalValues: TypeExpression<T>,
+) : ArrayFunctionExpression<T>("ARRAY_REMOVE", array, value, *additionalValues)
 
 fun <T : ValidType> arrayRemove(
     array: TypeExpression<ArrayType<T>>,
     value: TypeExpression<T>,
-    vararg values: TypeExpression<T>,
-) = ArrayRemoveExpression(array, value, *values)
+    vararg additionalValues: TypeExpression<T>,
+) = ArrayRemoveExpression(array, value, *additionalValues)
diff --git a/...nction/array/ArrayAppendExpressionTest.kt → ...rrayfunction/ArrayAppendExpressionTest.kt b/...nction/array/ArrayAppendExpressionTest.kt → ...rrayfunction/ArrayAppendExpressionTest.kt
@@ -1,11 +1,9 @@
-package ch.ergon.dope.function.array
+package ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction
 
 import ch.ergon.dope.DopeQuery
 import ch.ergon.dope.helper.someNumberArrayField
 import ch.ergon.dope.helper.someNumberField
 import ch.ergon.dope.resolvable.expression.unaliased.type.ParameterManager
-import ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction.ArrayAppendExpression
-import ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction.arrayAppend
 import ch.ergon.dope.resolvable.expression.unaliased.type.asParameter
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.BeforeEach

diff --git a/...ction/array/ArrayAverageExpressionTest.kt → ...rayfunction/ArrayAverageExpressionTest.kt b/...ction/array/ArrayAverageExpressionTest.kt → ...rayfunction/ArrayAverageExpressionTest.kt
@@ -1,10 +1,8 @@
-package ch.ergon.dope.function.array
+package ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction
 
 import ch.ergon.dope.DopeQuery
 import ch.ergon.dope.helper.someNumberArrayField
 import ch.ergon.dope.resolvable.expression.unaliased.type.ParameterManager
-import ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction.ArrayAverageExpression
-import ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction.arrayAverage
 import ch.ergon.dope.resolvable.expression.unaliased.type.asParameter
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.BeforeEach

diff --git a/...nction/array/ArrayConcatExpressionTest.kt → ...rrayfunction/ArrayConcatExpressionTest.kt b/...nction/array/ArrayConcatExpressionTest.kt → ...rrayfunction/ArrayConcatExpressionTest.kt
@@ -1,10 +1,8 @@
-package ch.ergon.dope.function.array
+package ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction
 
 import ch.ergon.dope.DopeQuery
 import ch.ergon.dope.helper.someNumberArrayField
 import ch.ergon.dope.resolvable.expression.unaliased.type.ParameterManager
-import ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction.ArrayConcatExpression
-import ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction.arrayConcat
 import ch.ergon.dope.resolvable.expression.unaliased.type.asParameter
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.BeforeEach

diff --git a/...tion/array/ArrayContainsExpressionTest.kt → ...ayfunction/ArrayContainsExpressionTest.kt b/...tion/array/ArrayContainsExpressionTest.kt → ...ayfunction/ArrayContainsExpressionTest.kt
@@ -1,13 +1,11 @@
-package ch.ergon.dope.function.array
+package ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction
 
 import ch.ergon.dope.DopeQuery
 import ch.ergon.dope.helper.someBooleanArrayField
 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.ParameterManager
-import ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction.ArrayContainsExpression
-import ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction.arrayContains
 import ch.ergon.dope.resolvable.expression.unaliased.type.asParameter
 import ch.ergon.dope.resolvable.expression.unaliased.type.toDopeType
 import org.junit.jupiter.api.Assertions.assertEquals

diff --git a/...unction/array/ArrayCountExpressionTest.kt → ...arrayfunction/ArrayCountExpressionTest.kt b/...unction/array/ArrayCountExpressionTest.kt → ...arrayfunction/ArrayCountExpressionTest.kt
@@ -1,10 +1,8 @@
-package ch.ergon.dope.function.array
+package ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction
 
 import ch.ergon.dope.DopeQuery
 import ch.ergon.dope.helper.someNumberArrayField
 import ch.ergon.dope.resolvable.expression.unaliased.type.ParameterManager
-import ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction.ArrayCountExpression
-import ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction.arrayCount
 import ch.ergon.dope.resolvable.expression.unaliased.type.asParameter
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.BeforeEach

diff --git a/...tion/array/ArrayDistinctExpressionTest.kt → ...ayfunction/ArrayDistinctExpressionTest.kt b/...tion/array/ArrayDistinctExpressionTest.kt → ...ayfunction/ArrayDistinctExpressionTest.kt
@@ -1,10 +1,8 @@
-package ch.ergon.dope.function.array
+package ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction
 
 import ch.ergon.dope.DopeQuery
 import ch.ergon.dope.helper.someNumberArrayField
 import ch.ergon.dope.resolvable.expression.unaliased.type.ParameterManager
-import ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction.ArrayDistinctExpression
-import ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction.arrayDistinct
 import ch.ergon.dope.resolvable.expression.unaliased.type.asParameter
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.BeforeEach

diff --git a/...nction/array/ArrayExceptExpressionTest.kt → ...rrayfunction/ArrayExceptExpressionTest.kt b/...nction/array/ArrayExceptExpressionTest.kt → ...rrayfunction/ArrayExceptExpressionTest.kt
@@ -1,10 +1,8 @@
-package ch.ergon.dope.function.array
+package ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction
 
 import ch.ergon.dope.DopeQuery
 import ch.ergon.dope.helper.someNumberArrayField
 import ch.ergon.dope.resolvable.expression.unaliased.type.ParameterManager
-import ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction.ArrayExceptExpression
-import ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction.arrayExcept
 import ch.ergon.dope.resolvable.expression.unaliased.type.asParameter
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.BeforeEach

diff --git a/...ction/array/ArrayFlattenExpressionTest.kt → ...rayfunction/ArrayFlattenExpressionTest.kt b/...ction/array/ArrayFlattenExpressionTest.kt → ...rayfunction/ArrayFlattenExpressionTest.kt
@@ -1,11 +1,9 @@
-package ch.ergon.dope.function.array
+package ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction
 
 import ch.ergon.dope.DopeQuery
 import ch.ergon.dope.helper.someNumberArrayField
 import ch.ergon.dope.helper.someNumberField
 import ch.ergon.dope.resolvable.expression.unaliased.type.ParameterManager
-import ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction.ArrayFlattenExpression
-import ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction.arrayFlatten
 import ch.ergon.dope.resolvable.expression.unaliased.type.asParameter
 import ch.ergon.dope.resolvable.expression.unaliased.type.toDopeType
 import org.junit.jupiter.api.Assertions.assertEquals

diff --git a/...nction/array/ArrayIfNullExpressionTest.kt → ...rrayfunction/ArrayIfNullExpressionTest.kt b/...nction/array/ArrayIfNullExpressionTest.kt → ...rrayfunction/ArrayIfNullExpressionTest.kt
@@ -1,10 +1,8 @@
-package ch.ergon.dope.function.array
+package ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction
 
 import ch.ergon.dope.DopeQuery
 import ch.ergon.dope.helper.someNumberArrayField
 import ch.ergon.dope.resolvable.expression.unaliased.type.ParameterManager
-import ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction.ArrayIfNullExpression
-import ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction.arrayIfNull
 import ch.ergon.dope.resolvable.expression.unaliased.type.asParameter
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.BeforeEach

diff --git a/...nction/array/ArrayInsertExpressionTest.kt → ...rrayfunction/ArrayInsertExpressionTest.kt b/...nction/array/ArrayInsertExpressionTest.kt → ...rrayfunction/ArrayInsertExpressionTest.kt
@@ -1,11 +1,9 @@
-package ch.ergon.dope.function.array
+package ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction
 
 import ch.ergon.dope.DopeQuery
 import ch.ergon.dope.helper.someNumberArrayField
 import ch.ergon.dope.helper.someNumberField
 import ch.ergon.dope.resolvable.expression.unaliased.type.ParameterManager
-import ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction.ArrayInsertExpression
-import ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction.arrayInsert
 import ch.ergon.dope.resolvable.expression.unaliased.type.asParameter
 import ch.ergon.dope.resolvable.expression.unaliased.type.toDopeType
 import org.junit.jupiter.api.Assertions.assertEquals

diff --git a/...ion/array/ArrayIntersectExpressionTest.kt → ...yfunction/ArrayIntersectExpressionTest.kt b/...ion/array/ArrayIntersectExpressionTest.kt → ...yfunction/ArrayIntersectExpressionTest.kt
@@ -1,10 +1,8 @@
-package ch.ergon.dope.function.array
+package ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction
 
 import ch.ergon.dope.DopeQuery
 import ch.ergon.dope.helper.someNumberArrayField
 import ch.ergon.dope.resolvable.expression.unaliased.type.ParameterManager
-import ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction.ArrayIntersectExpression
-import ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction.arrayIntersect
 import ch.ergon.dope.resolvable.expression.unaliased.type.asParameter
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.BeforeEach

diff --git a/...nction/array/ArrayLengthExpressionTest.kt → ...rrayfunction/ArrayLengthExpressionTest.kt b/...nction/array/ArrayLengthExpressionTest.kt → ...rrayfunction/ArrayLengthExpressionTest.kt
@@ -1,10 +1,8 @@
-package ch.ergon.dope.function.array
+package ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction
 
 import ch.ergon.dope.DopeQuery
 import ch.ergon.dope.helper.someNumberArrayField
 import ch.ergon.dope.resolvable.expression.unaliased.type.ParameterManager
-import ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction.ArrayLengthExpression
-import ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction.arrayLength
 import ch.ergon.dope.resolvable.expression.unaliased.type.asParameter
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.BeforeEach

diff --git a/.../function/array/ArrayMaxExpressionTest.kt → ...e/arrayfunction/ArrayMaxExpressionTest.kt b/.../function/array/ArrayMaxExpressionTest.kt → ...e/arrayfunction/ArrayMaxExpressionTest.kt
@@ -1,10 +1,8 @@
-package ch.ergon.dope.function.array
+package ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction
 
 import ch.ergon.dope.DopeQuery
 import ch.ergon.dope.helper.someNumberArrayField
 import ch.ergon.dope.resolvable.expression.unaliased.type.ParameterManager
-import ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction.ArrayMaxExpression
-import ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction.arrayMax
 import ch.ergon.dope.resolvable.expression.unaliased.type.asParameter
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.BeforeEach

diff --git a/.../function/array/ArrayMinExpressionTest.kt → ...e/arrayfunction/ArrayMinExpressionTest.kt b/.../function/array/ArrayMinExpressionTest.kt → ...e/arrayfunction/ArrayMinExpressionTest.kt
@@ -1,10 +1,8 @@
-package ch.ergon.dope.function.array
+package ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction
 
 import ch.ergon.dope.DopeQuery
 import ch.ergon.dope.helper.someNumberArrayField
 import ch.ergon.dope.resolvable.expression.unaliased.type.ParameterManager
-import ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction.ArrayMinExpression
-import ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction.arrayMin
 import ch.ergon.dope.resolvable.expression.unaliased.type.asParameter
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.BeforeEach

diff --git a/...function/array/ArrayMoveExpressionTest.kt → .../arrayfunction/ArrayMoveExpressionTest.kt b/...function/array/ArrayMoveExpressionTest.kt → .../arrayfunction/ArrayMoveExpressionTest.kt
@@ -1,10 +1,8 @@
-package ch.ergon.dope.function.array
+package ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction
 
 import ch.ergon.dope.DopeQuery
 import ch.ergon.dope.helper.someNumberArrayField
 import ch.ergon.dope.resolvable.expression.unaliased.type.ParameterManager
-import ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction.ArrayMoveExpression
-import ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction.arrayMove
 import ch.ergon.dope.resolvable.expression.unaliased.type.asParameter
 import ch.ergon.dope.resolvable.expression.unaliased.type.toDopeType
 import org.junit.jupiter.api.Assertions.assertEquals

diff --git a/...tion/array/ArrayPositionExpressionTest.kt → ...ayfunction/ArrayPositionExpressionTest.kt b/...tion/array/ArrayPositionExpressionTest.kt → ...ayfunction/ArrayPositionExpressionTest.kt
@@ -1,11 +1,9 @@
-package ch.ergon.dope.function.array
+package ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction
 
 import ch.ergon.dope.DopeQuery
 import ch.ergon.dope.helper.someNumberArrayField
 import ch.ergon.dope.helper.someNumberField
 import ch.ergon.dope.resolvable.expression.unaliased.type.ParameterManager
-import ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction.ArrayPositionExpression
-import ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction.arrayPosition
 import ch.ergon.dope.resolvable.expression.unaliased.type.asParameter
 import ch.ergon.dope.resolvable.expression.unaliased.type.toDopeType
 import org.junit.jupiter.api.Assertions.assertEquals

diff --git a/...ction/array/ArrayPrependExpressionTest.kt → ...rayfunction/ArrayPrependExpressionTest.kt b/...ction/array/ArrayPrependExpressionTest.kt → ...rayfunction/ArrayPrependExpressionTest.kt
@@ -1,11 +1,9 @@
-package ch.ergon.dope.function.array
+package ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction
 
 import ch.ergon.dope.DopeQuery
 import ch.ergon.dope.helper.someNumberArrayField
 import ch.ergon.dope.helper.someNumberField
 import ch.ergon.dope.resolvable.expression.unaliased.type.ParameterManager
-import ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction.ArrayPrependExpression
-import ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction.arrayPrepend
 import ch.ergon.dope.resolvable.expression.unaliased.type.asParameter
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.BeforeEach

diff --git a/.../function/array/ArrayPutExpressionTest.kt → ...e/arrayfunction/ArrayPutExpressionTest.kt b/.../function/array/ArrayPutExpressionTest.kt → ...e/arrayfunction/ArrayPutExpressionTest.kt
@@ -1,11 +1,9 @@
-package ch.ergon.dope.function.array
+package ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction
 
 import ch.ergon.dope.DopeQuery
 import ch.ergon.dope.helper.someNumberArrayField
 import ch.ergon.dope.helper.someNumberField
 import ch.ergon.dope.resolvable.expression.unaliased.type.ParameterManager
-import ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction.ArrayPutExpression
-import ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction.arrayPut
 import ch.ergon.dope.resolvable.expression.unaliased.type.asParameter
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.BeforeEach

diff --git a/...nction/array/ArrayRemoveExpressionTest.kt → ...rrayfunction/ArrayRemoveExpressionTest.kt b/...nction/array/ArrayRemoveExpressionTest.kt → ...rrayfunction/ArrayRemoveExpressionTest.kt
@@ -1,11 +1,9 @@
-package ch.ergon.dope.function.array
+package ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction
 
 import ch.ergon.dope.DopeQuery
 import ch.ergon.dope.helper.someNumberArrayField
 import ch.ergon.dope.helper.someNumberField
 import ch.ergon.dope.resolvable.expression.unaliased.type.ParameterManager
-import ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction.ArrayRemoveExpression
-import ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction.arrayRemove
 import ch.ergon.dope.resolvable.expression.unaliased.type.asParameter
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.BeforeEach

diff --git a/...ction/array/ArrayReplaceExpressionTest.kt → ...rayfunction/ArrayReplaceExpressionTest.kt b/...ction/array/ArrayReplaceExpressionTest.kt → ...rayfunction/ArrayReplaceExpressionTest.kt
@@ -1,11 +1,9 @@
-package ch.ergon.dope.function.array
+package ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction
 
 import ch.ergon.dope.DopeQuery
 import ch.ergon.dope.helper.someNumberArrayField
 import ch.ergon.dope.helper.someNumberField
 import ch.ergon.dope.resolvable.expression.unaliased.type.ParameterManager
-import ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction.ArrayReplaceExpression
-import ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction.arrayReplace
 import ch.ergon.dope.resolvable.expression.unaliased.type.asParameter
 import ch.ergon.dope.resolvable.expression.unaliased.type.toDopeType
 import org.junit.jupiter.api.Assertions.assertEquals

diff --git a/...ction/array/ArrayReverseExpressionTest.kt → ...rayfunction/ArrayReverseExpressionTest.kt b/...ction/array/ArrayReverseExpressionTest.kt → ...rayfunction/ArrayReverseExpressionTest.kt
@@ -1,10 +1,8 @@
-package ch.ergon.dope.function.array
+package ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction
 
 import ch.ergon.dope.DopeQuery
 import ch.ergon.dope.helper.someNumberArrayField
 import ch.ergon.dope.resolvable.expression.unaliased.type.ParameterManager
-import ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction.ArrayReverseExpression
-import ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction.arrayReverse
 import ch.ergon.dope.resolvable.expression.unaliased.type.asParameter
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.BeforeEach

diff --git a/...function/array/ArraySortExpressionTest.kt → .../arrayfunction/ArraySortExpressionTest.kt b/...function/array/ArraySortExpressionTest.kt → .../arrayfunction/ArraySortExpressionTest.kt
@@ -1,10 +1,8 @@
-package ch.ergon.dope.function.array
+package ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction
 
 import ch.ergon.dope.DopeQuery
 import ch.ergon.dope.helper.someNumberArrayField
 import ch.ergon.dope.resolvable.expression.unaliased.type.ParameterManager
-import ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction.ArraySortExpression
-import ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction.arraySort
 import ch.ergon.dope.resolvable.expression.unaliased.type.asParameter
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.BeforeEach

diff --git a/.../function/array/ArraySumExpressionTest.kt → ...e/arrayfunction/ArraySumExpressionTest.kt b/.../function/array/ArraySumExpressionTest.kt → ...e/arrayfunction/ArraySumExpressionTest.kt
@@ -1,10 +1,8 @@
-package ch.ergon.dope.function.array
+package ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction
 
 import ch.ergon.dope.DopeQuery
 import ch.ergon.dope.helper.someNumberArrayField
 import ch.ergon.dope.resolvable.expression.unaliased.type.ParameterManager
-import ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction.ArraySumExpression
-import ch.ergon.dope.resolvable.expression.unaliased.type.arrayfunction.arraySum
 import ch.ergon.dope.resolvable.expression.unaliased.type.asParameter
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.BeforeEach