Make calculator-java-cli standalone

Author: mpkorstanje

.github/workflows/test-java.yml

@@ -17,6 +17,7 @@ jobs:
       matrix:
         example:
           - calculator-java8-cli
+          - calculator-java-cli
 
     name: 'Build Java ${{ matrix.example }}'
     runs-on: ubuntu-latest

examples/calculator-java-cli/pom.xml renamed to calculator-java-cli/pom.xml

@@ -1,26 +1,19 @@
 <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-java-cli</artifactId>
+    <version>0.0.1</version>
     <packaging>jar</packaging>
+    
     <name>Examples: Calculator - Java - Annotations - CLI</name>
 
-    <properties>
-        <project.Automatic-Module-Name>io.cucumber.examples.calculator</project.Automatic-Module-Name>
-    </properties>
-
     <dependencyManagement>
         <dependencies>
             <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>
@@ -31,6 +24,13 @@
                 <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>
         </dependencies>
     </dependencyManagement>
 
@@ -41,14 +41,13 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest</artifactId>
-            <version>2.2</version>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

examples/calculator-java-cli/src/main/java/io/cucumber/examples/calculator/DateCalculator.java renamed to calculator-java-cli/src/main/java/io/cucumber/examples/calculator/DateCalculator.java

@@ -7,8 +7,7 @@
 
 import java.time.LocalDate;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class DateStepDefinitions {
 
@@ -32,7 +31,7 @@ public void I_ask_if_date_is_in_the_past(LocalDate date) {
 
     @Then("^the result should be (yes|no)$")
     public void the_result_should_be(String expectedResult) {
-        assertThat(result, equalTo(expectedResult));
+        assertThat(result).isEqualTo(expectedResult);
     }
 
 }

examples/calculator-java-cli/src/main/java/io/cucumber/examples/calculator/RpnCalculator.java renamed to calculator-java-cli/src/main/java/io/cucumber/examples/calculator/RpnCalculator.java

@@ -11,8 +11,7 @@
 
 import java.util.List;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class RpnCalculatorStepDefinitions {
 
@@ -57,7 +56,7 @@ public void I_press(String what) {
 
     @Then("the result is {int}")
     public void the_result_is(double expected) {
-        assertThat(calc.value(), equalTo(expected));
+        assertThat(calc.value()).isEqualTo(expected);
     }
 
     @Given("the previous entries:")

examples/calculator-java-cli/src/test/java/io/cucumber/examples/calculator/DateStepDefinitions.java renamed to calculator-java-cli/src/test/java/io/cucumber/examples/calculator/DateStepDefinitions.java

@@ -16,8 +16,7 @@
 import java.util.stream.Stream;
 
 import static io.cucumber.examples.calculator.ShoppingStepDefinitions.Price.fromString;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class ShoppingStepDefinitions {
 
@@ -59,7 +58,7 @@ public void i_pay(Amount amount) {
 
     @Then("my change should be {}")
     public void my_change_should_be_(int change) {
-        assertThat(-calc.value().intValue(), equalTo(change));
+        assertThat(-calc.value().intValue()).isEqualTo(change);
     }
 
     @Given("the following shopping list:")
@@ -86,7 +85,7 @@ public void i_count_shopping_price() {
 
     @Then("price would be {int}")
     public void price_would_be(int totalPrice) {
-        assertThat(groceriesPrice, equalTo(totalPrice));
+        assertThat(groceriesPrice).isEqualTo(totalPrice);
     }
 
     static class Grocery {