From 6d1c69c750dee1c5d2651bcf55bfe661058bc81c Mon Sep 17 00:00:00 2001 From: Grigory Pomadchin Date: Thu, 1 Jun 2023 19:20:09 -0400 Subject: [PATCH] regexp code cleanup --- .../src/test/scala/frameless/ColumnTests.scala | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/dataset/src/test/scala/frameless/ColumnTests.scala b/dataset/src/test/scala/frameless/ColumnTests.scala index e46dbc98..887d1810 100644 --- a/dataset/src/test/scala/frameless/ColumnTests.scala +++ b/dataset/src/test/scala/frameless/ColumnTests.scala @@ -1,12 +1,14 @@ package frameless -import java.time.{Instant, Period, Duration} +import java.time.{Duration, Instant, Period} import org.scalacheck.Prop._ -import org.scalacheck.{Arbitrary, Gen, Prop}, Arbitrary.arbitrary +import org.scalacheck.{Arbitrary, Gen, Prop} +import Arbitrary.arbitrary import org.scalatest.matchers.should.Matchers import shapeless.test.illTyped import scala.math.Ordering.Implicits._ +import scala.util.Try final class ColumnTests extends TypedDatasetSuite with Matchers { @@ -204,15 +206,7 @@ final class ColumnTests extends TypedDatasetSuite with Matchers { val spark = session import spark.implicits._ - val regex = - Gen.nonEmptyListOf(arbitrary[Char]).map(_.mkString).suchThat{ str => - try { - str.r - true - } catch { - case _: Throwable => false - } - } + val regex = Gen.nonEmptyListOf(arbitrary[Char]).map(_.mkString).suchThat { str => Try(str.r).isSuccess } check { forAll(regex, arbitrary[String]) { (a, b) =>