Adjust test & polishing

Author: jpomykala

src/main/java/io/simplelocalize/cli/configuration/ConfigurationLoader.java

@@ -12,6 +12,7 @@
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
@@ -21,12 +22,12 @@ public class ConfigurationLoader {
 
   private Logger log = LoggerFactory.getLogger(ConfigurationLoader.class);
 
-  public Configuration load(String path) throws UnsupportedEncodingException {
+  public Configuration load(String path) {
 
     Path configurationFilePath = Paths.get(path);
     log.info("Using configuration file in path: {}", configurationFilePath);
 
-    File file = new File(URLDecoder.decode(String.valueOf(configurationFilePath.toFile()), "utf-8"));;
+    File file = new File(URLDecoder.decode(String.valueOf(configurationFilePath.toFile()), StandardCharsets.UTF_8));
 
     if (!file.exists()) {
       throw new ConfigurationNotFoundException("Could not find configuration file in: " + path);

src/main/java/io/simplelocalize/cli/util/FileReaderUtil.java

@@ -28,7 +28,7 @@ public static List<String> tryReadLines(Path filePath) {
     Path decodedFilePath = null;
     List<String> fileLines = Collections.emptyList();
     try {
-      decodedFilePath = Paths.get(URLDecoder.decode(String.valueOf(Paths.get(String.valueOf(filePath))), "utf-8"));
+      decodedFilePath = Paths.get(URLDecoder.decode(String.valueOf(Paths.get(String.valueOf(filePath))), StandardCharsets.UTF_8));
       fileLines = Files.readAllLines(decodedFilePath, StandardCharsets.UTF_8);
     } catch (IOException e) {
       log.warn("Cannot read file from path " + decodedFilePath.toString(), e);
@@ -40,7 +40,7 @@ public static List<String> tryReadLines(Path filePath) {
   public static String tryReadContent(Path filePath) {
     Path decodedFilePath = null;
     try {
-      decodedFilePath = Paths.get(URLDecoder.decode(String.valueOf(Paths.get(String.valueOf(filePath))), "utf-8"));
+      decodedFilePath = Paths.get(URLDecoder.decode(String.valueOf(Paths.get(String.valueOf(filePath))), StandardCharsets.UTF_8));
       return Files.readString(decodedFilePath, StandardCharsets.UTF_8);
     } catch (IOException e) {
       log.warn("Cannot read file from path " + decodedFilePath.toString(), e);

src/test/java/io/simplelocalize/cli/processor/keys/ReactIntlKeyExtractorTest.java

@@ -23,14 +23,16 @@ public void shouldExtractKeysFromLines() throws Exception {
     Set<String> keys = reactIntlKeyExtractor.extractKeysFromFile(Paths.get(path));
 
     //then
-    Assertions.assertThat(keys).hasSize(8);
+    Assertions.assertThat(keys).hasSize(10);
     Assertions.assertThat(keys).containsExactlyInAnyOrder(
             "VISITS",
             "LIKES",
             "CREATED_COUNT",
             "COMMENTS",
             "COVER_IMAGE.PLACEHOLDER",
             "COVER_IMAGE.TITLE",
+            "COVER_IMAGE.PLACEHOLDER_DOUBLE",
+            "COVER_IMAGE.TITLE_DOUBLE",
             "ACHIEVEMENTS",
             "AVAILABLE_SOON"
     );

src/test/resources/react-intl/UserPage.js

@@ -197,6 +197,19 @@ class UserPage extends Component {
               /> :
               null}
 
+            {showingLoggedUser ?
+              <ImageUploaderGroup
+                onImageUploaded={this.onCoverUploaded}
+                title={intl.formatMessage(defineMessages({
+                  id: "COVER_IMAGE.TITLE_DOUBLE",
+                  defaultMessage: "Change cover photo"
+                }))}
+                message={intl.formatMessage(defineMessages( { id: "COVER_IMAGE.PLACEHOLDER_DOUBLE",
+                  defaultMessage: "Drop photo here, we will take care of everything"
+                }))}
+              /> :
+              null}
+
             <h2 className="text-center">
               <FormattedMessage
                 id="ACHIEVEMENTS"