Merge pull request #19 from aontas/master

Ensure round-trip serialization is consistent

Author: keilw

src/main/java/com/opower/unitsofmeasure/UnitJsonDeserializer.java

@@ -25,7 +25,7 @@ public UnitJsonDeserializer() {
     public Unit deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException {
         JsonToken currentToken = jsonParser.getCurrentToken();
         if (currentToken == JsonToken.VALUE_STRING) {
-            return UCUMFormat.getInstance(UCUMFormat.Variant.CASE_INSENSITIVE).parse(jsonParser.getText(), new ParsePosition(0));
+            return UCUMFormat.getInstance(UCUMFormat.Variant.CASE_SENSITIVE).parse(jsonParser.getText(), new ParsePosition(0));
         }
         throw deserializationContext.wrongTokenException(jsonParser, JsonToken.VALUE_STRING, "Expected unit value in String format");
     }

src/test/java/com/opower/unitsofmeasure/UnitJacksonModuleTest.java

@@ -14,12 +14,12 @@
 
 import static org.junit.Assert.*;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import systems.uom.ucum.UCUM;
 import static tec.uom.se.AbstractUnit.ONE;
 import static tec.uom.se.unit.MetricPrefix.KILO;
+import static tec.uom.se.unit.MetricPrefix.MEGA;
 import static tec.uom.se.unit.MetricPrefix.MILLI;
 import tec.uom.se.unit.Units;
 
@@ -104,12 +104,18 @@ public void testParseWithUnrecognizedField() throws Exception {
     }
 
     @Test
-    @Ignore("solve km formatting") // TODO solve km parsing
     public void testParseLengthKm() throws Exception {
         Unit<?> parsedUnit = parse("\"km\"", Unit.class);
         assertEquals("The Unit<Length> in the parsed JSON doesn't match", KILO(Units.METRE), parsedUnit);
     }
 
+    @Test
+    public void testRoundTripSerialization() throws Exception {
+        String serialized = serialize(MEGA(UCUM.METER));
+        Unit<?> parsedUnit = parse(serialized, Unit.class);
+        assertEquals("The Unit<Length> in the parsed JSON doesn't match", MEGA(UCUM.METER), parsedUnit);
+    }
+
     protected String serialize(Object objectToSerialize) throws IOException {
         final Writer writer = new StringWriter();
         final JsonGenerator generator = this.jsonFactory.createJsonGenerator(writer);