diff --git a/pom.xml b/pom.xml index cb442bc..fba4dc8 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 tec.units unit-tck - 0.7-SNAPSHOT + 0.7 bundle Units of Measurement TCK http://github.com/unitsofmeasurement/unit-tck diff --git a/src/main/java/tec/units/tck/TCKRunner.java b/src/main/java/tec/units/tck/TCKRunner.java index acb2b9c..ef66e98 100644 --- a/src/main/java/tec/units/tck/TCKRunner.java +++ b/src/main/java/tec/units/tck/TCKRunner.java @@ -1,6 +1,6 @@ /* * Unit-API - Units of Measurement API for Java - * Copyright (c) 2005-2015, Jean-Marie Dautelle, Werner Keil, V2COM. + * Copyright (c) 2005-2016, Jean-Marie Dautelle, Werner Keil, V2COM. * * All rights reserved. * @@ -69,7 +69,7 @@ * Main class for executing the JSR 363 TCK. * * @author Werner Keil - * @version 0.6.1, December 28, 2015 + * @version 0.7, January 31, 2016 */ public class TCKRunner extends XmlSuite implements Tool, Versioned { @@ -77,7 +77,7 @@ public class TCKRunner extends XmlSuite implements Tool, Versioned { * */ private static final long serialVersionUID = 3189431432291353154L; - private static final String TCK_VERSION = "0.7-SNAPSHOT"; + private static final String TCK_VERSION = "0.7"; public static final String SPEC_ID = "JSR 363"; public static final String SPEC_VERSION = "0.9.0"; private final Profile profile; diff --git a/src/main/java/tec/units/tck/tests/quantity/QuantityInterfaceTest.java b/src/main/java/tec/units/tck/tests/quantity/QuantityInterfaceTest.java index 5d41f08..a0c83a8 100644 --- a/src/main/java/tec/units/tck/tests/quantity/QuantityInterfaceTest.java +++ b/src/main/java/tec/units/tck/tests/quantity/QuantityInterfaceTest.java @@ -128,7 +128,7 @@ public void testQuantityOp2Multiply() { */ @SpecAssertion(section = "4.4.1.2", id = "4412-A2") @Test(groups = {"core"}, description = "4.4.1.2 Ensure registered Quantity classes implement divide.") - public void testQuantityOp1Divide() { + public void testQuantityOp2Divide() { for (Class type : TCKSetup.getConfiguration().getQuantityClasses()) { TestUtils.testHasPublicMethod("Section 4.4.1.2", type, Quantity.class, "divide", Quantity.class); } diff --git a/src/main/java/tec/units/tck/tests/unit/UnitInterfaceTest.java b/src/main/java/tec/units/tck/tests/unit/UnitInterfaceTest.java index 43548b2..4573a64 100644 --- a/src/main/java/tec/units/tck/tests/unit/UnitInterfaceTest.java +++ b/src/main/java/tec/units/tck/tests/unit/UnitInterfaceTest.java @@ -158,12 +158,12 @@ public void testUnit42121Shift() { */ @SpecAssertion(section = "4.2.1.2.1", id = "42121-A2") @Test(groups = {"core"}, description = "4.2.1.2.1 Ensure the multiply() operation is implemented.") - public void testUnit42121MultiplyWithDouble() { + public void testUnit42121Multiply() { for (@SuppressWarnings("rawtypes") Class type : TCKSetup.getConfiguration().getUnitClasses()) { - TestUtils.testHasPublicMethod("Section 4.2.1.3", type, Unit.class, "multiply", double.class); + TestUtils.testHasPublicMethod("Section 4.2.1.2.1", type, Unit.class, "multiply", Unit.class); } - } + } /** * Ensure the divide() operation is implemented. @@ -181,19 +181,19 @@ public void testUnit42121Divide() { * Ensure the multiply() operation is implemented. */ @SpecAssertion(section = "4.2.1.2.1", id = "42121-A4") - @Test(groups = {"core"}, description = "4.2.1.2.1 Ensure the multiply() operation is implemented.") - public void testUnit42121Multiply() { + @Test(groups = {"core"}, description = "4.2.1.2.1 Ensure the multiply(double) operation is implemented.") + public void testUnit42121MultiplyWithDouble() { for (@SuppressWarnings("rawtypes") Class type : TCKSetup.getConfiguration().getUnitClasses()) { - TestUtils.testHasPublicMethod("Section 4.2.1.2.1", type, Unit.class, "multiply", Unit.class); + TestUtils.testHasPublicMethod("Section 4.2.1.3", type, Unit.class, "multiply", double.class); } } - + /** * Ensure the divide() operation is implemented. */ @SpecAssertion(section = "4.2.1.2.1", id = "42121-A5") - @Test(groups = {"core"}, description = "4.2.1.2.1 Ensure the divide() operation is implemented.") + @Test(groups = {"core"}, description = "4.2.1.2.1 Ensure the divide(double) operation is implemented.") public void testUnit42121DivideWithDouble() { for (@SuppressWarnings("rawtypes") Class type : TCKSetup.getConfiguration().getUnitClasses()) { @@ -212,6 +212,7 @@ public void testUnit42121Alternate() { TestUtils.testHasPublicMethod("Section 4.2.1.2.1", type, "alternate", true); } } + /** * Ensure the pow() operation is implemented. */ @@ -239,7 +240,7 @@ public void testUnit42122Root() { /** * Ensure the transform() operation is implemented. */ - @SpecAssertion(section = "4.2.1.2.2", id = "42122-A5") + @SpecAssertion(section = "4.2.1.2.2", id = "42122-A3") @Test(groups = {"core"}, description = "4.2.1.2.2 Ensure the transform() operation is implemented.") public void testUnit42122Transform() { for (@SuppressWarnings("rawtypes") diff --git a/src/main/resources/test-audit.xml b/src/main/resources/test-audit.xml index 32ebe16..72e9e3b 100644 --- a/src/main/resources/test-audit.xml +++ b/src/main/resources/test-audit.xml @@ -72,13 +72,55 @@ -
+
- Algebraic Operations + Operations on Units with same dimension as the operand Ensure the shift() operation is implemented. + + 4.2.1.2.1 Ensure the multiply() operation is implemented. + + + + 4.2.1.2.1 Ensure the divide() operation is implemented. + + + + 4.2.1.2.1 Ensure the multiply() operation is implemented. + + + + 4.2.1.2.1 Ensure the divide(double) operation is implemented. + + + + 4.2.1.2.1 Ensure the alternate() operation is implemented. + + + + + Operations on Units with different dimension as the operand + + 4.2.1.2.2 Ensure the pow() operation is implemented. + + + + 4.2.1.2.1 Ensure the multiply() operation is implemented. + + + + 4.2.1.2.2 Ensure the transform() operation is implemented. + + + + + Unary Operations on Units + + 4.2.1.2.3 Ensure the inverse() operation is implemented. + +