Mercurial > hg > release > thermostat-1.0
changeset 1402:6c613257d90c
Support building against OpenJDK 8
Reviewed-by: jerboaa
Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2014-May/009759.html
PR1790
| author | Omair Majid <omajid@redhat.com> |
|---|---|
| date | Wed, 21 May 2014 17:23:49 -0400 |
| parents | 64670571181d |
| children | f4f4d882e71f |
| files | launcher/src/test/java/com/redhat/thermostat/launcher/internal/UsageStringBuilderTest.java pom.xml |
| diffstat | 2 files changed, 11 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/launcher/src/test/java/com/redhat/thermostat/launcher/internal/UsageStringBuilderTest.java Fri May 23 19:28:27 2014 +0200 +++ b/launcher/src/test/java/com/redhat/thermostat/launcher/internal/UsageStringBuilderTest.java Wed May 21 17:23:49 2014 -0400 @@ -37,6 +37,9 @@ package com.redhat.thermostat.launcher.internal; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +import java.util.Arrays; import org.apache.commons.cli.Option; import org.apache.commons.cli.Options; @@ -81,7 +84,11 @@ options.addOption(b); String usage = builder.getUsage("test", options); - assertEquals("test [--bee] [-a]", usage); + String[] parts = usage.split(" "); + assertEquals(3, parts.length); + assertEquals("test", parts[0]); + assertTrue(Arrays.asList(parts).contains("[-a]")); + assertTrue(Arrays.asList(parts).contains("[--bee]")); } @Test
--- a/pom.xml Fri May 23 19:28:27 2014 +0200 +++ b/pom.xml Wed May 21 17:23:49 2014 -0400 @@ -160,9 +160,9 @@ <java.dir>/usr/share/java</java.dir> <junit.version>4.10</junit.version> - <mockito.version>1.9.0</mockito.version> + <mockito.version>1.9.5</mockito.version> <fest.version>1.2.1</fest.version> - <powermock.version>1.4.11</powermock.version> + <powermock.version>1.5.4</powermock.version> <easymock.version>3.1</easymock.version> <expectj.version>2.0.7</expectj.version> @@ -257,7 +257,7 @@ <plugin> <groupId>org.jacoco</groupId> <artifactId>jacoco-maven-plugin</artifactId> - <version>0.6.0.201210061924</version> + <version>0.7.0.201403182114</version> </plugin> <plugin> <groupId>org.apache.felix</groupId>