From 18c2ab5621872ea85f05281cfb4412980f9c6cf6 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Fri, 6 Nov 2020 10:46:32 +0100
Subject: [PATCH] Revert kotest workaround

This is a partial revert of bc0d26eeb5f5b626c2a5e98a0d7856da49cc4135
---
 .../net/sourceforge/pmd/lang/java/types/TypeOpsTest.kt     | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/types/TypeOpsTest.kt b/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/types/TypeOpsTest.kt
index f46023a7bc..f4c9a2333a 100644
--- a/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/types/TypeOpsTest.kt
+++ b/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/types/TypeOpsTest.kt
@@ -8,7 +8,6 @@ import io.kotest.core.spec.style.FunSpec
 import io.kotest.matchers.collections.shouldContainExactly
 import io.kotest.matchers.collections.shouldContainExactlyInAnyOrder
 import io.kotest.property.Arb
-import io.kotest.property.arbitrary.arbitrary
 import io.kotest.property.arbitrary.map
 import io.kotest.property.arbitrary.shuffle
 import io.kotest.property.checkAll
@@ -25,11 +24,7 @@ class TypeOpsTest : FunSpec({
             // for any permutation of input, the output should be the same
             suspend fun checkMostSpecific(input: List<JTypeMirror>, output: List<JTypeMirror>) {
 
-                fun <A> shuffleOld(list: List<A>) = arbitrary {
-                    list.shuffled(it.random)
-                }
-
-                checkAll(shuffleOld(input)) { ts ->
+                checkAll(Arb.shuffle(input)) { ts ->
                     TypeOps.mostSpecific(ts).shouldContainExactlyInAnyOrder(output)
                 }
             }