From 659cf1fe9b3e55343af6add34de292c6309938e0 Mon Sep 17 00:00:00 2001 From: Arctic Ice Studio Date: Tue, 27 Sep 2016 15:40:13 +0200 Subject: [PATCH 01/20] [GHI-#3] Replace deprecated "inceptionYear" expression in JavaDoc footer --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 88718cb..b7db259 100644 --- a/pom.xml +++ b/pom.xml @@ -212,7 +212,7 @@ JFrog Bintray javadoc ${project.build.sourceEncoding} true - Copyright © ${inceptionYear} {organizationName} + Copyright © ${project.inceptionYear} {organizationName} ${project.name} ${project.version} API ${project.name} ${project.version} API From 1ab0b8c59711eee6ccf099eca1fd8301e3ec873c Mon Sep 17 00:00:00 2001 From: Arctic Ice Studio Date: Tue, 27 Sep 2016 15:41:00 +0200 Subject: [PATCH 02/20] [GHI-#3] Add "summary" attribute to the "Nord color palette. * *
- * + *
* * * From ca5ba302acedde32a660805e7e2e9ed4c29209a0 Mon Sep 17 00:00:00 2001 From: Arctic Ice Studio Date: Tue, 27 Sep 2016 16:26:13 +0200 Subject: [PATCH 03/20] [test]: Implement unit test to assert correct version string --- src/test/java/com/arcticicestudio/nord/NordTest.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/test/java/com/arcticicestudio/nord/NordTest.java b/src/test/java/com/arcticicestudio/nord/NordTest.java index e0952d5..5ceab22 100644 --- a/src/test/java/com/arcticicestudio/nord/NordTest.java +++ b/src/test/java/com/arcticicestudio/nord/NordTest.java @@ -62,4 +62,9 @@ public void shouldReturnTheCorrectRGBColorCode() { assertEquals(Nord.rgb(Nord.NORD14.get()), "rgb(163, 190, 140)"); assertEquals(Nord.rgb(Nord.NORD15.get()), "rgb(180, 142, 173)"); } + + @Test + public void shouldReturnTheCorrectVersionString() { + assertEquals(Nord.NORD0.getVersion(), "0.1.0"); + } } From 1f93f69f22ca87eef3a8e0b1ddd60616c3aa2492 Mon Sep 17 00:00:00 2001 From: Arctic Ice Studio Date: Wed, 28 Sep 2016 19:20:27 +0200 Subject: [PATCH 04/20] [GHI-#4] Implement "JFrog" and "OSS Sonatype" deployment profiles --- pom.xml | 70 +++++++++++++++++++++++++++++++++------------------------ 1 file changed, 41 insertions(+), 29 deletions(-) diff --git a/pom.xml b/pom.xml index 88718cb..d42378d 100644 --- a/pom.xml +++ b/pom.xml @@ -104,22 +104,6 @@ JFrog Bintray https://github.com/arcticicestudio/nord-java/issues - - https://github.com/arcticicestudio/nord-java - - ossrh - OSS Sonatype - https://oss.sonatype.org/content/repositories/snapshots - default - - - ossrh - OSS Sonatype - https://oss.sonatype.org/service/local/staging/deploy/maven2 - default - - - junit @@ -273,18 +257,6 @@ JFrog Bintray true - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - ossrh - https://oss.sonatype.org - false - - @@ -381,8 +353,14 @@ JFrog Bintray - bintray-deploy + bintray + https://github.com/arcticicestudio/nord-java + + bintray + OSS JFrog + http://oss.jfrog.org/artifactory/oss-snapshot-local + bintray JFrog Bintray @@ -390,5 +368,39 @@ JFrog Bintray + + + oss-sonatype + + https://github.com/arcticicestudio/nord-java + + ossrh + OSS Sonatype + https://oss.sonatype.org/content/repositories/snapshots + default + + + ossrh + OSS Sonatype + https://oss.sonatype.org/service/local/staging/deploy/maven2 + default + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.7 + true + + ossrh + https://oss.sonatype.org + false + + + + + From 4f40ce48f20430df1ec5ce43367e99326b72b88a Mon Sep 17 00:00:00 2001 From: Arctic Ice Studio Date: Wed, 28 Sep 2016 19:39:08 +0200 Subject: [PATCH 05/20] Prepare development snapshot version 0.2.0-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 303e2f8..d0adf3f 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ JFrog Bintray com.arcticicestudio nord-java - 0.1.0 + 0.2.0-SNAPSHOT jar nord-java From 8d261ffaa7cd8110a130208f5522ed08355605d8 Mon Sep 17 00:00:00 2001 From: Arctic Ice Studio Date: Wed, 28 Sep 2016 19:47:48 +0200 Subject: [PATCH 06/20] Rename "bintray" POM profile to "jfrog" --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d0adf3f..0fe4a2e 100644 --- a/pom.xml +++ b/pom.xml @@ -353,7 +353,7 @@ JFrog Bintray - bintray + jfrog https://github.com/arcticicestudio/nord-java From d6c6f694739ad7788b22b2d68683925bb7116ebe Mon Sep 17 00:00:00 2001 From: Arctic Ice Studio Date: Sun, 30 Oct 2016 22:12:55 +0100 Subject: [PATCH 07/20] Exclude IntelliJ IDEA run configurations from gitignore --- .gitignore | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 1ad78d4..9cb88b8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,26 +1,27 @@ -# +---------------------+ -# + Project Environment + -# +---------------------+ +# +--------------+ +# + Apache Maven + +# +--------------+ /target/ -# +------+ -# + Java + -# +------+ -*.class -*.jar - -# JVM crash logs -# http://www.java.com/en/download/help/error_hotspot.xml -hs_err_pid* - # +---------------+ # + IntelliJ IDEA + # +---------------+ # https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 out/ .idea/* +!.idea/runConfigurations !.idea/compiler.xml !.idea/encodings.xml !.idea/misc.xml !.idea/modules.xml !.idea/vcs.xml + +# +------+ +# + Java + +# +------+ +*.class +*.jar + +# JVM crash logs +# http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* From a8dc318ae48047645708adccbf80286f66ff3451 Mon Sep 17 00:00:00 2001 From: Arctic Ice Studio Date: Sun, 30 Oct 2016 22:22:58 +0100 Subject: [PATCH 08/20] GHI-#5 Add Maven POM profile "assemble" --- pom.xml | 54 ++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 42 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index 0fe4a2e..8defff7 100644 --- a/pom.xml +++ b/pom.xml @@ -88,6 +88,7 @@ JFrog Bintray + ${basedir}/src/main/assets/assembly-bin.xml UTF-8 1.8 @@ -296,29 +297,28 @@ JFrog Bintray - sign-gpg - - - gpg.keyname - - + assemble org.apache.maven.plugins - maven-gpg-plugin - 1.6 + maven-assembly-plugin + 2.6 - verify + assemble + none - sign + single - . - ${gpg.keyname} + true + false + + ${assembly.descriptor.bin} + @@ -402,5 +402,35 @@ JFrog Bintray + + + sign-gpg + + + gpg.keyname + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.6 + + + verify + + sign + + + + + . + ${gpg.keyname} + + + + + From b8affa9b23e1fb8e9592bb6c0730d349718095ca Mon Sep 17 00:00:00 2001 From: Arctic Ice Studio Date: Sun, 30 Oct 2016 22:24:12 +0100 Subject: [PATCH 09/20] GHI-#5 Add assembly descriptor file for binary packages --- src/main/assets/assembly-bin.xml | 42 ++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 src/main/assets/assembly-bin.xml diff --git a/src/main/assets/assembly-bin.xml b/src/main/assets/assembly-bin.xml new file mode 100644 index 0000000..8648f7b --- /dev/null +++ b/src/main/assets/assembly-bin.xml @@ -0,0 +1,42 @@ + + + + bin + + tar.gz + zip + + + + ${project.basedir} + ${file.separator} + + CHANGELOG.md + LICENSE.md + README.md + + + + ${project.build.directory} + ${file.separator} + + *.jar + *.md5 + *.sha1 + pom.xml* + + + + From f09e8cf702657eb6453260175adf746669ebfab2 Mon Sep 17 00:00:00 2001 From: Arctic Ice Studio Date: Sun, 30 Oct 2016 22:26:39 +0100 Subject: [PATCH 10/20] Run "verify" Maven phase for Travis CI builds --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ff08129..4721b68 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,4 +20,4 @@ cache: - $HOME/.m2 after_success: - bash <(curl -s https://codecov.io/bash) -script: mvn -B test -P code-coverage +script: mvn -B clean verify -P code-coverage From 21059d128fa059549e4a704124aab3ad682e0f11 Mon Sep 17 00:00:00 2001 From: Arctic Ice Studio Date: Sun, 30 Oct 2016 23:02:39 +0100 Subject: [PATCH 11/20] GHI-#6 Add a Circle CI configuration file --- circle.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 circle.yml diff --git a/circle.yml b/circle.yml new file mode 100644 index 0000000..48eb847 --- /dev/null +++ b/circle.yml @@ -0,0 +1,26 @@ +# +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +# title Circle CI Build Configuration + +# project nord-java + +# version + +# repository https://github.com/arcticicestudio/nord-java + +# author Arctic Ice Studio + +# email development@arcticicestudio.com + +# copyright Copyright (C) 2016 + +# +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +# +# [References] +# Circle CI +# (https://circleci.com/docs) +machine: + java: + version: oraclejdk8 +general: + artifacts: + - ./target/*.jar +test: + post: + - mkdir -p $CIRCLE_TEST_REPORTS/junit/ + - find . -type f -regex ".*/target/surefire-reports/.*xml" -exec cp {} $CIRCLE_TEST_REPORTS/junit/ \; + override: + - mvn clean verify assembly:single -P code-coverage,assemble + - find . -type f -regextype posix-egrep -regex ".*/target/(.*asc|.*jar|.*md5|.*pom|.*sha1|.*tar.gz|.*zip)" -exec cp {} $CIRCLE_ARTIFACTS \; From c889a37a4ca0f58f9cce4fdaed8aa7a33cdca24b Mon Sep 17 00:00:00 2001 From: Arctic Ice Studio Date: Sun, 30 Oct 2016 23:03:31 +0100 Subject: [PATCH 12/20] GHI-#6 Add Circle CI build status badges --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 525993b..f7a0419 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@

-

+

A arctic, north-bluish color palette Java library.
-Official implementation of Nord.

+Implementation of the Nord project.

--- @@ -44,7 +44,7 @@ Signed artifacts may be build by using the `sign-gpg` profile with a provided `g mvn clean install -Dgpg.keyname=YourGPGKeyId ``` -A continuous integration build is running at [Travis-CI](https://travis-ci.org/arcticicestudio/nord-java). +Continuous integration builds are running at [Travis-CI](https://travis-ci.org/arcticicestudio/nord-java) and [Circle CI](https://circleci.com/bb/arcticicestudio/nord-java). ## Usage Guide This is a basic guide to show the common usage of the nord-java API. From 67b1051547d4a6b0fde93bd3a7803222a9ccacd1 Mon Sep 17 00:00:00 2001 From: Arctic Ice Studio Date: Sun, 30 Oct 2016 23:12:04 +0100 Subject: [PATCH 13/20] Add JFrog Bintray and Artifactory badges --- CHANGELOG.md | 2 +- README.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3da6f89..1085f3b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@

-

+

--- diff --git a/README.md b/README.md index 525993b..b1e17d1 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@

-

+

A arctic, north-bluish color palette Java library.
Official implementation of Nord.

@@ -31,7 +31,7 @@ compile(group: 'com.arcticicestudio', name: 'nord-java', version: '0.1.0') ``` -Development snapshots are available via [OSS Sonatype](https://oss.sonatype.org/content/repositories/snapshots/com/arcticicestudio/nord-java). +Development snapshots are available via [OSS Sonatype](https://oss.sonatype.org/content/repositories/snapshots/com/arcticicestudio/nord-java) and [JFrog Artifactory](https://oss.jfrog.org/webapp/#/artifacts/browse/tree/General/oss-snapshot-local/com/arcticicestudio/nord-java). ### Build Build and install nord-java into your local repository without GPG signing: From 67dcb4dd3cedd75a3eeed13587f57171c165e9b9 Mon Sep 17 00:00:00 2001 From: Arctic Ice Studio Date: Sat, 3 Dec 2016 11:05:06 +0100 Subject: [PATCH 14/20] GHI-#7 Update public API JavaDoc to match Nord color palette docs --- .idea/misc.xml | 12 +- .../java/com/arcticicestudio/nord/Nord.java | 130 ++++++++++-------- .../arcticicestudio/nord/package-info.java | 8 +- .../com/arcticicestudio/nord/NordTest.java | 9 +- 4 files changed, 82 insertions(+), 77 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index b881e27..e75306d 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -35,17 +35,7 @@ - - - - - - - - - - - + \ No newline at end of file diff --git a/src/main/java/com/arcticicestudio/nord/Nord.java b/src/main/java/com/arcticicestudio/nord/Nord.java index 1f2c6ea..1dbd981 100644 --- a/src/main/java/com/arcticicestudio/nord/Nord.java +++ b/src/main/java/com/arcticicestudio/nord/Nord.java @@ -2,7 +2,6 @@ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ title Nord API + project nord-java + -version 0.1.0 + repository https://github.com/arcticicestudio/nord-java + author Arctic Ice Studio + email development@arcticicestudio.com + @@ -16,8 +15,14 @@ copyright Copyright (C) 2016 + import java.util.regex.Pattern; /** - * Public API entry point of the Nord - Java project, which - * implements the Nord color palette. + * A arctic, north-bluish color palette Java library. + * Created for the clean- and minimal flat design pattern to achieve a optimal focus and readability for code syntax + * highlighting and UI. + * It consists of a total of sixteen, carefully selected, dimmed pastel colors for a eye-comfortable, but yet colorful + * ambiance. + *

+ * Public API entry point of the Nord Java project, which + * implements the Nord color palette. * *

*
Polar Night
@@ -60,100 +65,114 @@ copyright Copyright (C) 2016 + */ public enum Nord { /** - * The color {@code nord0} of the "Polar Night" component with an RGB value of {@code rgb(46, 52, 64)} and an HEX - * value of {@code #2E3440}. - *
+ * Base component color "{@code nord0}" of "Polar Night" with a RGB value of {@code rgb(46, 52, 64)} and a HEX value + * of {@code #2E3440}. + *

+ *

*/ NORD0(46, 52, 64), /** - * The color {@code nord1} of the "Polar Night" component with an RGB value of {@code rgb(59, 66, 82)} and an HEX - * value of {@code #3B4252}. - *
+ * Brighter color "{@code nord1}" of the "Polar Night" component base color {@link #NORD0} with a RGB value of + * {@code rgb(59, 66, 82)} and a HEX value of {@code #3B4252}. + *

+ *

*/ NORD1(59, 66, 82), /** - * The color {@code nord2} of the "Polar Night" component with an RGB value of {@code rgb(67, 76, 94)} and an HEX - * value of {@code #434C5E}. - *
+ * Brighter color "{@code nord2}" of the "Polar Night" component base color {@link #NORD0} with a RGB value of + * {@code rgb(67, 76, 94)} and a HEX value of {@code #434C5E}. + *

+ *

*/ NORD2(67, 76, 94), /** - * The color {@code nord3} of the "Polar Night" component with an RGB value of {@code rgb(76, 86, 106)} and an HEX - * value of {@code #4C566A}. - *
+ * Brighter color "{@code nord3}" of the "Polar Night" component base color {@link #NORD0} with a RGB value of + * {@code rgb(76, 86, 106)} and a HEX value of {@code #4C566A}. + *

+ *

*/ NORD3(76, 86, 106), /** - * The color {@code nord4} of the "Snow Storm" component with an RGB value of {@code rgb(216, 222, 233)} and an HEX - * value of {@code #D8DEE9}. - *
+ * Base component color "{@code nord4}" of "Snow Storm" with a RGB value of {@code rgb(216, 222, 233)} and a HEX value + * of {@code #D8DEE9}. + *

+ *

*/ NORD4(216, 222, 233), /** - * The color {@code nord5} of the "Snow Storm" component with an RGB value of {@code rgb(229, 233, 240)} and an HEX - * value of {@code #E5E9F0}. - *
+ * Brighter color "{@code nord5}" of the "Snow Storm" component base color {@link #NORD4} with a RGB value of + * {@code rgb(229, 233, 240)} and a HEX value of {@code #E5E9F0}. + *

+ *

*/ NORD5(229, 233, 240), /** - * The color {@code nord6} of the "Snow Storm" component with an RGB value of {@code rgb(236, 239, 244)} and an HEX - * value of {@code #ECEFF4}. - *
+ * Brighter color "{@code nord6}" of the "Snow Storm" component base color {@link #NORD4} with a RGB value of + * {@code rgb(236, 239, 244)} and a HEX value of {@code #ECEFF4}. + *

+ *

*/ NORD6(236, 239, 244), /** - * The color {@code nord7} of the "Frost" component with an RGB value of {@code rgb(143, 188, 187)} and an HEX - * value of {@code #8FBCBB}. - *
+ * Bluish core color "{@code nord7}" of the "Frost" component with a RGB value of {@code rgb(143, 188, 187)} and a + * HEX value of {@code #8FBCBB}. + *

+ *

*/ NORD7(143, 188, 187), /** - * The color {@code nord8} of the "Frost" component with an RGB value of {@code rgb(136, 192, 208)} and an HEX - * value of {@code #88C0D0}. - *
+ * Bluish core accent color "{@code nord8}" of the "Frost" component with a RGB value of {@code rgb(136, 192, 208)} + * and a HEX value of {@code #88C0D0}. + *

+ *

*/ NORD8(136, 192, 208), /** - * The color {@code nord9} of the "Frost" component with an RGB value of {@code rgb(129, 161, 193)} and an HEX - * value of {@code #81A1C1}. - *
+ * Bluish core color "{@code nord9}" of the "Frost" component with a RGB value of {@code rgb(129, 161, 193)} and a + * HEX value of {@code #81A1C1}. + *

+ *

*/ NORD9(129, 161, 193), /** - * The color {@code nord10} of the "Frost" component with an RGB value of {@code rgb(94, 129, 172)} and an HEX - * value of {@code #5E81AC}. - *
+ * Bluish core color "{@code nord10}" of the "Frost" component with a RGB value of {@code rgb(94, 129, 172)} and a + * HEX value of {@code #5E81AC}. + *

+ *

*/ NORD10(94, 129, 172), /** - * The color {@code nord11} of the "Aurora" component with an RGB value of {@code rgb(191, 97, 106)} and an HEX - * value of {@code #BF616A}. - *
+ * Colorful color "{@code nord11}" of the "Aurora" component with a RGB value of {@code rgb(191, 97, 106)} and a + * HEX value of {@code #BF616A}. + *

+ *

*/ NORD11(191, 97, 106), /** - * The color {@code nord12} of the "Aurora" component with an RGB value of {@code rgb(208, 135, 112)} and an HEX - * value of {@code #D08770}. - *
+ * Colorful color "{@code nord12}" of the "Aurora" component with a RGB value of {@code rgb(208, 135, 112)} and a + * HEX value of {@code #D08770}. + *

+ *

*/ NORD12(208, 135, 112), /** - * The color {@code nord13} of the "Aurora" component with an RGB value of {@code rgb(235, 203, 139)} and an HEX - * value of {@code #EBCB8B}. - *
+ * Colorful color "{@code nord13}" of the "Aurora" component with a RGB value of {@code rgb(235, 203, 139)} and a + * HEX value of {@code #EBCB8B}. + *

+ *

*/ NORD13(235, 203, 139), @@ -165,19 +184,20 @@ public enum Nord { NORD14(163, 190, 140), /** - * The color {@code nord15} of the "Aurora" component with an RGB value of {@code rgb(180, 142, 173)} and an HEX - * value of {@code #B48EAD}. - *
+ * Colorful color "{@code nord15}" of the "Aurora" component with a RGB value of {@code rgb(180, 142, 173)} and a + * HEX value of {@code #B48EAD}. + *

+ *

*/ NORD15(180, 142, 173); /** - * Compiled pattern to convert the RGB and HEX color values. + * Prefix pattern to convert RGB- and HEX color values. */ private static final Pattern COLOR_PREFIX = Pattern.compile("0x", Pattern.LITERAL); /** - * Contains the RGB color code. + * The RGB color code. */ private final Color COLOR; @@ -193,9 +213,9 @@ public enum Nord { } /** - * Converts the {@code color} to the HEX identifier. + * Converts the specified color to the HEX identifier. * - * @param color the color object + * @param color the color object to convert * @return the string representation of the HEX identifier */ public static String hex(final Color color) { @@ -203,9 +223,9 @@ public static String hex(final Color color) { } /** - * Converts the {@code color} to the RGB identifier. + * Converts the specified color to the RGB identifier. * - * @param color the color object + * @param color the color object to convert * @return the string representation of the RGB identifier */ public static String rgb(final Color color) { @@ -222,7 +242,7 @@ public static String rgb(final Color color) { } /** - * Returns the color object. + * The color constant as color object. * * @return the color object */ diff --git a/src/main/java/com/arcticicestudio/nord/package-info.java b/src/main/java/com/arcticicestudio/nord/package-info.java index b143b3d..d8a445e 100644 --- a/src/main/java/com/arcticicestudio/nord/package-info.java +++ b/src/main/java/com/arcticicestudio/nord/package-info.java @@ -2,7 +2,6 @@ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ title Nord API Package Info + project nord-java + -version 0.1.0 + repository https://github.com/arcticicestudio/nord-java + author Arctic Ice Studio + email development@arcticicestudio.com + @@ -10,16 +9,13 @@ copyright Copyright (C) 2016 + +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ /** - * Public API of the Nord - Java project, which implements + * Public API of the Nord Java project, which implements * the Nord color palette. * *

- * The main entry point of the API is the {@link com.arcticicestudio.nord.Nord} enum. - *

+ * The public API entry point is the {@link com.arcticicestudio.nord.Nord} enum. * * @author Arctic Ice Studio <development@arcticicestudio.com> - * @see Nord - Java - * @see Nord * @version 0.1.0 * @since 0.1.0 */ diff --git a/src/test/java/com/arcticicestudio/nord/NordTest.java b/src/test/java/com/arcticicestudio/nord/NordTest.java index 5ceab22..5651072 100644 --- a/src/test/java/com/arcticicestudio/nord/NordTest.java +++ b/src/test/java/com/arcticicestudio/nord/NordTest.java @@ -2,7 +2,6 @@ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ title Nord API Unit Test + project nord-java + -version 0.1.0 + repository https://github.com/arcticicestudio/nord-java + author Arctic Ice Studio + email development@arcticicestudio.com + @@ -16,15 +15,15 @@ copyright Copyright (C) 2016 + import static org.junit.Assert.assertEquals; /** - * Unit tests for the public API {@link Nord}. + * Unit tests for the {@link Nord} public API. * * @author Arctic Ice Studio <development@arcticicestudio.com> - * @see Nord * @since 0.1.0 */ public class NordTest { + @Test - public void shouldReturnTheCorrectHEXColorCode() { + public void shouldReturnHEXColorCode() { assertEquals(Nord.hex(Nord.NORD0.get()), "#2E3440"); assertEquals(Nord.hex(Nord.NORD1.get()), "#3B4252"); assertEquals(Nord.hex(Nord.NORD2.get()), "#434C5E"); @@ -64,7 +63,7 @@ public void shouldReturnTheCorrectRGBColorCode() { } @Test - public void shouldReturnTheCorrectVersionString() { + public void shouldReturnValidArcVerVersionString() { assertEquals(Nord.NORD0.getVersion(), "0.1.0"); } } From e26e5cfa8e4ab22e6cd010e6a8108707dedf884d Mon Sep 17 00:00:00 2001 From: Arctic Ice Studio Date: Sat, 3 Dec 2016 11:13:13 +0100 Subject: [PATCH 15/20] GHI-#8 Add VERSION constant and make method getVersion() static --- .idea/misc.xml | 15 +-------------- src/main/java/com/arcticicestudio/nord/Nord.java | 9 +++++++-- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index b881e27..6618e18 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -25,9 +25,6 @@