Make calculator standalone

Author: mpkorstanje

examples/calculator-java8-cli/pom.xml calculator-java8-cli/pom.xmlexamples/calculator-java8-cli/pom.xml renamed to calculator-java8-cli/pom.xml

@@ -1,26 +1,32 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <parent>
-        <groupId>io.cucumber</groupId>
-        <artifactId>examples</artifactId>
-        <version>7.33.0-SNAPSHOT</version>
-    </parent>
-
+    <groupId>io.cucumber.examples</groupId>
     <artifactId>calculator-java8-cli</artifactId>
+    <version>0.0.1</version>
     <packaging>jar</packaging>
-    <name>Examples: Calculator - Java - Lambda - CLI</name>
-
-    <properties>
-        <project.Automatic-Module-Name>io.cucumber.examples.calculator</project.Automatic-Module-Name>
-    </properties>
+    <name>Calculator - Java - Lambda - CLI</name>
 
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>org.junit</groupId>
+                <artifactId>junit-bom</artifactId>
+                <version>6.0.1</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
             <dependency>
                 <groupId>io.cucumber</groupId>
                 <artifactId>cucumber-bom</artifactId>
-                <version>${project.version}</version>
+                <version>7.32.0</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.assertj</groupId>
+                <artifactId>assertj-bom</artifactId>
+                <version>3.27.6</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -34,9 +40,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest</artifactId>
-            <version>2.2</version>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

…r/examples/calculator/RpnCalculator.java …r/examples/calculator/RpnCalculator.javaexamples/calculator-java8-cli/src/main/java/io/cucumber/examples/calculator/RpnCalculator.java renamed to calculator-java8-cli/src/main/java/io/cucumber/examples/calculator/RpnCalculator.java examples/calculator-java8-cli/src/main/java/io/cucumber/examples/calculator/RpnCalculator.java renamed to calculator-java8-cli/src/main/java/io/cucumber/examples/calculator/RpnCalculator.java

@@ -7,8 +7,7 @@
 import java.util.List;
 import java.util.Map;
 
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.MatcherAssert.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class RpnCalculatorSteps implements En {
 
@@ -27,7 +26,7 @@ public RpnCalculatorSteps() {
 
         Given("^I press (.+)$", (String what) -> calc.push(what));
 
-        Then("the result is {double}", (Double expected) -> assertThat(calc.value(), equalTo(expected)));
+        Then("the result is {double}", (Double expected) -> assertThat(calc.value()).isEqualTo(expected));
 
         Before("not @foo", (Scenario scenario) -> {
             scenario.log("Runs before scenarios *not* tagged with @foo");

…mples/calculator/RpnCalculatorSteps.java …mples/calculator/RpnCalculatorSteps.javaexamples/calculator-java8-cli/src/test/java/io/cucumber/examples/calculator/RpnCalculatorSteps.java renamed to calculator-java8-cli/src/test/java/io/cucumber/examples/calculator/RpnCalculatorSteps.java examples/calculator-java8-cli/src/test/java/io/cucumber/examples/calculator/RpnCalculatorSteps.java renamed to calculator-java8-cli/src/test/java/io/cucumber/examples/calculator/RpnCalculatorSteps.java

@@ -11,8 +11,7 @@
 import java.util.Objects;
 import java.util.stream.Stream;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class ShoppingSteps implements En {
 
@@ -38,7 +37,7 @@ public ShoppingSteps() {
         });
 
         Then("my change should be {}", (Integer change) -> {
-            assertThat(-calc.value().intValue(), equalTo(change));
+            assertThat(-calc.value().intValue()).isEqualTo(change);
         });
 
         Given("the following shopping list:", (Grocery[] array) -> {
@@ -57,7 +56,7 @@ public ShoppingSteps() {
             }
         }));
 
-        Then("price would be {int}", (Integer totalPrice) -> assertThat(groceriesPrice, equalTo(totalPrice)));
+        Then("price would be {int}", (Integer totalPrice) -> assertThat(groceriesPrice).isEqualTo(totalPrice));
 
         DataTableType((Map<String, String> row) -> new ShoppingSteps.Grocery(
             row.get("name"),