diff options
| author | Adrien Hopkins <ahopk127@my.yorku.ca> | 2022-07-08 10:35:36 -0500 |
|---|---|---|
| committer | Adrien Hopkins <ahopk127@my.yorku.ca> | 2022-07-08 10:35:36 -0500 |
| commit | 7dac440cfbbea898ebd3963d24356119e7247ddb (patch) | |
| tree | 7fa8f2aabed81e4dc5a3e80ac6abb0092feb3b2f /src | |
| parent | b80d16bfd2dca34733e5cb37283df93d10805512 (diff) | |
Specified the search rule in tests affected by it
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/java/sevenUnitsGUI/PresenterTest.java | 3 | ||||
| -rw-r--r-- | src/test/resources/test-settings.txt | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/test/java/sevenUnitsGUI/PresenterTest.java b/src/test/java/sevenUnitsGUI/PresenterTest.java index 3364e83..0f54e7e 100644 --- a/src/test/java/sevenUnitsGUI/PresenterTest.java +++ b/src/test/java/sevenUnitsGUI/PresenterTest.java @@ -149,6 +149,7 @@ public final class PresenterTest { presenter.database.addUnit("metre", metre); presenter.database.addUnit("meter", meter); presenter.setOneWayConversionEnabled(false); + presenter.setSearchRule(PrefixSearchRule.NO_PREFIXES); // test that only one of them is included if duplicate units disabled presenter.setShowDuplicates(false); @@ -182,6 +183,7 @@ public final class PresenterTest { presenter.database.addUnit("metre", Metric.METRE); presenter.database.addUnit("inch", BritishImperial.Length.INCH); presenter.database.addUnit("tempC", Metric.CELSIUS); + presenter.setSearchRule(PrefixSearchRule.NO_PREFIXES); // test that units are removed from each side when one-way conversion is // enabled @@ -327,6 +329,7 @@ public final class PresenterTest { final ViewBot viewBot = new ViewBot(); final Presenter presenter = new Presenter(viewBot); presenter.setOneWayConversionEnabled(false); + presenter.setSearchRule(PrefixSearchRule.NO_PREFIXES); // override default database units presenter.database.clear(); diff --git a/src/test/resources/test-settings.txt b/src/test/resources/test-settings.txt index a0f494a..23c1f25 100644 --- a/src/test/resources/test-settings.txt +++ b/src/test/resources/test-settings.txt @@ -2,3 +2,4 @@ number_display_rule=Round to 11 significant figures prefix_rule=COMPLEX_REPETITION one_way=true include_duplicates=true +search_prefix_rule=Apply the following prefixes: [kilo (× 1000.0), milli (× 0.001)] |