Skip to content

Commit 2f8af3c

Browse files
keilwkeilw
committed
14: Change system properties to new TLD
Task-Url: https://github.com/unitsofmeasurement/unit-tck/issues/issues/14
1 parent a71263e commit 2f8af3c

29 files changed

Lines changed: 127 additions & 120 deletions

‎README.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ To setup the TCK with your implementation you must follow the following steps:
1313

1414
1. Create a new Maven project. You could also use compatible alternatives like Gradle.
1515
2. Add this TCK and your implementation as dependency.
16-
3. Implement a class of type tec.units.tck.TestSetup, read the Javadoc, what
16+
3. Implement a class of type tech.units.tck.TestSetup, read the Javadoc, what
1717
you must provide with this class.
1818

1919
## Running
@@ -37,7 +37,7 @@ mvn exec:java -Pversion
3737
### Profiles
3838
When running the TCK (`mvn test`) by calling the system property
3939
```
40-
-Dtec.units.tck.profile=<profile>
40+
-Dtech.units.tck.profile=<profile>
4141
```
4242
you may select one of the following **profiles**:
4343
- MINIMAL
@@ -54,15 +54,15 @@ You may pass the profile name in either case, `TCKRunner` will automatically con
5454
### Other System Properties
5555
In addition to profiles, the following system properties allow you to override default behavior and storage locations of the TCK:
5656
```
57-
-Dtec.units.tck.outputDir=<output directory>
57+
-Dtech.units.tck.outputDir=<output directory>
5858
```
5959
To override the default output directory
6060
```
61-
-Dtec.units.tck.reportFile=<file name>
61+
-Dtech.units.tck.reportFile=<file name>
6262
```
6363
To override the default TCK report file
6464
```
65-
-Dtec.units.tck.verbose=yes/no
65+
-Dtech.units.tck.verbose=yes/no
6666
```
6767
To toggle the `verbose` option of the TCK for extended test output. The default is `false`. And you normally won't need to set this unless you require detailed analysis or issue resolution.
6868

‎pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@
191191
<archive>
192192
<manifest>
193193
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
194-
<mainClass>tec.units.tck.TCKRunner</mainClass>
194+
<mainClass>tech.units.tck.TCKRunner</mainClass>
195195
</manifest>
196196
<manifestEntries>
197197
<Specification-Title>Units of Measurement API</Specification-Title>
@@ -216,7 +216,7 @@
216216
</execution>
217217
</executions>
218218
<configuration>
219-
<mainClass>tec.units.tck.TCKRunner</mainClass>
219+
<mainClass>tech.units.tck.TCKRunner</mainClass>
220220
</configuration>
221221
</plugin>
222222

@@ -229,8 +229,8 @@
229229
<extensions>true</extensions>
230230
<configuration>
231231
<instructions>
232-
<Export-Package>tec.units.tck.*</Export-Package>
233-
<!-- <Private-Package>tec.units.tck.internal.*</Private-Package> -->
232+
<Export-Package>tech.units.tck.*</Export-Package>
233+
<!-- <Private-Package>tech.units.tck.internal.*</Private-Package> -->
234234
</instructions>
235235
</configuration>
236236
</plugin>
@@ -451,7 +451,7 @@
451451
</execution>
452452
</executions>
453453
<configuration>
454-
<mainClass>tec.units.tck.TCKRunner</mainClass>
454+
<mainClass>tech.units.tck.TCKRunner</mainClass>
455455
<arguments>
456456
<argument>-version</argument>
457457
</arguments>

‎src/main/config/unit-tck clean test (enter Profile).launch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<booleanAttribute key="M2_OFFLINE" value="false"/>
77
<stringAttribute key="M2_PROFILES" value=""/>
88
<listAttribute key="M2_PROPERTIES">
9-
<listEntry value="tec.units.tck.profile=${string_prompt:Profile}"/>
9+
<listEntry value="tech.units.tck.profile=${string_prompt:Profile}"/>
1010
</listAttribute>
1111
<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
1212
<booleanAttribute key="M2_SKIP_TESTS" value="false"/>

src/main/java/tec/units/tck/TCKRunner.java renamed to src/main/java/tech/units/tck/TCKRunner.java

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Units of Measurement TCK
3-
* Copyright © 2005-2017, Jean-Marie Dautelle, Werner Keil, V2COM.
3+
* Copyright (c) 2005-2018, Jean-Marie Dautelle, Werner Keil, Otavio Santana.
44
*
55
* All rights reserved.
66
*
@@ -27,12 +27,12 @@
2727
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
2828
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2929
*/
30-
package tec.units.tck;
30+
package tech.units.tck;
3131

32-
import static tec.units.tck.util.TestUtils.SYS_PROPERTY_OUTPUT_DIR;
33-
import static tec.units.tck.util.TestUtils.SYS_PROPERTY_PROFILE;
34-
import static tec.units.tck.util.TestUtils.SYS_PROPERTY_REPORT_FILE;
35-
import static tec.units.tck.util.TestUtils.SYS_PROPERTY_VERBOSE;
32+
import static tech.units.tck.util.TestUtils.SYS_PROPERTY_OUTPUT_DIR;
33+
import static tech.units.tck.util.TestUtils.SYS_PROPERTY_PROFILE;
34+
import static tech.units.tck.util.TestUtils.SYS_PROPERTY_REPORT_FILE;
35+
import static tech.units.tck.util.TestUtils.SYS_PROPERTY_VERBOSE;
3636

3737
import java.io.File;
3838
import java.io.FileWriter;
@@ -61,28 +61,28 @@
6161
import org.testng.xml.XmlSuite;
6262
import org.testng.xml.XmlTest;
6363

64-
import tec.units.tck.tests.FundamentalTypesTest;
65-
import tec.units.tck.tests.format.UnitFormatTest;
66-
import tec.units.tck.tests.quantity.QuantityInterfaceTest;
67-
import tec.units.tck.tests.quantity.QuantityTypesTest;
68-
import tec.units.tck.tests.spi.ObtainingQuantiesTest;
69-
import tec.units.tck.tests.spi.ObtainingUnitsTest;
70-
import tec.units.tck.tests.spi.QuantityFactoryTest;
71-
import tec.units.tck.tests.spi.ServiceProviderTest;
72-
import tec.units.tck.tests.spi.ServicesTest;
73-
import tec.units.tck.tests.spi.SystemOfUnitsTest;
74-
import tec.units.tck.tests.unit.UnitConversionTest;
75-
import tec.units.tck.tests.unit.UnitDimensionTest;
76-
import tec.units.tck.tests.unit.UnitInterfaceTest;
77-
import tec.units.tck.util.TestGroups.Group;
78-
import tec.units.tck.util.TestGroups.Profile;
64+
import tech.units.tck.tests.FundamentalTypesTest;
65+
import tech.units.tck.tests.format.UnitFormatTest;
66+
import tech.units.tck.tests.quantity.QuantityInterfaceTest;
67+
import tech.units.tck.tests.quantity.QuantityTypesTest;
68+
import tech.units.tck.tests.spi.ObtainingQuantiesTest;
69+
import tech.units.tck.tests.spi.ObtainingUnitsTest;
70+
import tech.units.tck.tests.spi.QuantityFactoryTest;
71+
import tech.units.tck.tests.spi.ServiceProviderTest;
72+
import tech.units.tck.tests.spi.ServicesTest;
73+
import tech.units.tck.tests.spi.SystemOfUnitsTest;
74+
import tech.units.tck.tests.unit.UnitConversionTest;
75+
import tech.units.tck.tests.unit.UnitDimensionTest;
76+
import tech.units.tck.tests.unit.UnitInterfaceTest;
77+
import tech.units.tck.util.TestGroups.Group;
78+
import tech.units.tck.util.TestGroups.Profile;
7979
import tech.uom.lib.common.function.Versioned;
8080

8181
/**
8282
* Main class for executing the JSR 385 TCK.
8383
*
8484
* @author <a href="mailto:units@catmedia.us">Werner Keil</a>
85-
* @version 1.1, April 1, 2018
85+
* @version 1.2, July 11, 2018
8686
* @since 1.0
8787
*/
8888
public class TCKRunner extends XmlSuite implements Tool, Versioned<String> {
@@ -126,11 +126,11 @@ public TCKRunner() {
126126
/**
127127
* Main method to start the TCK. Optional arguments are:
128128
* <ul>
129-
* <li>-Dtec.units.tck.profile for defining the profile for TestNG groups (default: full).</li>
130-
* <li>-Dtec.units.tck.outputDir for defining the output directory TestNG uses (default:
129+
* <li>-Dtech.units.tck.profile for defining the profile for TestNG groups (default: full).</li>
130+
* <li>-Dtech.units.tck.outputDir for defining the output directory TestNG uses (default:
131131
* ./target/tck-output).</li>
132-
* <li>-Dtec.units.tck.verbose=true to enable TestNG verbose mode.</li>
133-
* <li>-Dtec.units.tck.reportFile=targetFile.txt for defining the TCK result summary report
132+
* <li>-Dtech.units.tck.verbose=true to enable TestNG verbose mode.</li>
133+
* <li>-Dtech.units.tck.reportFile=targetFile.txt for defining the TCK result summary report
134134
* target file (default: ./target/tck-results.txt).</li>
135135
* </ul>
136136
*

src/main/java/tec/units/tck/TCKSetup.java renamed to src/main/java/tech/units/tck/TCKSetup.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,19 @@
2727
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
2828
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2929
*/
30-
package tec.units.tck;
30+
package tech.units.tck;
3131

3232
import java.util.ServiceLoader;
3333

3434
import javax.inject.Singleton;
3535

36-
import tec.units.tck.util.ServiceConfiguration;
36+
import tech.units.tck.util.ServiceConfiguration;
3737

3838
/**
3939
* Test setup used by the JSR 385 TCK.
4040
*
4141
* @author <a href="mailto:units@catmedia.us">Werner Keil</a>
42-
* @version 1.0, July 21, 2016
42+
* @version 1.1, July 11, 2018
4343
*/
4444
@Singleton
4545
public final class TCKSetup {

src/main/java/tec/units/tck/TCKValidationException.java renamed to src/main/java/tech/units/tck/TCKValidationException.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Units of Measurement TCK
3-
* Copyright © 2005-2017, Jean-Marie Dautelle, Werner Keil, V2COM.
3+
* Copyright (c) 2005-2018, Jean-Marie Dautelle, Werner Keil, Otavio Santana.
44
*
55
* All rights reserved.
66
*
@@ -27,7 +27,7 @@
2727
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
2828
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2929
*/
30-
package tec.units.tck;
30+
package tech.units.tck;
3131

3232
import javax.measure.MeasurementException;
3333

src/main/java/tec/units/tck/tests/FundamentalTypesTest.java renamed to src/main/java/tech/units/tck/tests/FundamentalTypesTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Units of Measurement TCK
3-
* Copyright © 2005-2017, Jean-Marie Dautelle, Werner Keil, V2COM.
3+
* Copyright (c) 2005-2018, Jean-Marie Dautelle, Werner Keil, Otavio Santana.
44
*
55
* All rights reserved.
66
*
@@ -27,23 +27,23 @@
2727
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
2828
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2929
*/
30-
package tec.units.tck.tests;
30+
package tech.units.tck.tests;
3131

32-
import static tec.units.tck.TCKRunner.SPEC_ID;
33-
import static tec.units.tck.TCKRunner.SPEC_VERSION;
32+
import static tech.units.tck.TCKRunner.SPEC_ID;
33+
import static tech.units.tck.TCKRunner.SPEC_VERSION;
3434

3535
import org.jboss.test.audit.annotations.SpecAssertion;
3636
import org.jboss.test.audit.annotations.SpecVersion;
3737
import org.testng.AssertJUnit;
3838
import org.testng.annotations.Test;
3939

40-
import tec.units.tck.TCKSetup;
40+
import tech.units.tck.TCKSetup;
4141

4242
/**
4343
* Tests for Fundamental Types
4444
*
4545
* @author <a href="mailto:units@catmedia.us">Werner Keil</a>
46-
* @version 1.1, April 20, 2018
46+
* @version 1.2, July 11, 2018
4747
* @since 1.0
4848
*/
4949
@SpecVersion(spec = SPEC_ID, version = SPEC_VERSION)

src/main/java/tec/units/tck/tests/TCKSetupTest.java renamed to src/main/java/tech/units/tck/tests/TCKSetupTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@
2727
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
2828
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2929
*/
30-
package tec.units.tck.tests;
30+
package tech.units.tck.tests;
3131

32-
import static tec.units.tck.TCKRunner.SPEC_ID;
33-
import static tec.units.tck.TCKRunner.SPEC_VERSION;
34-
import static tec.units.tck.TCKSetup.*;
3532
import static org.testng.AssertJUnit.*;
33+
import static tech.units.tck.TCKRunner.SPEC_ID;
34+
import static tech.units.tck.TCKRunner.SPEC_VERSION;
35+
import static tech.units.tck.TCKSetup.*;
3636

3737
import org.jboss.test.audit.annotations.SpecAssertion;
3838
import org.jboss.test.audit.annotations.SpecVersion;

src/main/java/tec/units/tck/tests/format/UnitFormatTest.java renamed to src/main/java/tech/units/tck/tests/format/UnitFormatTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
2828
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2929
*/
30-
package tec.units.tck.tests.format;
30+
package tech.units.tck.tests.format;
3131

32-
import static tec.units.tck.TCKRunner.SPEC_ID;
33-
import static tec.units.tck.TCKRunner.SPEC_VERSION;
32+
import static tech.units.tck.TCKRunner.SPEC_ID;
33+
import static tech.units.tck.TCKRunner.SPEC_VERSION;
3434

3535
import javax.measure.Unit;
3636
import javax.measure.format.UnitFormat;
@@ -40,8 +40,8 @@
4040
import org.testng.AssertJUnit;
4141
import org.testng.annotations.Test;
4242

43-
import tec.units.tck.TCKSetup;
44-
import tec.units.tck.util.TestUtils;
43+
import tech.units.tck.TCKSetup;
44+
import tech.units.tck.util.TestUtils;
4545

4646
/**
4747
* Tests for UnitFormat

src/main/java/tec/units/tck/tests/quantity/QuantityInterfaceTest.java renamed to src/main/java/tech/units/tck/tests/quantity/QuantityInterfaceTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
2828
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2929
*/
30-
package tec.units.tck.tests.quantity;
30+
package tech.units.tck.tests.quantity;
3131

32-
import static tec.units.tck.TCKRunner.SPEC_ID;
33-
import static tec.units.tck.TCKRunner.SPEC_VERSION;
32+
import static tech.units.tck.TCKRunner.SPEC_ID;
33+
import static tech.units.tck.TCKRunner.SPEC_VERSION;
3434

3535
import javax.measure.Quantity;
3636
import javax.measure.Unit;
@@ -39,8 +39,8 @@
3939
import org.jboss.test.audit.annotations.SpecVersion;
4040
import org.testng.annotations.Test;
4141

42-
import tec.units.tck.TCKSetup;
43-
import tec.units.tck.util.TestUtils;
42+
import tech.units.tck.TCKSetup;
43+
import tech.units.tck.util.TestUtils;
4444

4545
/**
4646
* Tests for The Quantity Interface

0 commit comments

Comments
 (0)