Skip to content
This repository has been archived by the owner on May 26, 2021. It is now read-only.

Commit

Permalink
58: micro not recognised when using 03BC instead of 00B5
Browse files Browse the repository at this point in the history
  • Loading branch information
keilw committed Apr 15, 2019
1 parent 7b3c4eb commit 9ab51bb
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 25 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<name>Units of Measurement project</name>
<url>http://unitsofmeasurement.github.io</url>
</organization>
<version>1.0.10-SNAPSHOT</version>
<version>1.0.10</version>
<packaging>bundle</packaging>
<parent>
<groupId>tec.uom</groupId>
Expand Down
14 changes: 7 additions & 7 deletions src/main/java/tec/uom/se/format/SimpleUnitFormat.java
Original file line number Diff line number Diff line change
Expand Up @@ -897,14 +897,14 @@ public boolean isValidIdentifier(String name) {
FEMTO.getConverter(), ATTO.getConverter(), ZEPTO.getConverter(), YOCTO.getConverter() };

private static final String MU = "\u03bc";

private static String asciiPrefix(String prefix) {
return "µ".equals(prefix) ? "micro" : prefix;
}

private static String asciiSymbol(String s) {
return "Ω".equals(s) ? "Ohm" : s;
}
return "Ω".equals(s) ? "Ohm" : s;
}

// to check if a string only contains US-ASCII characters
//
Expand Down Expand Up @@ -945,16 +945,16 @@ protected static boolean isAllASCII(String input) {
continue; // kg is already defined.
DEFAULT.label(Units.KILOGRAM.transform(CONVERTERS[i].concatenate(MILLI.getConverter())), PREFIXES[i] + "g");
if ("µ".equals(PREFIXES[i])) {
DEFAULT.label(MICRO(Units.GRAM), "µg");
ASCII.label(Units.KILOGRAM.transform(CONVERTERS[i].concatenate(MILLI.getConverter())), "microg");
DEFAULT.label(MICRO(Units.GRAM), "µg");
ASCII.label(Units.KILOGRAM.transform(CONVERTERS[i].concatenate(MILLI.getConverter())), "microg");
}
}

// Hack, somehow µg is not found.
SYMBOL_TO_UNIT.put(MICRO.getSymbol() + "g", MICRO(Units.GRAM));
SYMBOL_TO_UNIT.put("μg", MICRO(Units.GRAM));
SYMBOL_TO_UNIT.put(MU + "g", MICRO(Units.GRAM));

// Alias and ASCIIFormat for Ohm
DEFAULT.alias(Units.OHM, "Ohm");
ASCII.label(Units.OHM, "Ohm");
Expand Down
12 changes: 6 additions & 6 deletions src/test/java/tec/uom/se/format/EBNFFormatTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -118,15 +118,15 @@ public void testParseIrregularStringEBNF() {
Unit<?> u = format.parse("bl//^--1a");
// System.out.println(u);
}

@Test
@Ignore("https://github.com/unitsofmeasurement/uom-se/issues/issues/201")
public void testRoundtripDemo() {
String unit = "µmol*m^-2*446.2";
Unit<?> parsed = format.parse(unit);
String formatted = format.format(parsed);
System.out.println("Formatted version: " + formatted);
Unit<?> parsed2 = format.parse(formatted);
String unit = "µmol*m^-2*446.2";
Unit<?> parsed = format.parse(unit);
String formatted = format.format(parsed);
System.out.println("Formatted version: " + formatted);
Unit<?> parsed2 = format.parse(formatted);
}

}
20 changes: 10 additions & 10 deletions src/test/java/tec/uom/se/format/SimpleFormatTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -109,33 +109,33 @@ public void testFormatHz3() {
String s = format.format(hz);
assertEquals("kHz", s);
}

@Test
public void testParseMicro() {
Unit<?> u = format.parse("μm");
assertEquals(MICRO(METRE), u);
}

@Test
public void testParseMicroAlias() {
Unit<?> u = format.parse("\u03bcm");
assertEquals(MICRO(METRE), u);
}

@Test
public void testParseMicro2() {
Unit<?> u = format.parse("μg");
assertEquals(MICRO(GRAM), u);
}

@Test
@Ignore("https://github.com/unitsofmeasurement/uom-se/issues/issues/201")
public void testRoundtripDemo() {
String unit = "µmol*m^-2*446.2";
SimpleUnitFormat format1 = SimpleUnitFormat.getInstance();
Unit<?> parsed = format1.parse(unit);
String formatted = format1.format(parsed);
System.out.println("Formatted version: " + formatted);
Unit<?> parsed2 = format1.parse(formatted);
String unit = "µmol*m^-2*446.2";
SimpleUnitFormat format1 = SimpleUnitFormat.getInstance();
Unit<?> parsed = format1.parse(unit);
String formatted = format1.format(parsed);
System.out.println("Formatted version: " + formatted);
Unit<?> parsed2 = format1.parse(formatted);
}
}
2 changes: 1 addition & 1 deletion src/test/java/tec/uom/se/unit/PrefixTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ public void testNestedOperationsNotTheSame() {
assertNotEquals(c1, c2);
assertNotEquals(m1, m2);
}

@Test
public void testMicro() {
assertEquals("\u00b5g", MICRO(GRAM).toString());
Expand Down

0 comments on commit 9ab51bb

Please sign in to comment.