ilja_space/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Fix tests, fix units

Browse source
This commit is contained in:
Pieter Vander Vennet 2021-07-04 20:36:19 +02:00
parent 8b1b843dbe
commit fb3e3a040b
7 changed files with 52 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
test/TestAll.ts
View file

@ -11,6 +11,7 @@ import {FixedUiElement} from "../UI/Base/FixedUiElement";
import Combine from "../UI/Base/Combine";
import OsmObjectSpec from "./OsmObject.spec";
import ScriptUtils from "../scripts/ScriptUtils";
import UnitsSpec from "./Units.spec";
@ -37,7 +38,8 @@ const allTests = [
new GeoOperationsSpec(),
new ImageSearcherSpec(),
new ThemeSpec(),
new UtilsSpec()
new UtilsSpec(),
new UnitsSpec()
]

32
test/Units.spec.ts
View file

@ -1,5 +1,5 @@
import T from "./TestHelper";
import {Denomination} from "../Customizations/JSON/Denomination";
import {Denomination, Unit} from "../Customizations/JSON/Denomination";
import {equal} from "assert";
export default class UnitsSpec extends T {
@ -17,13 +17,33 @@ export default class UnitsSpec extends T {
}
}, "test")
equal(unit.canonicalValue("42m"), "42m")
equal(unit.canonicalValue("42"), "42m")
equal(unit.canonicalValue("42 m"), "42m")
equal(unit.canonicalValue("42 meter"), "42m")
equal(unit.canonicalValue("42m"), "42 m")
equal(unit.canonicalValue("42"), "42 m")
equal(unit.canonicalValue("42 m"), "42 m")
equal(unit.canonicalValue("42 meter"), "42 m")
}]
}],
["Advanced canonicalize and back", () => {
const unit = new Denomination({
"canonicalDenomination": "MW",
"alternativeDenomination": ["megawatts", "megawatt"],
"human": {
"en": " megawatts",
"nl": " megawatt"
},
"default": true
}, "test");
const canonical = unit.canonicalValue("5")
equal(canonical, "5 MW")
const units = new Unit(["key"], [unit], false)
const [detected, detectedDenom] = units.findDenomination("5 MW")
equal(detected, "5")
equal(detectedDenom, unit)
}
]
]);