Merge branch 'improvement/ghi-#8-sonarqube-minor-rule-squid-s3400' in…

…to develop
nordtheme · Dec 3, 2016 · 7efc44c · 7efc44c
2 parents 9eab580 + b4d2e36
commit 7efc44c
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 9 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/nord-java.iml b/nord-java.iml
@@ -15,5 +15,6 @@
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.arcticicestudio:arcver-java:0.11.0-SNAPSHOT" level="project" />
   </component>
 </module>
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,6 @@
 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 title      POM                                          +
 project    nord-java                                    +
-version    0.1.0                                        +
 repository https://github.com/arcticicestudio/nord-java +
 author     Arctic Ice Studio                            +
 email      development@arcticicestudio.com              +
@@ -17,7 +16,7 @@ Apache Maven
   (https://maven.apache.org/enforcer/enforcer-rules/versionRanges.html)
 Sonatype
   (http://books.sonatype.com/mvnref-book/reference)
-JFrog Bintray
+JFrog
   (https://bintray.com/docs/usermanual)
 -->
 <project
@@ -126,6 +125,13 @@ JFrog Bintray
       <version>1.3</version>
       <scope>test</scope>
     </dependency>
+
+    <dependency>
+      <groupId>com.arcticicestudio</groupId>
+      <artifactId>arcver-java</artifactId>
+      <version>0.11.0-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>

diff --git a/src/main/java/com/arcticicestudio/nord/Nord.java b/src/main/java/com/arcticicestudio/nord/Nord.java
@@ -201,6 +201,11 @@ public enum Nord {
    */
   private final Color COLOR;
 
+  /**
+   * The <a href="https://github.com/arcticicestudio/arcver">ArcVer</a> version of the public API.
+   */
+  private static final String VERSION = "0.1.0";
+
   /**
    * Constructs a new color object.
    *
@@ -256,7 +261,7 @@ public Color get() {
    * @return the ArcVer version string
    * @see <a href="http://semver.org">SemVer</a>
    */
-  public String getVersion() {
-    return "0.1.0";
+  public static String getVersion() {
+    return VERSION;
   }
 }
diff --git a/src/test/java/com/arcticicestudio/nord/NordTest.java b/src/test/java/com/arcticicestudio/nord/NordTest.java
@@ -10,9 +10,11 @@ copyright  Copyright (C) 2016                           +
 */
 package com.arcticicestudio.nord;
 
+import com.arcticicestudio.arcver.Version;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 /**
  * Unit tests for the {@link Nord} public API.
@@ -63,7 +65,7 @@ public void shouldReturnTheCorrectRGBColorCode() {
   }
 
   @Test
-  public void shouldReturnValidArcVerVersionString() {
-    assertEquals(Nord.NORD0.getVersion(), "0.1.0");
+  public void shouldReturnTheCorrectVersionString() {
+    assertTrue(Version.valueOf(Nord.getVersion()).satisfies("0.1.0"));
   }
 }