Laget to varianter til og la til flere tester

packages-template/src/main/java/ui/AppController.java

+package ui;
+
+import core.Calc;
+
+import java.util.List;
+import java.util.function.BinaryOperator;
+import java.util.function.UnaryOperator;
+
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.scene.control.Label;
+import javafx.scene.control.Labeled;
+import javafx.scene.control.ListView;
+
+public class AppController {
+
+    private Calc calc;
+
+    public AppController() {
+        calc = new Calc(0.0, 0.0, 0.0);
+    }
+
+    public Calc getCalc() {
+        return calc;
+    }
+
+    public void setCalc(Calc calc) {
+        this.calc = calc;
+        updateOperandsView();
+    }
+
+    @FXML
+    private ListView<Double> operandsView;
+
+    @FXML
+    private Label operandView;
+
+    @FXML
+    void initialize() {
+        updateOperandsView();
+    }
+
+    private void updateOperandsView() {
+        List<Double> operands = operandsView.getItems();
+        operands.clear();
+        int elementCount = Math.min(calc.getOperandCount(), 3);
+        for (int i = 0; i < elementCount; i++) {
+            operands.add(calc.peekOperand(elementCount - i - 1));
+        }
+    }
+
+    private String getOperandString() {
+        return operandView.getText();
+    }
+
+    private boolean hasOperand() {
+        return ! getOperandString().isBlank();
+    }
+
+    private double getOperand() {
+        return Double.valueOf(operandView.getText());
+    }
+    
+    private void setOperand(String operandString) {
+        operandView.setText(operandString);
+    }
+
+    @FXML
+    void handleEnter() {
+        if (hasOperand()) {
+            calc.pushOperand(getOperand());
+        } else {
+            calc.dup();
+        }
+        setOperand("");
+        updateOperandsView();
+    }
+
+    private void appendToOperand(String s) {
+        // TODO
+    }
+
+    @FXML
+    void handleDigit(ActionEvent ae) {
+        if (ae.getSource() instanceof Labeled l) {
+            // TODO append button label to operand
+        }
+    }
+
+    @FXML
+    void handlePoint() {
+        var operandString = getOperandString();
+        if (operandString.contains(".")) {
+            // TODO remove characters after point
+        } else {
+            // TODO append point
+        }
+    }
+
+    @FXML
+    void handleClear() {
+        // TODO clear operand
+    }
+
+    @FXML
+    void handleSwap() {
+        // TODO clear operand
+    }
+
+    private void performOperation(UnaryOperator<Double> op) {
+        // TODO
+    }
+
+    private void performOperation(boolean swap, BinaryOperator<Double> op) {
+        if (hasOperand()) {
+            // TODO push operand first
+        }
+        // TODO perform operation, but swap first if needed
+    }
+
+    @FXML
+    void handleOpAdd() {
+        // TODO
+    }
+
+    @FXML
+    void handleOpSub() {
+        // TODO
+    }
+
+    @FXML
+    void handleOpMult() {
+        // TODO
+    }
+}

packages-template/src/main/resources/ui/App.fxml

+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ListView?>
+
+<GridPane xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ui.AppController"
+         alignment="CENTER" hgap="10.0" vgap="10.0" >
+
+   <ListView fx:id="operandsView" prefHeight="80.0"
+      GridPane.rowIndex="0" GridPane.columnIndex="0" GridPane.columnSpan="4"/>
+   <Label text="" fx:id="operandView"
+      GridPane.rowIndex="1" GridPane.columnIndex="0" GridPane.columnSpan="4"/>
+
+   <!-- multi-line button label with XML entity for newline -->
+   <Button text="E&#10;n&#10;t&#10;e&#10;r" onAction="#handleEnter"
+      GridPane.rowIndex="2" GridPane.columnIndex="3" GridPane.rowSpan="3"/>
+
+   <Button text="7" onAction="#handleDigit"
+      GridPane.rowIndex="2" GridPane.columnIndex="0"/>
+   <Button text="8" onAction="#handleDigit"
+      GridPane.rowIndex="2" GridPane.columnIndex="1"/>
+   <Button text="9" onAction="#handleDigit"
+      GridPane.rowIndex="2" GridPane.columnIndex="2"/>
+   
+   <Button text="4" onAction="#handleDigit"
+      GridPane.rowIndex="3" GridPane.columnIndex="0"/>
+   <Button text="5" onAction="#handleDigit"
+      GridPane.rowIndex="3" GridPane.columnIndex="1"/>
+   <Button text="6" onAction="#handleDigit"
+      GridPane.rowIndex="3" GridPane.columnIndex="2"/>
+   
+   <Button text="1" onAction="#handleDigit"
+      GridPane.rowIndex="4" GridPane.columnIndex="0"/>
+   <Button text="2" onAction="#handleDigit"
+      GridPane.rowIndex="4" GridPane.columnIndex="1"/>
+   <Button text="3" onAction="#handleDigit"
+      GridPane.rowIndex="4" GridPane.columnIndex="2"/>
+   
+   <Button text="0" onAction="#handleDigit"
+      GridPane.rowIndex="5" GridPane.columnIndex="0"/>
+   <Button text="." onAction="#handlePoint"
+      GridPane.rowIndex="5" GridPane.columnIndex="1"/>
+   <Button text="C" onAction="#handleClear"
+      GridPane.rowIndex="5" GridPane.columnIndex="2"/>
+   <Button text="~" onAction="#handleSwap"
+      GridPane.rowIndex="5" GridPane.columnIndex="3"/>
+
+   <Button text="+" onAction="#handleOpAdd"
+      GridPane.rowIndex="6" GridPane.columnIndex="0"/>
+   <Button text="-" onAction="#handleOpSub"
+      GridPane.rowIndex="6" GridPane.columnIndex="1"/>
+   <Button text="*" onAction="#handleOpMult"
+      GridPane.rowIndex="6" GridPane.columnIndex="2"/>
+
+   <!-- TODO -->
+   <Button text="/"
+      GridPane.rowIndex="6" GridPane.columnIndex="3"/>
+   <Button text="√"
+      GridPane.rowIndex="7" GridPane.columnIndex="0"/>
+   <Button text="π"
+      GridPane.rowIndex="7" GridPane.columnIndex="1"/>
+</GridPane>

packages-template/src/test/java/core/CalcTest.java

+package core;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+public class CalcTest {
+
+    private static void checkCalc(Calc calc, double... operands) {
+        Assertions.assertEquals(operands.length, calc.getOperandCount(), "Wrong operand count");
+        for (int i = 0; i < operands.length; i++) {
+            Assertions.assertEquals(operands[i], calc.peekOperand(i), "Wrong value at #" + i + " of operand stack");
+        }
+    }
+
+    @Test
+    public void testCalc() {
+        checkCalc(new Calc());
+        checkCalc(new Calc(1.0), 1.0);
+        checkCalc(new Calc(3.14, 1.0), 1.0, 3.14);
+    }
+
+    @Test
+    public void testPushOperand() {
+        Calc calc = new Calc();
+        calc.pushOperand(1.0);
+        checkCalc(calc, 1.0);
+        calc.pushOperand(3.14);
+        checkCalc(calc, 3.14, 1.0);
+    }
+
+    @Test
+    public void testPeekOperand() {
+        Calc calc = new Calc(1.0, 3.14);
+        Assertions.assertEquals(3.14, calc.peekOperand());
+        Assertions.assertThrows(IllegalArgumentException.class, () -> new Calc().peekOperand());
+    }
+
+    @Test
+    public void testPeekOperandN() {
+        Calc calc = new Calc(1.0, 3.14);
+        Assertions.assertEquals(3.14, calc.peekOperand(0));
+        Assertions.assertEquals(1.0, calc.peekOperand(1));
+        Assertions.assertThrows(IllegalArgumentException.class, () -> calc.peekOperand(2));
+    }
+
+    @Test
+    public void testPopOperand() {
+        Calc calc = new Calc(1.0, 3.14);
+        Assertions.assertEquals(3.14, calc.popOperand());
+        checkCalc(calc, 1.0);
+        Assertions.assertEquals(1.0, calc.popOperand());
+        checkCalc(calc);
+    }
+
+    @Test
+    public void testPopOperand_emptyStack() {
+        Assertions.assertThrows(IllegalStateException.class, () -> new Calc().popOperand());
+    }
+
+    @Test
+    public void testPerformOperation1() {
+        Calc calc = new Calc(1.0);
+        Assertions.assertEquals(-1.0, calc.performOperation(n -> -n));
+        checkCalc(calc, -1.0);
+    }
+
+    @Test
+    public void testPerformOperation1_emptyOperandStack() {
+        Assertions.assertThrows(IllegalStateException.class, () -> new Calc().performOperation(n -> -n));
+    }
+
+
+    @Test
+    public void testPerformOperation2() {
+        Calc calc = new Calc(1.0, 3.0);
+        Assertions.assertEquals(-2.0, calc.performOperation((n1, n2) -> n1 - n2));
+        checkCalc(calc, -2.0);
+    }
+
+    @Test
+    public void testPerformOperation2_lessThanTwoOperands() {
+        Assertions.assertThrows(IllegalStateException.class, () -> new Calc(1.0).performOperation((n1, n2) -> n1 - n2));
+        Assertions.assertThrows(IllegalStateException.class, () -> new Calc().performOperation((n1, n2) -> n1 - n2));
+    }
+
+    @Test
+    public void testSwap() {
+        Calc calc = new Calc(1.0, 3.14);
+        calc.swap();
+        checkCalc(calc, 3.14, 1.0);
+        calc.swap();
+        checkCalc(calc, 1.0, 3.14);
+    }
+
+    @Test
+    public void testSwap_lessThanTwoOperands() {
+        Assertions.assertThrows(IllegalStateException.class, () -> new Calc(1.0).swap());
+        Assertions.assertThrows(IllegalStateException.class, () -> new Calc().swap());
+    }
+
+    @Test
+    public void testDup() {
+        Calc calc = new Calc(1.0, 3.14);
+        Assertions.assertEquals(3.14, calc.popOperand());
+        checkCalc(calc, 1.0);
+        Assertions.assertEquals(1.0, calc.popOperand());
+        checkCalc(calc);
+    }
+
+    @Test
+    public void testDup_emptyOperandStack() {
+        Assertions.assertThrows(IllegalStateException.class, () -> new Calc().dup());
+    }
+}

packages-template/src/test/java/ui/AppTest.java

+package ui;
+
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Parent;
+import javafx.scene.Scene;
+import javafx.scene.control.Label;
+import javafx.scene.control.ListView;
+import javafx.stage.Stage;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.stream.Stream;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.testfx.framework.junit5.ApplicationTest;
+import org.testfx.matcher.control.LabeledMatchers;
+
+/**
+ * TestFX App test
+ */
+public class AppTest extends ApplicationTest {
+
+    private AppController controller;
+    private Parent root;
+
+    @Override
+    public void start(Stage stage) throws IOException {
+        FXMLLoader fxmlLoader = new FXMLLoader(this.getClass().getResource("App.fxml"));
+        root = fxmlLoader.load();
+        controller = fxmlLoader.getController();
+        stage.setScene(new Scene(root));
+        stage.show();
+    }
+
+    public Parent getRootNode() {
+        return root;
+    }
+
+    private String enterLabel = """
+        E
+        n
+        t
+        e
+        r
+        """.stripTrailing();
+
+    private void click(String... labels) {
+        for (var label : labels) {
+            clickOn(LabeledMatchers.hasText(label));
+        }
+    }
+
+    private String getOperandString() {
+        return ((Label) getRootNode().lookup("#operandView")).getText();
+    }
+
+    private ListView<Double> getOperandsView() {
+        return (ListView<Double>) getRootNode().lookup("#operandsView");
+    }
+
+    private void checkView(double... operands) {
+        for (int i = 0; i < operands.length; i++) {
+            Assertions.assertEquals(operands[i], controller.getCalc().peekOperand(i), "Wrong value at #" + i + " of operand stack");
+        }
+        List<Double> viewItems = getOperandsView().getItems();
+        for (int i = 0; i < operands.length; i++) {
+            Assertions.assertEquals(operands[i], viewItems.get(viewItems.size() - i - 1), "Wrong value at #" + i + " of operands view");
+        }
+    }
+
+    private void checkView(String operandString, double... operands) {
+        Assertions.assertEquals(operandString, getOperandString());
+        checkView(operands);
+    }
+
+    // see https://www.baeldung.com/parameterized-tests-junit-5
+    // about @ParameterizedTest
+
+    @ParameterizedTest
+    @MethodSource
+    public void testClicksOperand(String labels, String operandString) {
+        for (var label : labels.split(" ")) {
+            click(label);
+        }
+        checkView(operandString);
+    }
+
+    private static Stream<Arguments> testClicksOperand() {
+        return Stream.of(
+            Arguments.of("2 7", "27"),
+            Arguments.of("2 7 .", "27."),
+            Arguments.of("2 7 . 5", "27.5"),
+            Arguments.of("2 7 . 5 .", "27.")
+        );
+    }
+    
+    @ParameterizedTest
+    @MethodSource
+    public void testClicksOperands(String labels, String operandsString) {
+        for (var label : labels.split(" ")) {
+            click(label.equals("\n") ? enterLabel : label);
+        }
+        checkView("", Stream.of(operandsString.split(" ")).mapToDouble(Double::valueOf).toArray());
+    }
+
+    private static Stream<Arguments> testClicksOperands() {
+        return Stream.of(
+            Arguments.of("2 7 . 5 \n", "27.5"),
+            Arguments.of("2 7 \n", "27.0"),
+            Arguments.of("2 \n 7 \n 5 \n", "5.0", "7.0", "2.0"),
+            Arguments.of("2 7 . \n", "27.0"),
+            Arguments.of("2 7 . 5 \n", "27.5"),
+            Arguments.of("2 \n 7 +", "9.0"),
+            Arguments.of("2 \n 7 -", "-5.0"),
+            Arguments.of("2 \n 7 *", "14.0"),
+            Arguments.of("6 \n 3 /", "2.0"),
+            Arguments.of("2 5 \n √", "5.0")
+        );
+    }
+
+    @Test
+    public void testPi() {
+        click("π");
+        checkView("", Math.PI);
+    }
+}

packages-template/src/test/java/ui/README.md

+# Tests for the RPN calculator
+
+This folder/package contains tests based on TestFX for the RPN Calculator (currently only one test class).
+
+As can be seen when launching, the app contains a list (top) showing the operands
+(topmost operand at the bottom), a text field (below list, initially empty) for a new operand and
+the buttons for digits, enter, decimal point, operations etc.
+
+## What is tested
+
+The tests simulate clicks on the buttons and checks that the underlying Calc object,
+the list (a view of the Calc object's operand stack) and the text field are updated as expected.
+E.g. if you click buttons `2 3 . 5` the string `23.5` should be shown,
+while the list is not affected. If you then click `enter`, the text field should be emptied, the operand stack should have `23.5` at the top and the list should have `23.5` at the bottom 
+(logically the top of the operand stack).
+
+Below are the specific cases that are tested.
+
+buttons to click `=>` text field content:
+
+- `2 7` => `27`
+- `2 7 .` => `27.`
+- `2 7 . 5` => `27.5`
+- `2 7 . 5 .` => `27.` (cut at decimal point)
+
+buttons to click `=>` operand stack/list content (from the bottom):
+
+- `2 7 . 5 enter"` => `27.5`
+- `2 7 enter` => `27.0"`
+- `2 enter 7 enter 5 enter` => `5.0 7.0 2.0` 
+- `2 7 . enter` => `27.0` 
+- `2 7 . 5 enter` => `27.5` 
+- `2 enter 7 +` => `9.0` 
+- `2 enter 7 -` => `-5.0` 
+- `2 enter 7 *` => `14.0` 
+- `6 enter 3 /` => `2.0` 
+- `2 5 enter √` => `5.0` 
+- `π` => `3.1415...` (the value of the `Math.PI` constant)