Complete LocalizationManagerTests, fixed resource files, extracted ILocalizationModule

Author: mialeska

src/main/java/aquality/selenium/core/localization/ILocalizationManager.java

@@ -5,7 +5,7 @@
  */
 public interface ILocalizationManager {
     /**
-     * Get localized message from resources by its key.
+     * Gets localized message from resources by its key.
      * @param messageKey Key in resource file.
      * @param args Arguments, which will be provided to template of localized message.
      * @return Localized message.

src/main/java/aquality/selenium/core/localization/ILocalizationModule.java

@@ -1,10 +1,19 @@
 package aquality.selenium.core.localization;
 
+/**
+ * Describes implementations of localization services to be registered in DI container.
+ */
 public interface ILocalizationModule {
+    /**
+     * @return class which implements ILocalizationManager
+     */
     default Class<? extends ILocalizationManager> getLocalizationManagerImplementation() {
         return LocalizationManager.class;
     }
 
+    /**
+     * @return class which implements ILocalizedLogger
+     */
     default Class<? extends ILocalizedLogger> getLocalizedLoggerImplementation() {
         return LocalizedLogger.class;
     }

src/main/java/aquality/selenium/core/localization/LocalizationManager.java

@@ -10,12 +10,13 @@ public class LocalizationManager implements ILocalizationManager {
     private static final String LANG_RESOURCE_TEMPLATE = "localization/%1$s.json";
     private final ISettingsFile localizationFile;
     private final Logger logger;
+    private final String locResourceName;
 
     @Inject
     public LocalizationManager(ILoggerConfiguration loggerConfiguration, Logger logger) {
         this.logger = logger;
         String language = loggerConfiguration.getLanguage();
-        String locResourceName = String.format(LANG_RESOURCE_TEMPLATE, language.toLowerCase());
+        locResourceName = String.format(LANG_RESOURCE_TEMPLATE, language.toLowerCase());
         localizationFile = new JsonSettingsFile(locResourceName);
     }
 
@@ -26,7 +27,8 @@ public String getLocalizedMessage(String messageKey, Object... args) {
             return String.format(localizationFile.getValue(jsonKeyPath).toString(), args);
         }
 
-        logger.warn(String.format("Cannot find localized message by key '%1$s'", jsonKeyPath));
+        logger.warn(String.format("Cannot find localized message by key '%1$s' in resource file %2$s",
+                jsonKeyPath, locResourceName));
         return messageKey;
     }
 }

src/main/java/aquality/selenium/core/localization/LocalizedLogger.java

@@ -10,7 +10,6 @@ public class LocalizedLogger implements ILocalizedLogger {
 
     @Inject
     public LocalizedLogger(ILocalizationManager localizationManager, Logger logger) {
-
         this.localizationManager = localizationManager;
         this.logger = logger;
     }

src/test/java/tests/localization/LocalizationManagerTests.java

@@ -8,6 +8,7 @@
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 import tests.application.CustomAqualityServices;
+import tests.application.browser.AqualityServices;
 
 import java.util.MissingFormatArgumentException;
 
@@ -39,7 +40,7 @@ private Object[] keysWithoutParams() {
 
     private LocalizationManager getLocalizationManager() {
         return new LocalizationManager(
-                CustomAqualityServices.getServiceProvider().getInstance(ILoggerConfiguration.class),
+                AqualityServices.getServiceProvider().getInstance(ILoggerConfiguration.class),
                 Logger.getInstance());
     }
 
@@ -110,5 +111,4 @@ public void testShouldThrowWhenInvalidLanguageSupplied() {
         Assert.assertThrows(IllegalArgumentException.class, () ->
                 getLocalizationManager("invalid").getLocalizedMessage(CLICKING_MESSAGE_KEY));
     }
-
 }