Initialize color as empty

sleekbyte · Mar 4, 2016 · e43c201 · e43c201
1 parent dfeb17d
commit e43c201
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/src/main/java/com/sleekbyte/tailor/common/Messages.java b/src/main/java/com/sleekbyte/tailor/common/Messages.java
@@ -173,9 +173,11 @@ public class Messages {
     public static final String ERRORS_KEY = "errors";
     public static final String WARNINGS_KEY = "warnings";
 
-    // CLI options
+    // Error messags
     public static final String NO_SWIFT_FILES_FOUND = "No Swift source files were found.";
     public static final String COULD_NOT_BE_PARSED = " could not be parsed successfully, skipping...";
+
+    // CLI options
     public static final String SYNTAX_PREFIX = "Usage: ";
     public static final String OPTIONS_PREFIX = "Options:";
     public static final int HELP_WIDTH = 99;

diff --git a/src/main/java/com/sleekbyte/tailor/common/YamlConfiguration.java b/src/main/java/com/sleekbyte/tailor/common/YamlConfiguration.java
@@ -20,7 +20,7 @@ public final class YamlConfiguration {
     private Set<String> except = new HashSet<>();
     private String format = "";
     private boolean debug = false;
-    private String color = null;
+    private String color = "";
 
     public String getFormat() {
         return format;

diff --git a/src/main/java/com/sleekbyte/tailor/utils/Configuration.java b/src/main/java/com/sleekbyte/tailor/utils/Configuration.java
@@ -66,7 +66,9 @@ public boolean shouldListFiles() {
      */
     public boolean shouldColorOutput() {
         boolean shouldColorOutput = CLIArgumentParser.shouldColorOutput();
-        if (shouldColorOutput && yamlConfiguration.isPresent() && yamlConfiguration.get().getColor() != null) {
+        if (shouldColorOutput
+            && yamlConfiguration.isPresent()
+            && !yamlConfiguration.get().getColor().isEmpty()) {
             String option = yamlConfiguration.get().getColor();
             validateColorOption(option);
             if (option.equals(Messages.DISABLE)) {
@@ -83,7 +85,9 @@ public boolean shouldColorOutput() {
      */
     public boolean shouldInvertColorOutput() {
         boolean shouldInvertColorOutput = CLIArgumentParser.shouldInvertColorOutput();
-        if (!shouldInvertColorOutput && yamlConfiguration.isPresent() && yamlConfiguration.get().getColor() != null) {
+        if (!shouldInvertColorOutput
+            && yamlConfiguration.isPresent()
+            && !yamlConfiguration.get().getColor().isEmpty()) {
             String option = yamlConfiguration.get().getColor();
             validateColorOption(option);
             if (option.equals(Messages.INVERT)) {

diff --git a/src/test/java/com/sleekbyte/tailor/functional/FormatTest.java b/src/test/java/com/sleekbyte/tailor/functional/FormatTest.java
@@ -160,8 +160,8 @@ public void testXcodeConfigOption() throws IOException {
 
         String[] msgs = outContent.toString(Charset.defaultCharset().name()).split(NEWLINE_REGEX);
 
-        // Skip first two lines for file header, last two lines for summary
-        msgs = Arrays.copyOfRange(msgs, 2, msgs.length - 2);
+        // Skip first four lines for file header, last two lines for summary
+        msgs = Arrays.copyOfRange(msgs, 4, msgs.length - 2);
 
         for (String msg : msgs) {
             String truncatedMsg = msg.substring(msg.indexOf(inputFile.getName()));