Refactor

Author: DanielMichalski

pom.xml

@@ -16,7 +16,7 @@
 		<groovy-all.version>2.4.11</groovy-all.version>
 		<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
 		<gmavenplus-plugin.version>1.10.0</gmavenplus-plugin.version>
-		<kotlin-maven-plugin.jvmTarget>11</kotlin-maven-plugin.jvmTarget>
+		<kotlin-maven-plugin.jvmTarget>1.8</kotlin-maven-plugin.jvmTarget>
 	</properties>
 
 	<dependencies>
@@ -69,6 +69,7 @@
 					</execution>
 				</executions>
 			</plugin>
+
 			<plugin>
 				<groupId>org.jetbrains.kotlin</groupId>
 				<artifactId>kotlin-maven-plugin</artifactId>

src/main/kotlin/pl/dmichalski/algorithms/_9_sorting/quick/QuickSortService.kt

@@ -1,18 +1,25 @@
 package pl.dmichalski.algorithms._9_sorting.quick
 
+import pl.dmichalski.algorithms._9_sorting.SortService
+
 /**
  * Quick sort algorithm.
  *
  * O(n2) time complexity
  * O(n log n) space complexity
  */
-internal class QuickSortService {
+internal class QuickSortService : SortService {
+
+    override fun sort(values: IntArray): IntArray {
+        sortArray(values)
+        return values
+    }
 
-    fun sort(values: IntArray, left: Int? = 0, right: Int? = values.size): IntArray {
+    private fun sortArray(values: IntArray, left: Int? = 0, right: Int? = values.size): IntArray {
         if (left!! < right!!) {
             val pivotIndex = pivot(values, left, right)
-            sort(values, left, pivotIndex)
-            sort(values, pivotIndex + 1, right)
+            sortArray(values, left, pivotIndex)
+            sortArray(values, pivotIndex + 1, right)
         }
         return values
     }

src/test/groovy/pl/dmichalski/algorithms/_9_sorting/quick/QuickSortServiceSpec.groovy

@@ -1,27 +1,12 @@
 package pl.dmichalski.algorithms._9_sorting.quick
 
-import spock.lang.Specification
-import spock.lang.Unroll
+import pl.dmichalski.algorithms._9_sorting.BaseSortServiceSpec
 
-class QuickSortServiceSpec extends Specification {
+class QuickSortServiceSpec extends BaseSortServiceSpec {
 
-    private final QuickSortService underTest = new QuickSortService()
+    void setup() {
+        super.setUnderTest(new QuickSortService())
 
-    @Unroll
-    def 'should return [expectedResult=#expectedResult] for [values=#values]'() {
-        when:
-        def result = underTest.sort(values as int[], 0, values.size())
-
-        then:
-        result == expectedResult as int[]
-
-        where:
-        values                                 | expectedResult
-        []                                     | []
-        [1]                                    | [1]
-        [1, 2]                                 | [1, 2]
-        [3, 2, 12, 5]                          | [2, 3, 5, 12]
-        [1, 2, 10, 12, 4, 5, 1]                | [1, 1, 2, 4, 5, 10, 12]
-        [2, 3, 4, 5, 8, 12, 25, 150, 1000, 50] | [2, 3, 4, 5, 8, 12, 25, 50, 150, 1000]
     }
+
 }