Merge pull request #34 from wuan/more_badges

updated badges and versions
TNG · Mar 8, 2016 · a70f5ae · a70f5ae
2 parents cc807c1 + 93810b0
commit a70f5ae
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-Java Config-Builder  [![Build Status](https://travis-ci.org/TNG/config-builder.svg?branch=master)](https://travis-ci.org/TNG/config-builder) [![Coverage Status](https://coveralls.io/repos/TNG/config-builder/badge.svg?branch=master&service=github)](https://coveralls.io/github/TNG/config-builder?branch=master)
+Java Config-Builder  [![Build Status](https://travis-ci.org/TNG/config-builder.svg?branch=master)](https://travis-ci.org/TNG/config-builder) [![Coverage Status](https://coveralls.io/repos/TNG/config-builder/badge.svg?branch=master&service=github)](https://coveralls.io/github/TNG/config-builder?branch=master) [![Dependency Status](https://www.versioneye.com/user/projects/56989a13af789b002e000b72/badge.svg?style=flat)](https://www.versioneye.com/user/projects/56989a13af789b002e000b72) [![MavenCentral](https://img.shields.io/maven-central/v/com.tngtech.java/config-builder.svg)](http://search.maven.org/#artifactdetails|com.tngtech.java|config-builder|1.3.1|jar)
 ==================
 
 #### Table of Contents

diff --git a/pom.xml b/pom.xml
@@ -55,7 +55,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
+                <version>3.3</version>
                 <configuration>
                     <source>1.6</source>
                     <target>1.6</target>
@@ -64,7 +64,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>2.2.1</version>
+                <version>2.4</version>
                 <executions>
                     <execution>
                         <id>attach-sources</id>
@@ -78,7 +78,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.9.1</version>
+                <version>2.10.3</version>
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>
@@ -104,7 +104,7 @@
             <plugin>
                 <groupId>org.eluder.coveralls</groupId>
                 <artifactId>coveralls-maven-plugin</artifactId>
-                <version>4.0.0</version>
+                <version>4.1.0</version>
             </plugin>
         </plugins>
     </build>
@@ -117,7 +117,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
-                        <version>1.4</version>
+                        <version>1.6</version>
                         <executions>
                             <execution>
                                 <id>sign-artifacts</id>
@@ -162,7 +162,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>18.0</version>
+            <version>19.0</version>
         </dependency>
         <dependency>
             <groupId>org.reflections</groupId>
@@ -198,7 +198,7 @@
     </dependencies>
 
     <properties>
-        <slf4j.version>1.7.7</slf4j.version>
+        <slf4j.version>1.7.13</slf4j.version>
     </properties>
 
 </project>
diff --git a/src/test/java/com/tngtech/configbuilder/util/CommandLineHelperTest.java b/src/test/java/com/tngtech/configbuilder/util/CommandLineHelperTest.java
@@ -1,5 +1,8 @@
 package com.tngtech.configbuilder.util;
 
+import com.google.common.base.Predicate;
+import com.google.common.collect.FluentIterable;
+import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Sets;
 import com.tngtech.configbuilder.annotation.valueextractor.CommandLineValue;
 import com.tngtech.configbuilder.configuration.ErrorMessageSetup;
@@ -15,7 +18,10 @@
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
+import javax.annotation.Nullable;
 import java.lang.reflect.Field;
+import java.util.Comparator;
+import java.util.List;
 import java.util.Set;
 
 import static org.junit.Assert.assertEquals;
@@ -69,10 +75,24 @@ public void testGetCommandLine() throws Exception {
         assertEquals(commandLine, commandLineHelper.getCommandLine(TestConfig.class, args));
         verify(options, times(2)).addOption(captor.capture());
         verify(parser).parse(options, args);
-        Option option = captor.getValue();
-        assertEquals("user", option.getLongOpt());
-        assertEquals("u", option.getOpt());
-        assertEquals(true, option.isRequired());
+        List<Option> options = captor.getAllValues();
+
+        assertEquals(2, options.size());
+
+        final ImmutableList<Option> sortedOptions = FluentIterable.from(options).toSortedList(new Comparator<Option>() {
+            @Override
+            public int compare(Option o1, Option o2) {
+                return o1.getLongOpt().compareTo(o2.getLongOpt());
+            }
+        });
+
+        assertEquals("user", sortedOptions.get(0).getLongOpt());
+        assertEquals("u", sortedOptions.get(0).getOpt());
+        assertEquals(true, sortedOptions.get(0).isRequired());
+
+        assertEquals("vir", sortedOptions.get(1).getLongOpt());
+        assertEquals("v", sortedOptions.get(1).getOpt());
+        assertEquals(false, sortedOptions.get(1).isRequired());
     }
 
     @Test(expected = ConfigBuilderException.class)