Reformat files to use 2 space indentation
This commit is contained in:
parent
82169b0a2e
commit
736b3c4da0
|
|
@ -1,51 +1,51 @@
|
|||
<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/maven-v4_0_0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>it1901</groupId>
|
||||
<artifactId>javafx-template</artifactId>
|
||||
<version>0.0.1-SNAPSHOT</version>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>it1901</groupId>
|
||||
<artifactId>javafx-template</artifactId>
|
||||
<version>0.0.1-SNAPSHOT</version>
|
||||
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<maven.compiler.source>16</maven.compiler.source>
|
||||
<maven.compiler.target>16</maven.compiler.target>
|
||||
</properties>
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<maven.compiler.source>16</maven.compiler.source>
|
||||
<maven.compiler.target>16</maven.compiler.target>
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
<dependencies>
|
||||
|
||||
<!-- javafx -->
|
||||
<dependency>
|
||||
<groupId>org.openjfx</groupId>
|
||||
<artifactId>javafx-controls</artifactId>
|
||||
<version>16</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.openjfx</groupId>
|
||||
<artifactId>javafx-fxml</artifactId>
|
||||
<version>16</version>
|
||||
</dependency>
|
||||
<!-- javafx -->
|
||||
<dependency>
|
||||
<groupId>org.openjfx</groupId>
|
||||
<artifactId>javafx-controls</artifactId>
|
||||
<version>16</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.openjfx</groupId>
|
||||
<artifactId>javafx-fxml</artifactId>
|
||||
<version>16</version>
|
||||
</dependency>
|
||||
|
||||
<!-- junit testing with jupiter -->
|
||||
<dependency>
|
||||
<groupId>org.junit.jupiter</groupId>
|
||||
<artifactId>junit-jupiter-api</artifactId>
|
||||
<version>5.7.2</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.junit.jupiter</groupId>
|
||||
<artifactId>junit-jupiter-engine</artifactId>
|
||||
<version>5.7.2</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.junit.jupiter</groupId>
|
||||
<artifactId>junit-jupiter-params</artifactId>
|
||||
<version>5.7.2</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<!-- junit testing with jupiter -->
|
||||
<dependency>
|
||||
<groupId>org.junit.jupiter</groupId>
|
||||
<artifactId>junit-jupiter-api</artifactId>
|
||||
<version>5.7.2</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.junit.jupiter</groupId>
|
||||
<artifactId>junit-jupiter-engine</artifactId>
|
||||
<version>5.7.2</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.junit.jupiter</groupId>
|
||||
<artifactId>junit-jupiter-params</artifactId>
|
||||
<version>5.7.2</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
||||
<!-- test javafx with TextFX -->
|
||||
<!-- test javafx with TextFX -->
|
||||
<dependency>
|
||||
<groupId>org.testfx</groupId>
|
||||
<artifactId>testfx-core</artifactId>
|
||||
|
|
@ -57,42 +57,42 @@
|
|||
<artifactId>testfx-junit5</artifactId>
|
||||
<version>4.0.16-alpha</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.hamcrest</groupId>
|
||||
<artifactId>hamcrest</artifactId>
|
||||
<version>2.2</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.hamcrest</groupId>
|
||||
<artifactId>hamcrest</artifactId>
|
||||
<version>2.2</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
||||
</dependencies>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<version>3.8.1</version>
|
||||
<configuration>
|
||||
<release>16</release>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-surefire-plugin</artifactId>
|
||||
<version>3.0.0-M5</version>
|
||||
</plugin>
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<version>3.8.1</version>
|
||||
<configuration>
|
||||
<release>16</release>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-surefire-plugin</artifactId>
|
||||
<version>3.0.0-M5</version>
|
||||
</plugin>
|
||||
|
||||
<plugin>
|
||||
<groupId>org.openjfx</groupId>
|
||||
<artifactId>javafx-maven-plugin</artifactId>
|
||||
<version>0.0.6</version>
|
||||
<!-- Default configuration for running -->
|
||||
<!-- Usage: mvn javafx:run -->
|
||||
<configuration>
|
||||
<mainClass>app.App</mainClass>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
<plugin>
|
||||
<groupId>org.openjfx</groupId>
|
||||
<artifactId>javafx-maven-plugin</artifactId>
|
||||
<version>0.0.6</version>
|
||||
<!-- Default configuration for running -->
|
||||
<!-- Usage: mvn javafx:run -->
|
||||
<configuration>
|
||||
<mainClass>app.App</mainClass>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</project>
|
||||
|
|
|
|||
|
|
@ -13,15 +13,15 @@ import java.io.IOException;
|
|||
*/
|
||||
public class App extends Application {
|
||||
|
||||
@Override
|
||||
public void start(Stage stage) throws IOException {
|
||||
FXMLLoader fxmlLoader = new FXMLLoader(this.getClass().getResource("App.fxml"));
|
||||
Parent parent = fxmlLoader.load();
|
||||
stage.setScene(new Scene(parent));
|
||||
stage.show();
|
||||
}
|
||||
@Override
|
||||
public void start(Stage stage) throws IOException {
|
||||
FXMLLoader fxmlLoader = new FXMLLoader(this.getClass().getResource("App.fxml"));
|
||||
Parent parent = fxmlLoader.load();
|
||||
stage.setScene(new Scene(parent));
|
||||
stage.show();
|
||||
}
|
||||
|
||||
public static void main(String[] args) {
|
||||
launch();
|
||||
}
|
||||
public static void main(String[] args) {
|
||||
launch();
|
||||
}
|
||||
}
|
||||
|
|
@ -12,122 +12,122 @@ import javafx.scene.control.ListView;
|
|||
|
||||
public class AppController {
|
||||
|
||||
private Calc calc;
|
||||
private Calc calc;
|
||||
|
||||
public AppController() {
|
||||
calc = new Calc(0.0, 0.0, 0.0);
|
||||
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));
|
||||
}
|
||||
}
|
||||
|
||||
public Calc getCalc() {
|
||||
return calc;
|
||||
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();
|
||||
}
|
||||
|
||||
public void setCalc(Calc calc) {
|
||||
this.calc = calc;
|
||||
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
|
||||
private ListView<Double> operandsView;
|
||||
|
||||
@FXML
|
||||
private Label operandView;
|
||||
|
||||
@FXML
|
||||
void initialize() {
|
||||
updateOperandsView();
|
||||
@FXML
|
||||
void handlePoint() {
|
||||
var operandString = getOperandString();
|
||||
if (operandString.contains(".")) {
|
||||
// TODO remove characters after point
|
||||
} else {
|
||||
// TODO append point
|
||||
}
|
||||
}
|
||||
|
||||
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));
|
||||
}
|
||||
}
|
||||
@FXML
|
||||
void handleClear() {
|
||||
// TODO clear operand
|
||||
}
|
||||
|
||||
private String getOperandString() {
|
||||
return operandView.getText();
|
||||
}
|
||||
@FXML
|
||||
void handleSwap() {
|
||||
// TODO clear operand
|
||||
}
|
||||
|
||||
private boolean hasOperand() {
|
||||
return ! getOperandString().isBlank();
|
||||
}
|
||||
private void performOperation(UnaryOperator<Double> op) {
|
||||
// TODO
|
||||
}
|
||||
|
||||
private double getOperand() {
|
||||
return Double.valueOf(operandView.getText());
|
||||
}
|
||||
|
||||
private void setOperand(String operandString) {
|
||||
operandView.setText(operandString);
|
||||
private void performOperation(boolean swap, BinaryOperator<Double> op) {
|
||||
if (hasOperand()) {
|
||||
// TODO push operand first
|
||||
}
|
||||
// TODO perform operation, but swap first if needed
|
||||
}
|
||||
|
||||
@FXML
|
||||
void handleEnter() {
|
||||
if (hasOperand()) {
|
||||
calc.pushOperand(getOperand());
|
||||
} else {
|
||||
calc.dup();
|
||||
}
|
||||
setOperand("");
|
||||
updateOperandsView();
|
||||
}
|
||||
@FXML
|
||||
void handleOpAdd() {
|
||||
// TODO
|
||||
}
|
||||
|
||||
private void appendToOperand(String s) {
|
||||
// TODO
|
||||
}
|
||||
@FXML
|
||||
void handleOpSub() {
|
||||
// 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
|
||||
}
|
||||
@FXML
|
||||
void handleOpMult() {
|
||||
// TODO
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,111 +6,112 @@ import java.util.function.BinaryOperator;
|
|||
import java.util.function.UnaryOperator;
|
||||
|
||||
public class Calc {
|
||||
|
||||
private final List<Double> operandStack;
|
||||
|
||||
public Calc(double... operands) {
|
||||
operandStack = new ArrayList<>(operands.length + 2);
|
||||
for (var d : operands) {
|
||||
operandStack.add(d);
|
||||
}
|
||||
}
|
||||
private final List<Double> operandStack;
|
||||
|
||||
/**
|
||||
* @return the number of operands on the stack
|
||||
*/
|
||||
public int getOperandCount() {
|
||||
return operandStack.size();
|
||||
public Calc(double... operands) {
|
||||
operandStack = new ArrayList<>(operands.length + 2);
|
||||
for (var d : operands) {
|
||||
operandStack.add(d);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Pushes a new operand onto top of the stack.
|
||||
*
|
||||
* @param d the new operand
|
||||
*/
|
||||
public void pushOperand(double d) {
|
||||
operandStack.add(d);
|
||||
}
|
||||
/**
|
||||
* @return the number of operands on the stack
|
||||
*/
|
||||
public int getOperandCount() {
|
||||
return operandStack.size();
|
||||
}
|
||||
|
||||
/**
|
||||
* @param n the place (from the top) to peek
|
||||
* @return the n'th operand from the top
|
||||
* @throws IllegalArgumentException if n is larger than the operand count
|
||||
*/
|
||||
public double peekOperand(int n) {
|
||||
if (n >= getOperandCount()) {
|
||||
throw new IllegalArgumentException("Cannot peek at position " + n + " when the operand count is " + getOperandCount());
|
||||
}
|
||||
return operandStack.get(getOperandCount() - n - 1);
|
||||
}
|
||||
/**
|
||||
* Pushes a new operand onto top of the stack.
|
||||
*
|
||||
* @param d the new operand
|
||||
*/
|
||||
public void pushOperand(double d) {
|
||||
operandStack.add(d);
|
||||
}
|
||||
|
||||
/**
|
||||
* @return the top operand
|
||||
*/
|
||||
public double peekOperand() {
|
||||
return peekOperand(0);
|
||||
/**
|
||||
* @param n the place (from the top) to peek
|
||||
* @return the n'th operand from the top
|
||||
* @throws IllegalArgumentException if n is larger than the operand count
|
||||
*/
|
||||
public double peekOperand(int n) {
|
||||
if (n >= getOperandCount()) {
|
||||
throw new IllegalArgumentException(
|
||||
"Cannot peek at position " + n + " when the operand count is " + getOperandCount());
|
||||
}
|
||||
return operandStack.get(getOperandCount() - n - 1);
|
||||
}
|
||||
|
||||
/**
|
||||
* Removes and returns the top operand.
|
||||
*
|
||||
* @return the top operand
|
||||
* @throws IllegalStateException if the stack is empty
|
||||
*/
|
||||
public double popOperand() {
|
||||
if (getOperandCount() == 0) {
|
||||
throw new IllegalStateException("Cannot pop from an empty stack");
|
||||
}
|
||||
return operandStack.remove(operandStack.size() - 1);
|
||||
}
|
||||
|
||||
/**
|
||||
* Performs the provided operation in the top operand, and
|
||||
* replaces it with the result.
|
||||
*
|
||||
* @param op the operation to perform
|
||||
* @return the result of performing the operation
|
||||
* @throws IllegalStateException if the operand stack is empty
|
||||
*/
|
||||
public double performOperation(UnaryOperator<Double> op) throws IllegalStateException {
|
||||
// TODO
|
||||
return 0.0;
|
||||
}
|
||||
/**
|
||||
* @return the top operand
|
||||
*/
|
||||
public double peekOperand() {
|
||||
return peekOperand(0);
|
||||
}
|
||||
|
||||
/**
|
||||
* Performs the provided operation in the two topmost operands, and
|
||||
* replaces them with the result.
|
||||
*
|
||||
* @param op the operation to perform
|
||||
* @return the result of performing the operation
|
||||
* @throws IllegalStateException if the operand count is less than two
|
||||
*/
|
||||
public double performOperation(BinaryOperator<Double> op) throws IllegalStateException {
|
||||
if (getOperandCount() < 2) {
|
||||
throw new IllegalStateException("Too few operands (" + getOperandCount() + ") on the stack");
|
||||
}
|
||||
var op2 = popOperand();
|
||||
var op1 = popOperand();
|
||||
var result = op.apply(op1, op2);
|
||||
pushOperand(result);
|
||||
return result;
|
||||
/**
|
||||
* Removes and returns the top operand.
|
||||
*
|
||||
* @return the top operand
|
||||
* @throws IllegalStateException if the stack is empty
|
||||
*/
|
||||
public double popOperand() {
|
||||
if (getOperandCount() == 0) {
|
||||
throw new IllegalStateException("Cannot pop from an empty stack");
|
||||
}
|
||||
return operandStack.remove(operandStack.size() - 1);
|
||||
}
|
||||
|
||||
/**
|
||||
* Swaps the two topmost operands.
|
||||
*
|
||||
* @throws IllegalStateException if the operand count is less than two
|
||||
*/
|
||||
public void swap() {
|
||||
|
||||
}
|
||||
/**
|
||||
* Performs the provided operation in the top operand, and replaces it with the
|
||||
* result.
|
||||
*
|
||||
* @param op the operation to perform
|
||||
* @return the result of performing the operation
|
||||
* @throws IllegalStateException if the operand stack is empty
|
||||
*/
|
||||
public double performOperation(UnaryOperator<Double> op) throws IllegalStateException {
|
||||
// TODO
|
||||
return 0.0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Duplicates the top operand.
|
||||
*
|
||||
* @throws IllegalStateException if the operand stack is empty
|
||||
*/
|
||||
public void dup() {
|
||||
// TODO
|
||||
/**
|
||||
* Performs the provided operation in the two topmost operands, and replaces
|
||||
* them with the result.
|
||||
*
|
||||
* @param op the operation to perform
|
||||
* @return the result of performing the operation
|
||||
* @throws IllegalStateException if the operand count is less than two
|
||||
*/
|
||||
public double performOperation(BinaryOperator<Double> op) throws IllegalStateException {
|
||||
if (getOperandCount() < 2) {
|
||||
throw new IllegalStateException("Too few operands (" + getOperandCount() + ") on the stack");
|
||||
}
|
||||
var op2 = popOperand();
|
||||
var op1 = popOperand();
|
||||
var result = op.apply(op1, op2);
|
||||
pushOperand(result);
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* Swaps the two topmost operands.
|
||||
*
|
||||
* @throws IllegalStateException if the operand count is less than two
|
||||
*/
|
||||
public void swap() {
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Duplicates the top operand.
|
||||
*
|
||||
* @throws IllegalStateException if the operand stack is empty
|
||||
*/
|
||||
public void dup() {
|
||||
// TODO
|
||||
}
|
||||
}
|
||||
|
|
@ -6,59 +6,59 @@
|
|||
<?import javafx.scene.control.ListView?>
|
||||
|
||||
<GridPane xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="app.AppController"
|
||||
alignment="CENTER" hgap="10.0" vgap="10.0" >
|
||||
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"/>
|
||||
<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 n t e r" onAction="#handleEnter"
|
||||
GridPane.rowIndex="2" GridPane.columnIndex="3" GridPane.rowSpan="3"/>
|
||||
<!-- multi-line button label with XML entity for newline -->
|
||||
<Button text="E n t e 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="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"/>
|
||||
<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"/>
|
||||
<!-- 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>
|
||||
|
|
|
|||
|
|
@ -24,107 +24,97 @@ import org.testfx.matcher.control.LabeledMatchers;
|
|||
*/
|
||||
public class AppTest extends ApplicationTest {
|
||||
|
||||
private AppController controller;
|
||||
private Parent root;
|
||||
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();
|
||||
@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));
|
||||
}
|
||||
}
|
||||
|
||||
public Parent getRootNode() {
|
||||
return root;
|
||||
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");
|
||||
}
|
||||
|
||||
private String enterLabel = """
|
||||
E
|
||||
n
|
||||
t
|
||||
e
|
||||
r
|
||||
""".stripTrailing();
|
||||
|
||||
private void click(String... labels) {
|
||||
for (var label : labels) {
|
||||
clickOn(LabeledMatchers.hasText(label));
|
||||
}
|
||||
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 String getOperandString() {
|
||||
return ((Label) getRootNode().lookup("#operandView")).getText();
|
||||
}
|
||||
private void checkView(String operandString, double... operands) {
|
||||
Assertions.assertEquals(operandString, getOperandString());
|
||||
checkView(operands);
|
||||
}
|
||||
|
||||
private ListView<Double> getOperandsView() {
|
||||
return (ListView<Double>) getRootNode().lookup("#operandsView");
|
||||
}
|
||||
// see https://www.baeldung.com/parameterized-tests-junit-5
|
||||
// about @ParameterizedTest
|
||||
|
||||
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");
|
||||
}
|
||||
@ParameterizedTest
|
||||
@MethodSource
|
||||
public void testClicksOperand(String labels, String operandString) {
|
||||
for (var label : labels.split(" ")) {
|
||||
click(label);
|
||||
}
|
||||
checkView(operandString);
|
||||
}
|
||||
|
||||
private void checkView(String operandString, double... operands) {
|
||||
Assertions.assertEquals(operandString, getOperandString());
|
||||
checkView(operands);
|
||||
}
|
||||
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."));
|
||||
}
|
||||
|
||||
// see https://www.baeldung.com/parameterized-tests-junit-5
|
||||
// about @ParameterizedTest
|
||||
@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());
|
||||
}
|
||||
|
||||
@ParameterizedTest
|
||||
@MethodSource
|
||||
public void testClicksOperand(String labels, String operandString) {
|
||||
for (var label : labels.split(" ")) {
|
||||
click(label);
|
||||
}
|
||||
checkView(operandString);
|
||||
}
|
||||
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"));
|
||||
}
|
||||
|
||||
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);
|
||||
}
|
||||
@Test
|
||||
public void testPi() {
|
||||
click("π");
|
||||
checkView("", Math.PI);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,111 +5,110 @@ 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");
|
||||
}
|
||||
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 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 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 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 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() {
|
||||
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 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() {
|
||||
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 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() {
|
||||
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 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);
|
||||
checkCalc(calc, 3.14, 1.0);
|
||||
calc.swap();
|
||||
checkCalc(calc, 1.0, 3.14);
|
||||
calc.swap();
|
||||
checkCalc(calc, 3.14, 1.0);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSwap() {
|
||||
Calc calc = new Calc(1.0, 3.14);
|
||||
checkCalc(calc, 3.14, 1.0);
|
||||
calc.swap();
|
||||
checkCalc(calc, 1.0, 3.14);
|
||||
calc.swap();
|
||||
checkCalc(calc, 3.14, 1.0);
|
||||
}
|
||||
@Test
|
||||
public void testSwap_lessThanTwoOperands() {
|
||||
Assertions.assertThrows(IllegalStateException.class, () -> new Calc(1.0).swap());
|
||||
Assertions.assertThrows(IllegalStateException.class, () -> new Calc().swap());
|
||||
}
|
||||
|
||||
@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() {
|
||||
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());
|
||||
}
|
||||
@Test
|
||||
public void testDup_emptyOperandStack() {
|
||||
Assertions.assertThrows(IllegalStateException.class, () -> new Calc().dup());
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue