From f6c0a752776b8514698415a1c85a9e4c5dec2252 Mon Sep 17 00:00:00 2001 From: Florian Enner Date: Tue, 8 Aug 2023 09:00:01 +0200 Subject: [PATCH] updated unit tests to match updated axis default font --- .../chartfx/axes/spi/AbstractAxisParameterTests.java | 2 +- .../io/fair_acc/chartfx/axes/spi/AbstractAxisTests.java | 8 ++++---- .../chartfx/plugins/YWatchValueIndicatorTest.java | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/chartfx-chart/src/test/java/io/fair_acc/chartfx/axes/spi/AbstractAxisParameterTests.java b/chartfx-chart/src/test/java/io/fair_acc/chartfx/axes/spi/AbstractAxisParameterTests.java index e4df9e429..af2de6da4 100644 --- a/chartfx-chart/src/test/java/io/fair_acc/chartfx/axes/spi/AbstractAxisParameterTests.java +++ b/chartfx-chart/src/test/java/io/fair_acc/chartfx/axes/spi/AbstractAxisParameterTests.java @@ -173,7 +173,7 @@ void testBasicGetterSetters() { assertTrue(state.isDirty(ChartBits.AxisLayout)); state.clear(ChartBits.AxisLayout); } - axis.setSide(null); + assertThrows(IllegalArgumentException.class, () -> axis.setSide(null)); assertEquals(Double.NaN, axis.getLength()); axis.setSide(Side.LEFT); diff --git a/chartfx-chart/src/test/java/io/fair_acc/chartfx/axes/spi/AbstractAxisTests.java b/chartfx-chart/src/test/java/io/fair_acc/chartfx/axes/spi/AbstractAxisTests.java index ea8dc63b9..acc50b609 100644 --- a/chartfx-chart/src/test/java/io/fair_acc/chartfx/axes/spi/AbstractAxisTests.java +++ b/chartfx-chart/src/test/java/io/fair_acc/chartfx/axes/spi/AbstractAxisTests.java @@ -160,20 +160,20 @@ void testHelper() { axis.setUnit(null); axis.setSide(Side.BOTTOM); assertEquals(+1.0, axis.calculateNewScale(10, -5.0, +5.0)); - assertEquals(+25, axis.computePrefHeight(100), 2); + assertEquals(+30, axis.computePrefHeight(100), 2); assertEquals(+150.0, axis.computePrefWidth(-1)); axis.setSide(Side.LEFT); assertEquals(-1.0, axis.calculateNewScale(10, -5.0, +5.0)); assertEquals(+150, axis.computePrefHeight(-1)); - assertEquals(+22, axis.computePrefWidth(100), 2); + assertEquals(+26, axis.computePrefWidth(100), 2); axis.setUnit(""); axis.setSide(Side.BOTTOM); - assertEquals(+44, axis.computePrefHeight(100), 2); + assertEquals(+49, axis.computePrefHeight(100), 2); assertEquals(+150.0, axis.computePrefWidth(-1)); axis.setSide(Side.LEFT); assertEquals(+150, axis.computePrefHeight(-1)); - assertEquals(+44, axis.computePrefWidth(100), 2); + assertEquals(+48, axis.computePrefWidth(100), 2); assertDoesNotThrow(axis::clear); assertDoesNotThrow(axis::forceRedraw); diff --git a/chartfx-chart/src/test/java/io/fair_acc/chartfx/plugins/YWatchValueIndicatorTest.java b/chartfx-chart/src/test/java/io/fair_acc/chartfx/plugins/YWatchValueIndicatorTest.java index 64f086024..e0971f8e4 100644 --- a/chartfx-chart/src/test/java/io/fair_acc/chartfx/plugins/YWatchValueIndicatorTest.java +++ b/chartfx-chart/src/test/java/io/fair_acc/chartfx/plugins/YWatchValueIndicatorTest.java @@ -75,7 +75,7 @@ void rightSide() { @TestFx void setMarkerValue() { valueWatchIndicatorTested.setMarkerValue(35.15); - assertTrue(valueWatchIndicatorTested.getText().matches("35[\\.,]15")); // US or German locale + assertEquals("35", valueWatchIndicatorTested.getText()); assertEquals(35.15, valueWatchIndicatorTested.getValue(), 1e-2); }