Skip to content

Commit a455a0e

Browse files
gaeljwgaeljw
committed
chore: 🤖 Scala 3 - Fix syntax change
1 parent 15f6087 commit a455a0e

File tree

11 files changed

+45
-45
lines changed

11 files changed

+45
-45
lines changed

‎cucumber-scala/src/main/scala/io/cucumber/scala/GlueAdaptor.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class GlueAdaptor(glue: Glue) {
1616

1717
// If the registry is not consistent, this indicates a mistake in the users definition and we want to let him know.
1818
registry.checkConsistency().left.foreach {
19-
ex: IncorrectHookDefinitionException =>
19+
(ex: IncorrectHookDefinitionException) =>
2020
throw ex
2121
}
2222

‎cucumber-scala/src/test/scala/io/cucumber/scala/ScalaDslDataTableTypeTest.scala

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class ScalaDslDataTableTypeTest {
3535
def testDataTableEntryType(): Unit = {
3636

3737
class Glue extends ScalaDsl with EN {
38-
DataTableType { entry: Map[String, String] =>
38+
DataTableType { (entry: Map[String, String]) =>
3939
Author(entry("name"), entry("surname"), entry("famousBook"))
4040
}
4141
}
@@ -81,7 +81,7 @@ class ScalaDslDataTableTypeTest {
8181
def testDataTableRowType(): Unit = {
8282

8383
class Glue extends ScalaDsl with EN {
84-
DataTableType { row: Seq[String] =>
84+
DataTableType { (row: Seq[String]) =>
8585
Author(row(0), row(1), row(2))
8686
}
8787
}
@@ -127,7 +127,7 @@ class ScalaDslDataTableTypeTest {
127127
def testDataTableCellType(): Unit = {
128128

129129
class Glue extends ScalaDsl with EN {
130-
DataTableType { cell: String =>
130+
DataTableType { (cell: String) =>
131131
Cell(cell)
132132
}
133133
}
@@ -173,7 +173,7 @@ class ScalaDslDataTableTypeTest {
173173
def testClassDataTableTableType(): Unit = {
174174

175175
class Glue extends ScalaDsl with EN {
176-
DataTableType { table: DataTable =>
176+
DataTableType { (table: DataTable) =>
177177
val authors = table
178178
.asMaps()
179179
.asScala
@@ -242,7 +242,7 @@ class ScalaDslDataTableTypeTest {
242242
def testObjectDataTableEntryType(): Unit = {
243243

244244
object Glue extends ScalaDsl with EN {
245-
DataTableType { entry: Map[String, String] =>
245+
DataTableType { (entry: Map[String, String]) =>
246246
Author(entry("name"), entry("surname"), entry("famousBook"))
247247
}
248248
}
@@ -284,7 +284,7 @@ class ScalaDslDataTableTypeTest {
284284
def testObjectDataTableRowType(): Unit = {
285285

286286
object Glue extends ScalaDsl with EN {
287-
DataTableType { row: Seq[String] =>
287+
DataTableType { (row: Seq[String]) =>
288288
Author(row(0), row(1), row(2))
289289
}
290290
}
@@ -326,7 +326,7 @@ class ScalaDslDataTableTypeTest {
326326
def testObjectDataTableCellType(): Unit = {
327327

328328
object Glue extends ScalaDsl with EN {
329-
DataTableType { cell: String =>
329+
DataTableType { (cell: String) =>
330330
Cell(cell)
331331
}
332332
}
@@ -368,7 +368,7 @@ class ScalaDslDataTableTypeTest {
368368
def testObjectDataTableTableType(): Unit = {
369369

370370
object Glue extends ScalaDsl with EN {
371-
DataTableType { table: DataTable =>
371+
DataTableType { (table: DataTable) =>
372372
val authors = table
373373
.asMaps()
374374
.asScala

‎cucumber-scala/src/test/scala/io/cucumber/scala/ScalaDslHooksTest.scala

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class ScalaDslHooksTest {
3030
def testBeforeHook(): Unit = {
3131

3232
class Glue extends ScalaDsl {
33-
Before { _: Scenario =>
33+
Before { (_: Scenario) =>
3434
invoke()
3535
}
3636
}
@@ -142,7 +142,7 @@ class ScalaDslHooksTest {
142142
def testBeforeStepHook(): Unit = {
143143

144144
class Glue extends ScalaDsl {
145-
BeforeStep { _: Scenario =>
145+
BeforeStep { (_: Scenario) =>
146146
invoke()
147147
}
148148
}
@@ -254,7 +254,7 @@ class ScalaDslHooksTest {
254254
def testAfterHook(): Unit = {
255255

256256
class Glue extends ScalaDsl {
257-
After { _: Scenario =>
257+
After { (_: Scenario) =>
258258
invoke()
259259
}
260260
}
@@ -366,7 +366,7 @@ class ScalaDslHooksTest {
366366
def testAfterStepHook(): Unit = {
367367

368368
class Glue extends ScalaDsl {
369-
AfterStep { _: Scenario =>
369+
AfterStep { (_: Scenario) =>
370370
invoke()
371371
}
372372
}
@@ -481,7 +481,7 @@ class ScalaDslHooksTest {
481481
def testObjectBeforeHook(): Unit = {
482482

483483
object Glue extends ScalaDsl {
484-
Before { _: Scenario =>
484+
Before { (_: Scenario) =>
485485
invoke()
486486
}
487487
}
@@ -577,7 +577,7 @@ class ScalaDslHooksTest {
577577
def testObjectBeforeStepHook(): Unit = {
578578

579579
object Glue extends ScalaDsl {
580-
BeforeStep { _: Scenario =>
580+
BeforeStep { (_: Scenario) =>
581581
invoke()
582582
}
583583
}
@@ -673,7 +673,7 @@ class ScalaDslHooksTest {
673673
def testObjectAfterHook(): Unit = {
674674

675675
object Glue extends ScalaDsl {
676-
After { _: Scenario =>
676+
After { (_: Scenario) =>
677677
invoke()
678678
}
679679
}
@@ -769,7 +769,7 @@ class ScalaDslHooksTest {
769769
def testObjectAfterStepHook(): Unit = {
770770

771771
object Glue extends ScalaDsl {
772-
AfterStep { _: Scenario =>
772+
AfterStep { (_: Scenario) =>
773773
invoke()
774774
}
775775
}

‎cucumber-scala/src/test/scala/tests/cukes/StepDefs.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -161,21 +161,21 @@ class CukesStepDefinitions extends ScalaDsl with EN {
161161
person = p
162162
}
163163

164-
Then("""^he should say \"(.*)\"""") { s: String =>
164+
Then("""^he should say \"(.*)\"""") { (s: String) =>
165165
assertEquals(person.hello, s)
166166
}
167167

168168
var cukes: JList[Cukes] = null
169169

170-
Given("^I have eaten the following cukes$") { cs: JList[Cukes] =>
170+
Given("^I have eaten the following cukes$") { (cs: JList[Cukes]) =>
171171
cukes = cs
172172
}
173173

174-
Then("""I should have eaten {int} cukes""") { total: Int =>
174+
Then("""I should have eaten {int} cukes""") { (total: Int) =>
175175
assertEquals(total, cukes.asScala.map(_.number).sum)
176176
}
177177

178-
And("^they should have been (.*)$") { colors: String =>
178+
And("^they should have been (.*)$") { (colors: String) =>
179179
assertEquals(colors, cukes.asScala.map(_.color).mkString(", "))
180180
}
181181

‎cucumber-scala/src/test/scala/tests/cukes/TypeRegistryConfiguration.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class TypeRegistryConfiguration extends ScalaDsl {
3434
s.charAt(0)
3535
}
3636

37-
DataTableType { map: Map[String, String] =>
37+
DataTableType { (map: Map[String, String]) =>
3838
Cukes(map("Number").toInt, map("Color"))
3939
}
4040

‎cucumber-scala/src/test/scala/tests/datatables/DataTableTypeSteps.scala

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class DataTableTypeSteps extends ScalaDsl with EN {
6161
var _authors: Seq[Author] = _
6262
var _names: String = _
6363

64-
DataTableType { entry: Map[String, String] =>
64+
DataTableType { (entry: Map[String, String]) =>
6565
Author(entry("name"), entry("surname"), entry("famousBook"))
6666
}
6767

@@ -77,7 +77,7 @@ class DataTableTypeSteps extends ScalaDsl with EN {
7777
)
7878
}
7979

80-
DataTableType { row: Seq[String] =>
80+
DataTableType { (row: Seq[String]) =>
8181
AuthorRow(row(0), row(1), row(2))
8282
}
8383

@@ -93,7 +93,7 @@ class DataTableTypeSteps extends ScalaDsl with EN {
9393
)
9494
}
9595

96-
DataTableType { cell: String =>
96+
DataTableType { (cell: String) =>
9797
AuthorCell(cell)
9898
}
9999

@@ -105,7 +105,7 @@ class DataTableTypeSteps extends ScalaDsl with EN {
105105
AuthorCellWithNone(cell)
106106
}
107107

108-
DataTableType { table: DataTable =>
108+
DataTableType { (table: DataTable) =>
109109
val authors = table
110110
.asMaps()
111111
.asScala
@@ -268,7 +268,7 @@ class DataTableTypeSteps extends ScalaDsl with EN {
268268
_names = _authors.map(_.name).mkString(",")
269269
}
270270

271-
Then("""I get {string}""") { expected: String =>
271+
Then("""I get {string}""") { (expected: String) =>
272272
assert(_names == expected, s"${_names} was not equal to $expected")
273273
}
274274

‎cucumber-scala/src/test/scala/tests/datatables/DatatableAsScalaSteps.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ class DatatableAsScalaSteps extends ScalaDsl with EN {
197197

198198
case class CustomType(key1: String, key2: Option[String], key3: String)
199199

200-
DataTableType { map: Map[String, String] =>
200+
DataTableType { (map: Map[String, String]) =>
201201
CustomType(map("key1"), Option(map("key2")), map("key3"))
202202
}
203203

@@ -214,7 +214,7 @@ class DatatableAsScalaSteps extends ScalaDsl with EN {
214214

215215
case class RichCell(content: Option[String])
216216

217-
DataTableType { cell: String =>
217+
DataTableType { (cell: String) =>
218218
RichCell(Option(cell))
219219
}
220220

‎cucumber-scala/src/test/scala/tests/docstring/DocStringSteps.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@ class DocStringSteps extends ScalaDsl with EN {
1010

1111
var _text: Any = _
1212

13-
DocStringType("json") { text =>
13+
DocStringType("json") { (text) =>
1414
JsonText(text)
1515
}
1616

17-
DocStringType("xml") { text =>
17+
DocStringType("xml") { (text) =>
1818
XmlText(text)
1919
}
2020

21-
Given("the following json text") { json: JsonText =>
21+
Given("the following json text") { (json: JsonText) =>
2222
_text = json
2323
}
2424

25-
Given("the following xml text") { xml: XmlText =>
25+
Given("the following xml text") { (xml: XmlText) =>
2626
_text = xml
2727
}
2828

‎cucumber-scala/src/test/scala/tests/parametertypes/ParameterTypesSteps.scala

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ case class Point(x: Int, y: Int)
1111

1212
class ParameterTypesSteps extends ScalaDsl with EN {
1313

14-
ParameterType("string-builder", "\"(.*)\"") { str =>
14+
ParameterType("string-builder", "\"(.*)\"") { (str) =>
1515
new StringBuilder(str)
1616
}
1717

@@ -23,11 +23,11 @@ class ParameterTypesSteps extends ScalaDsl with EN {
2323
s"-$x-$y-$z-"
2424
}
2525

26-
ParameterType("optionalint", """\s?(\d*)\s?""") { str =>
26+
ParameterType("optionalint", """\s?(\d*)\s?""") { (str) =>
2727
Option(str).filter(_.nonEmpty).map(_.toInt)
2828
}
2929

30-
ParameterType("optionalstring", "(.*)") { str =>
30+
ParameterType("optionalstring", "(.*)") { (str) =>
3131
Option(str).filter(_.nonEmpty)
3232
}
3333

@@ -46,7 +46,7 @@ class ParameterTypesSteps extends ScalaDsl with EN {
4646
}
4747

4848
Given("{string-builder} parameter, defined by lambda") {
49-
builder: StringBuilder =>
49+
(builder: StringBuilder) =>
5050
assert(builder.toString() == "string builder")
5151
}
5252

@@ -121,22 +121,22 @@ class ParameterTypesSteps extends ScalaDsl with EN {
121121
}
122122

123123
Given("""an optional string parameter value "{optionalstring}" undefined""") {
124-
value: Option[String] =>
124+
(value: Option[String]) =>
125125
assert(value.isEmpty)
126126
}
127127

128128
Given("""an optional string parameter value "{optionalstring}" defined""") {
129-
value: Option[String] =>
129+
(value: Option[String]) =>
130130
assert(value.contains("toto"))
131131
}
132132

133133
Given("""an optional int parameter value{optionalint}undefined""") {
134-
value: Option[Int] =>
134+
(value: Option[Int]) =>
135135
assert(value.isEmpty)
136136
}
137137

138138
Given("""an optional int parameter value{optionalint}defined""") {
139-
value: Option[Int] =>
139+
(value: Option[Int]) =>
140140
assert(value.contains(5))
141141
}
142142

‎examples/src/main/scala/cucumber/examples/scalacalculator/RpnCalculator.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import scala.collection.mutable.Queue
55
sealed trait Arg
66

77
object Arg {
8-
implicit def op(s: String) = Op(s)
9-
implicit def value(v: Double) = Val(v)
8+
implicit def op(s: String): Op = Op(s)
9+
implicit def value(v: Double): Val = Val(v)
1010
}
1111

1212
case class Op(value: String) extends Arg

‎examples/src/test/scala/cucumber/examples/scalacalculator/RpnCalculatorStepDefinitions.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ class RpnCalculatorStepDefinitions extends ScalaDsl with EN {
1313
calc push "+"
1414
}
1515

16-
Then("the result is {double}") { expected: Double =>
16+
Then("the result is {double}") { (expected: Double) =>
1717
assertEquals(expected, calc.value, 0.001)
1818
}
1919

20-
Before("not @foo") { scenario: Scenario =>
20+
Before("not @foo") { (scenario: Scenario) =>
2121
println(s"Runs before scenarios *not* tagged with @foo (${scenario.getId})")
2222
}
2323
}

0 commit comments

Comments
 (0)