From 051f6779be836cd9a5205f0c6527fd3a6f734ed1 Mon Sep 17 00:00:00 2001 From: Adrien Hopkins Date: Sun, 17 Jul 2022 14:39:16 -0500 Subject: Added a GUI test simulating unit conversion --- src/test/java/sevenUnitsGUI/TabbedViewTest.java | 60 +++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 src/test/java/sevenUnitsGUI/TabbedViewTest.java (limited to 'src/test/java/sevenUnitsGUI/TabbedViewTest.java') diff --git a/src/test/java/sevenUnitsGUI/TabbedViewTest.java b/src/test/java/sevenUnitsGUI/TabbedViewTest.java new file mode 100644 index 0000000..a669773 --- /dev/null +++ b/src/test/java/sevenUnitsGUI/TabbedViewTest.java @@ -0,0 +1,60 @@ +/** + * Copyright (C) 2022 Adrien Hopkins + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ +package sevenUnitsGUI; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.junit.jupiter.api.Test; + +/** + * Test for the TabbedView + * + * @since v0.4.0 + * @since 2022-07-17 + */ +class TabbedViewTest { + /** + * Simulates a unit conversion operation, and ensures it works properly. + * + * @since 2022-07-17 + */ + @Test + void testUnitConversion() { + // setup view + final var view = new TabbedView(); + final var presenter = view.getPresenter(); + presenter.setNumberDisplayRule(StandardDisplayRules.uncertaintyBased()); + presenter.setPrefixRepetitionRule( + DefaultPrefixRepetitionRule.NO_RESTRICTION); + presenter.setSearchRule(PrefixSearchRule.COMMON_PREFIXES); + presenter.setOneWayConversionEnabled(false); + presenter.setShowDuplicates(true); + + // prepare for unit conversion + view.masterPane.setSelectedIndex(0); + view.dimensionSelector.setSelectedItem("LENGTH"); + view.fromSearch.getSearchList().setSelectedValue("inch", true); + view.toSearch.getSearchList().setSelectedValue("metre", true); + view.valueInput.setText("250.0"); + + view.convertUnitButton.doClick(); + + // check result of conversion + assertEquals("250.0 inch = 6.350 metre", view.unitOutput.getText()); + } + +} -- cgit v1.2.3 From e03a1e9a41e636a925c9bb6ad03be3e8b51b535f Mon Sep 17 00:00:00 2001 From: Adrien Hopkins Date: Sun, 17 Jul 2022 14:43:01 -0500 Subject: Added a GUI test simulating expression conversion --- src/main/java/sevenUnitsGUI/TabbedView.java | 21 ++++++------ src/test/java/sevenUnitsGUI/TabbedViewTest.java | 43 ++++++++++++++++++++++--- 2 files changed, 51 insertions(+), 13 deletions(-) (limited to 'src/test/java/sevenUnitsGUI/TabbedViewTest.java') diff --git a/src/main/java/sevenUnitsGUI/TabbedView.java b/src/main/java/sevenUnitsGUI/TabbedView.java index ca20216..dfea2c6 100644 --- a/src/main/java/sevenUnitsGUI/TabbedView.java +++ b/src/main/java/sevenUnitsGUI/TabbedView.java @@ -166,18 +166,20 @@ final class TabbedView implements ExpressionConversionView, UnitConversionView { final SearchBoxList fromSearch; /** The panel for "To" in the dimension-based converter */ final SearchBoxList toSearch; - /** The output area in the dimension-based converter */ - final JTextArea unitOutput; /** The button used for conversion */ final JButton convertUnitButton; + /** The output area in the dimension-based converter */ + final JTextArea unitOutput; // EXPRESSION-BASED CONVERTER /** The "From" entry in the conversion panel */ - private final JTextField fromEntry; + final JTextField fromEntry; /** The "To" entry in the conversion panel */ - private final JTextField toEntry; + final JTextField toEntry; + /** The button used for conversion */ + final JButton convertExpressionButton; /** The output area in the conversion panel */ - private final JTextArea expressionOutput; + final JTextArea expressionOutput; // UNIT AND PREFIX VIEWERS /** The searchable list of unit names in the unit viewer */ @@ -292,11 +294,12 @@ final class TabbedView implements ExpressionConversionView, UnitConversionView { this.toEntry.setBorder(BorderFactory.createTitledBorder("To")); // button to convert - final JButton convertButton = new JButton("Convert"); - convertExpressionPanel.add(convertButton); + this.convertExpressionButton = new JButton("Convert"); + convertExpressionPanel.add(this.convertExpressionButton); - convertButton.addActionListener(e -> this.presenter.convertExpressions()); - convertButton.setMnemonic(KeyEvent.VK_ENTER); + this.convertExpressionButton + .addActionListener(e -> this.presenter.convertExpressions()); + this.convertExpressionButton.setMnemonic(KeyEvent.VK_ENTER); // output of conversion this.expressionOutput = new JTextArea(2, 32); diff --git a/src/test/java/sevenUnitsGUI/TabbedViewTest.java b/src/test/java/sevenUnitsGUI/TabbedViewTest.java index a669773..9d3ecce 100644 --- a/src/test/java/sevenUnitsGUI/TabbedViewTest.java +++ b/src/test/java/sevenUnitsGUI/TabbedViewTest.java @@ -28,15 +28,15 @@ import org.junit.jupiter.api.Test; */ class TabbedViewTest { /** - * Simulates a unit conversion operation, and ensures it works properly. + * @return a view with all settings set to standard values * + * @since v0.4.0 * @since 2022-07-17 */ - @Test - void testUnitConversion() { - // setup view + private static final TabbedView setupView() { final var view = new TabbedView(); final var presenter = view.getPresenter(); + presenter.setNumberDisplayRule(StandardDisplayRules.uncertaintyBased()); presenter.setPrefixRepetitionRule( DefaultPrefixRepetitionRule.NO_RESTRICTION); @@ -44,6 +44,41 @@ class TabbedViewTest { presenter.setOneWayConversionEnabled(false); presenter.setShowDuplicates(true); + return view; + } + + /** + * Simulates an expression conversion operation, and ensures it works + * properly. + * + * @since v0.4.0 + * @since 2022-07-17 + */ + @Test + void testExpressionConversion() { + final var view = setupView(); + + // prepare for unit conversion + view.masterPane.setSelectedIndex(1); + view.fromEntry.setText("250.0 inch"); + view.toEntry.setText("metre"); + + view.convertExpressionButton.doClick(); + + // check result of conversion + assertEquals("250.0 inch = 6.350 metre", view.expressionOutput.getText()); + } + + /** + * Simulates a unit conversion operation, and ensures it works properly. + * + * @since v0.4.0 + * @since 2022-07-17 + */ + @Test + void testUnitConversion() { + final var view = setupView(); + // prepare for unit conversion view.masterPane.setSelectedIndex(0); view.dimensionSelector.setSelectedItem("LENGTH"); -- cgit v1.2.3 From a6ba3bcae1e7530ef14b8eea3fcd1f4629ba03b8 Mon Sep 17 00:00:00 2001 From: Adrien Hopkins Date: Sun, 17 Jul 2022 16:16:56 -0500 Subject: All dimension names are now in title case --- CHANGELOG.org | 1 + src/main/java/sevenUnitsGUI/Presenter.java | 10 +++++----- src/main/resources/dimensionfile.txt | 16 ++++++++-------- src/test/java/sevenUnitsGUI/TabbedViewTest.java | 2 +- 4 files changed, 15 insertions(+), 14 deletions(-) (limited to 'src/test/java/sevenUnitsGUI/TabbedViewTest.java') diff --git a/CHANGELOG.org b/CHANGELOG.org index da11d45..90f6cfa 100644 --- a/CHANGELOG.org +++ b/CHANGELOG.org @@ -15,6 +15,7 @@ - Rounding rules are now in their own classes - The "Show Duplicates" setting now affects the prefix viewer in addition to units - Tweaked the look of the unit and expression conversion sections of the view + - Default dimension names are in title case, not uppercase. ** v0.3.2 - [2021-12-02 Thu] *** Added - Added lots more tests for the backend and utilities diff --git a/src/main/java/sevenUnitsGUI/Presenter.java b/src/main/java/sevenUnitsGUI/Presenter.java index a5c4d48..abdd1f6 100644 --- a/src/main/java/sevenUnitsGUI/Presenter.java +++ b/src/main/java/sevenUnitsGUI/Presenter.java @@ -90,10 +90,10 @@ public final class Presenter { database.addUnit("tempFahrenheit", BritishImperial.FAHRENHEIT); // load initial dimensions - database.addDimension("LENGTH", Metric.Dimensions.LENGTH); - database.addDimension("MASS", Metric.Dimensions.MASS); - database.addDimension("TIME", Metric.Dimensions.TIME); - database.addDimension("TEMPERATURE", Metric.Dimensions.TEMPERATURE); + database.addDimension("Length", Metric.Dimensions.LENGTH); + database.addDimension("Mass", Metric.Dimensions.MASS); + database.addDimension("Time", Metric.Dimensions.TIME); + database.addDimension("Temperature", Metric.Dimensions.TEMPERATURE); } /** @@ -622,7 +622,7 @@ public final class Presenter { * @return true iff the One-Way Conversion feature is available (views that * show units as a list will have metric units removed from the From * unit list and imperial/USC units removed from the To unit list) - * + * * @since 2022-03-30 */ public boolean oneWayConversionEnabled() { diff --git a/src/main/resources/dimensionfile.txt b/src/main/resources/dimensionfile.txt index a946677..d767e9f 100644 --- a/src/main/resources/dimensionfile.txt +++ b/src/main/resources/dimensionfile.txt @@ -6,13 +6,13 @@ # I have excluded electric current, quantity and luminous intensity since their units are exclusively SI. -LENGTH ! -MASS ! -TIME ! -TEMPERATURE ! +Length ! +Mass ! +Time ! +Temperature ! # Derived Dimensions -Area LENGTH^2 -Volume LENGTH^3 -Velocity LENGTH / TIME -Energy MASS * Velocity^2 \ No newline at end of file +Area Length^2 +Volume Length^3 +Velocity Length / Time +Energy Mass * Velocity^2 \ No newline at end of file diff --git a/src/test/java/sevenUnitsGUI/TabbedViewTest.java b/src/test/java/sevenUnitsGUI/TabbedViewTest.java index 9d3ecce..00092a4 100644 --- a/src/test/java/sevenUnitsGUI/TabbedViewTest.java +++ b/src/test/java/sevenUnitsGUI/TabbedViewTest.java @@ -81,7 +81,7 @@ class TabbedViewTest { // prepare for unit conversion view.masterPane.setSelectedIndex(0); - view.dimensionSelector.setSelectedItem("LENGTH"); + view.dimensionSelector.setSelectedItem("Length"); view.fromSearch.getSearchList().setSelectedValue("inch", true); view.toSearch.getSearchList().setSelectedValue("metre", true); view.valueInput.setText("250.0"); -- cgit v1.2.3