diff --git a/test/unit_test/static/unit_symbol_test.cpp b/test/unit_test/static/unit_symbol_test.cpp index d2621d44..d5a41358 100644 --- a/test/unit_test/static/unit_symbol_test.cpp +++ b/test/unit_test/static/unit_symbol_test.cpp @@ -41,59 +41,59 @@ static_assert(unit_symbol(metre) == "m"); static_assert(unit_symbol(second) == "s"); static_assert(unit_symbol(joule) == "J"); static_assert(unit_symbol(degree_Celsius) == "\u00B0C"); -static_assert(unit_symbol(degree_Celsius, {.encoding = ascii}) == "`C"); +static_assert(unit_symbol(degree_Celsius) == "`C"); static_assert(unit_symbol(kilogram) == "kg"); static_assert(unit_symbol(hour) == "h"); // prefixed units static_assert(unit_symbol(quecto) == "qΩ"); -static_assert(unit_symbol(quecto, {.encoding = ascii}) == "qohm"); +static_assert(unit_symbol(quecto) == "qohm"); static_assert(unit_symbol(ronto) == "rΩ"); -static_assert(unit_symbol(ronto, {.encoding = ascii}) == "rohm"); +static_assert(unit_symbol(ronto) == "rohm"); static_assert(unit_symbol(yocto) == "yΩ"); -static_assert(unit_symbol(yocto, {.encoding = ascii}) == "yohm"); +static_assert(unit_symbol(yocto) == "yohm"); static_assert(unit_symbol(zepto) == "zΩ"); -static_assert(unit_symbol(zepto, {.encoding = ascii}) == "zohm"); +static_assert(unit_symbol(zepto) == "zohm"); static_assert(unit_symbol(atto) == "aΩ"); -static_assert(unit_symbol(atto, {.encoding = ascii}) == "aohm"); +static_assert(unit_symbol(atto) == "aohm"); static_assert(unit_symbol(femto) == "fΩ"); -static_assert(unit_symbol(femto, {.encoding = ascii}) == "fohm"); +static_assert(unit_symbol(femto) == "fohm"); static_assert(unit_symbol(pico) == "pΩ"); -static_assert(unit_symbol(pico, {.encoding = ascii}) == "pohm"); +static_assert(unit_symbol(pico) == "pohm"); static_assert(unit_symbol(nano) == "nΩ"); -static_assert(unit_symbol(nano, {.encoding = ascii}) == "nohm"); +static_assert(unit_symbol(nano) == "nohm"); static_assert(unit_symbol(micro) == "µΩ"); -static_assert(unit_symbol(micro, {.encoding = ascii}) == "uohm"); +static_assert(unit_symbol(micro) == "uohm"); static_assert(unit_symbol(milli) == "mΩ"); -static_assert(unit_symbol(milli, {.encoding = ascii}) == "mohm"); +static_assert(unit_symbol(milli) == "mohm"); static_assert(unit_symbol(centi) == "cΩ"); -static_assert(unit_symbol(centi, {.encoding = ascii}) == "cohm"); +static_assert(unit_symbol(centi) == "cohm"); static_assert(unit_symbol(deci) == "dΩ"); -static_assert(unit_symbol(deci, {.encoding = ascii}) == "dohm"); +static_assert(unit_symbol(deci) == "dohm"); static_assert(unit_symbol(deca) == "daΩ"); -static_assert(unit_symbol(deca, {.encoding = ascii}) == "daohm"); +static_assert(unit_symbol(deca) == "daohm"); static_assert(unit_symbol(hecto) == "hΩ"); -static_assert(unit_symbol(hecto, {.encoding = ascii}) == "hohm"); +static_assert(unit_symbol(hecto) == "hohm"); static_assert(unit_symbol(kilo) == "kΩ"); -static_assert(unit_symbol(kilo, {.encoding = ascii}) == "kohm"); +static_assert(unit_symbol(kilo) == "kohm"); static_assert(unit_symbol(mega) == "MΩ"); -static_assert(unit_symbol(mega, {.encoding = ascii}) == "Mohm"); +static_assert(unit_symbol(mega) == "Mohm"); static_assert(unit_symbol(giga) == "GΩ"); -static_assert(unit_symbol(giga, {.encoding = ascii}) == "Gohm"); +static_assert(unit_symbol(giga) == "Gohm"); static_assert(unit_symbol(tera) == "TΩ"); -static_assert(unit_symbol(tera, {.encoding = ascii}) == "Tohm"); +static_assert(unit_symbol(tera) == "Tohm"); static_assert(unit_symbol(peta) == "PΩ"); -static_assert(unit_symbol(peta, {.encoding = ascii}) == "Pohm"); +static_assert(unit_symbol(peta) == "Pohm"); static_assert(unit_symbol(exa) == "EΩ"); -static_assert(unit_symbol(exa, {.encoding = ascii}) == "Eohm"); +static_assert(unit_symbol(exa) == "Eohm"); static_assert(unit_symbol(zetta) == "ZΩ"); -static_assert(unit_symbol(zetta, {.encoding = ascii}) == "Zohm"); +static_assert(unit_symbol(zetta) == "Zohm"); static_assert(unit_symbol(yotta) == "YΩ"); -static_assert(unit_symbol(yotta, {.encoding = ascii}) == "Yohm"); +static_assert(unit_symbol(yotta) == "Yohm"); static_assert(unit_symbol(ronna) == "RΩ"); -static_assert(unit_symbol(ronna, {.encoding = ascii}) == "Rohm"); +static_assert(unit_symbol(ronna) == "Rohm"); static_assert(unit_symbol(quetta) == "QΩ"); -static_assert(unit_symbol(quetta, {.encoding = ascii}) == "Qohm"); +static_assert(unit_symbol(quetta) == "Qohm"); static_assert(unit_symbol(kibi) == "Kibit"); static_assert(unit_symbol(mebi) == "Mibit"); @@ -106,55 +106,72 @@ static_assert(unit_symbol(yobi) == "Yibit"); // scaled units static_assert(unit_symbol(mag<100> * metre) == "× 10² m"); -static_assert(unit_symbol(mag<100> * metre, {.encoding = ascii}) == "x 10^2 m"); +static_assert(unit_symbol(mag<100> * metre) == "x 10^2 m"); static_assert(unit_symbol(mag<60> * second) == "[6 × 10¹] s"); -static_assert(unit_symbol(mag<60> * second, {.encoding = ascii}) == "[6 x 10^1] s"); +static_assert(unit_symbol(mag<60> * second) == "[6 x 10^1] s"); static_assert(unit_symbol(mag * metre / second) == "[1/18] m/s"); // derived units static_assert(unit_symbol(one) == ""); static_assert(unit_symbol(percent) == "%"); static_assert(unit_symbol(per_mille) == "‰"); -static_assert(unit_symbol(per_mille, {.encoding = ascii}) == "%o"); +static_assert(unit_symbol(per_mille) == "%o"); static_assert(unit_symbol(square(metre)) == "m²"); -static_assert(unit_symbol(square(metre), {.encoding = ascii}) == "m^2"); +static_assert(unit_symbol(square(metre)) == "m^2"); static_assert(unit_symbol(cubic(metre)) == "m³"); -static_assert(unit_symbol(cubic(metre), {.encoding = ascii}) == "m^3"); +static_assert(unit_symbol(cubic(metre)) == "m^3"); static_assert(unit_symbol(kilo * metre) == "km m"); -static_assert(unit_symbol(kilo * metre, {.separator = half_high_dot}) == "km⋅m"); +static_assert(unit_symbol(kilo * metre) == "km⋅m"); static_assert(unit_symbol(metre / metre) == ""); static_assert(unit_symbol(kilo / metre) == "km/m"); -static_assert(unit_symbol(kilo / metre, {.solidus = never}) == "km m⁻¹"); -static_assert(unit_symbol(kilo / metre, {.encoding = ascii, .solidus = never}) == "km m^-1"); +static_assert(unit_symbol(kilo / metre) == "km m⁻¹"); +static_assert(unit_symbol(kilo / metre) == + "km m^-1"); static_assert(unit_symbol(metre / second) == "m/s"); -static_assert(unit_symbol(metre / second, {.solidus = always}) == "m/s"); -static_assert(unit_symbol(metre / second, {.solidus = never}) == "m s⁻¹"); -static_assert(unit_symbol(metre / second, {.encoding = ascii, .solidus = never}) == "m s^-1"); -static_assert(unit_symbol(metre / second, {.solidus = never, .separator = half_high_dot}) == "m⋅s⁻¹"); +static_assert(unit_symbol(metre / second) == "m/s"); +static_assert(unit_symbol(metre / second) == "m s⁻¹"); +static_assert(unit_symbol(metre / second) == "m s^-1"); +static_assert(unit_symbol(metre / second) == + "m⋅s⁻¹"); static_assert(unit_symbol(metre / square(second)) == "m/s²"); -static_assert(unit_symbol(metre / square(second), {.encoding = ascii}) == "m/s^2"); -static_assert(unit_symbol(metre / square(second), {.solidus = always}) == "m/s²"); -static_assert(unit_symbol(metre / square(second), {.encoding = ascii, .solidus = always}) == "m/s^2"); -static_assert(unit_symbol(metre / square(second), {.solidus = never}) == "m s⁻²"); -static_assert(unit_symbol(metre / square(second), {.encoding = ascii, .solidus = never}) == "m s^-2"); -static_assert(unit_symbol(metre / square(second), {.solidus = never, .separator = half_high_dot}) == "m⋅s⁻²"); +static_assert(unit_symbol(metre / square(second)) == "m/s^2"); +static_assert(unit_symbol(metre / square(second)) == "m/s²"); +static_assert(unit_symbol(metre / square(second)) == + "m/s^2"); +static_assert(unit_symbol(metre / square(second)) == "m s⁻²"); +static_assert(unit_symbol(metre / square(second)) == + "m s^-2"); +static_assert(unit_symbol(metre / + square(second)) == + "m⋅s⁻²"); static_assert(unit_symbol(kilogram * metre / square(second)) == "kg m/s²"); -static_assert(unit_symbol(kilogram * metre / square(second), {.separator = half_high_dot}) == "kg⋅m/s²"); -static_assert(unit_symbol(kilogram * metre / square(second), {.encoding = ascii}) == "kg m/s^2"); -static_assert(unit_symbol(kilogram * metre / square(second), {.solidus = always}) == "kg m/s²"); -static_assert(unit_symbol(kilogram * metre / square(second), {.encoding = ascii, .solidus = always}) == "kg m/s^2"); -static_assert(unit_symbol(kilogram * metre / square(second), {.solidus = never}) == "kg m s⁻²"); -static_assert(unit_symbol(kilogram * metre / square(second), {.encoding = ascii, .solidus = never}) == "kg m s^-2"); -static_assert(unit_symbol(kilogram * metre / square(second), {.solidus = never, .separator = half_high_dot}) == +static_assert(unit_symbol(kilogram * metre / square(second)) == + "kg⋅m/s²"); +static_assert(unit_symbol(kilogram * metre / square(second)) == "kg m/s^2"); +static_assert(unit_symbol(kilogram * metre / square(second)) == "kg m/s²"); +static_assert(unit_symbol(kilogram * metre / + square(second)) == "kg m/s^2"); +static_assert(unit_symbol(kilogram * metre / square(second)) == "kg m s⁻²"); +static_assert(unit_symbol(kilogram * metre / + square(second)) == "kg m s^-2"); +static_assert(unit_symbol(kilogram * metre / + square(second)) == "kg⋅m⋅s⁻²"); static_assert(unit_symbol(kilogram / metre / square(second)) == "kg m⁻¹ s⁻²"); -static_assert(unit_symbol(kilogram / metre / square(second), {.separator = half_high_dot}) == "kg⋅m⁻¹⋅s⁻²"); -static_assert(unit_symbol(kilogram / metre / square(second), {.encoding = ascii}) == "kg m^-1 s^-2"); -static_assert(unit_symbol(kilogram / metre / square(second), {.solidus = always}) == "kg/(m s²)"); -static_assert(unit_symbol(kilogram / metre / square(second), {.encoding = ascii, .solidus = always}) == "kg/(m s^2)"); -static_assert(unit_symbol(kilogram / metre / square(second), {.solidus = never}) == "kg m⁻¹ s⁻²"); -static_assert(unit_symbol(kilogram / metre / square(second), {.encoding = ascii, .solidus = never}) == "kg m^-1 s^-2"); -static_assert(unit_symbol(kilogram / metre / square(second), {.solidus = never, .separator = half_high_dot}) == +static_assert(unit_symbol(kilogram / metre / square(second)) == + "kg⋅m⁻¹⋅s⁻²"); +static_assert(unit_symbol(kilogram / metre / square(second)) == + "kg m^-1 s^-2"); +static_assert(unit_symbol(kilogram / metre / square(second)) == "kg/(m s²)"); +static_assert(unit_symbol(kilogram / metre / + square(second)) == + "kg/(m s^2)"); +static_assert(unit_symbol(kilogram / metre / square(second)) == "kg m⁻¹ s⁻²"); +static_assert(unit_symbol(kilogram / metre / + square(second)) == + "kg m^-1 s^-2"); +static_assert(unit_symbol(kilogram / metre / + square(second)) == "kg⋅m⁻¹⋅s⁻²"); static_assert(unit_symbol(pow<123>(metre)) == "m¹²³"); static_assert(unit_symbol(pow<1, 2>(metre)) == "m^(1/2)");