Merge pull request #34 from FHIR/2023-07-gg-fix-tests

2023 07 gg fix tests

src/test/java/org/fhir/ucum/UcumTestsIssue13.java

@@ -0,0 +1,31 @@
+package org.fhir.ucum;
+
+import java.io.IOException;
+
+import static org.junit.Assert.assertThrows;
+
+import java.io.File;
+import java.io.InputStream;
+import java.io.FileInputStream;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class UcumTestsIssue13 {
+
+  @Test
+  public void testGigaYear() throws IOException, UcumException {
+
+    String fileName = "ucum-essence.xml";
+    ClassLoader classLoader = getClass().getClassLoader();
+    File file = new File(classLoader.getResource(fileName).getFile());
+
+    InputStream inputStream = new FileInputStream(file);
+
+    UcumEssenceService ucumService = new UcumEssenceService(inputStream);
+    assertThrows(UcumException.class, () -> {
+      ucumService.convert(new Decimal("0.1"), "Ga", "a");
+    });
+  }
+
+}

src/test/resources/UcumFunctionalTests.xml

@@ -692,7 +692,7 @@
 
   <multiplication>
     <!-- 
-	  Given v1/u1, and v2/u2, multiply them together - should get something that is canonically equal
+	  Given v1:u1, and v2:u2, multiply them together - should get something that is canonically equal
 	  to vRes/uRes. Note that it doesn't have to be the same as vRes/uRes: the units 
 	  reported may differ in order or some other form, and the value may consequently 
 	  be different, but the result must convert to the stated value
@@ -703,14 +703,14 @@
 
   <division>
     <!-- 
-	  Given v1*u1, and v2*u2, divide them - should get something that is canonically equal
-	  to vRes*uRes. Note that it doesn't have to be the same as vRes*uRes: the units 
+	  Given v1:u1, and v2:u2, divide them - should get something that is canonically equal
+	  to vRes:uRes. Note that it doesn't have to be the same as vRes:uRes: the units 
 	  reported may differ in order or some other form, and the value may consequently 
 	  be different, but the result must convert to the stated value
 	-->
-    <case id="4-101" v1="1.5" u1="g"         v2="2"   u2="m"    vRes="0.75"          uRes="g.m-1"/>
-    <case id="4-102" v1="2"   u1="m"         v2="1.5" u2="g"    vRes="1.3333333333"  uRes="g-1.m"/>
-    <case id="4-103" v1="1"   u1="[lb_av]/h" v2="1"   u2="kg/s" vRes="0.00012599803" uRes=""/>  <!-- #19: u1, u2 are comparable, so uRes is unity  -->
+    <case id="4-101" v1="1.5" u1="g" v2="2" u2="m" vRes="0.75" uRes="g.m-1"/>
+    <case id="4-102" v2="1.5" u2="g" v1="2" u1="m" vRes="1.3" uRes="g-1.m"/>
+    <case id="4-103" v1="1"   u1="[lb_av]/h" v2="1"   u2="kg/s" vRes="0.000125997880555555555555556" uRes=""/>  <!-- #19: u1, u2 are comparable, so uRes is unity  -->
   </division>