#436 test coverage

Author: dave

.idea/runConfigurations/TcMenuDesigner_Tests.xml

@@ -19,6 +19,7 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
 import java.util.Collection;
 import java.util.Comparator;
 import java.util.List;
@@ -93,7 +94,7 @@ public boolean startConversion(Path directory, List<CodePluginItem> plugins, Men
                     options.getSaveLocation(), previousPluginFiles);
 
             if(handler.isLocalSupportEnabled()) {
-                copyLocaleDataIntoProject();
+                copyLocaleDataIntoProject(javaProject);
             }
 
             logLine(INFO, "Checking if all dependencies are in the maven POM");
@@ -110,8 +111,10 @@ public boolean startConversion(Path directory, List<CodePluginItem> plugins, Men
         return false;
     }
 
-    private void copyLocaleDataIntoProject() {
-
+    private void copyLocaleDataIntoProject(EmbeddedJavaProject javaProject) throws IOException {
+        loggerDelegate.accept(INFO, "Copying resource bundles to data/i18n directory");
+        Files.copy(javaProject.getProjectRoot().resolve("i18n"), javaProject.getProjectRoot().resolve("data"),
+                StandardCopyOption.COPY_ATTRIBUTES, StandardCopyOption.REPLACE_EXISTING);
     }
 
     private void createJavaModuleFile(CodeGeneratorOptions options, EmbeddedJavaProject javaProject) throws IOException {
@@ -238,7 +241,7 @@ private void generateMenuAppContext(EmbeddedJavaProject javaProject, String claz
         if(handler.isLocalSupportEnabled()) {
             builder.addStatement(new GeneratedJavaMethod(METHOD_IF_MISSING, "LocaleMappingHandler", "localeHandler")
                     .withTcComponent()
-                    .withStatement("return new ResourceBundleMappingHandler(ResourceBundle.getBundle(\"i18n." + MENU_PROJECT_LANG_FILENAME+ "\"));"));
+                    .withStatement("return new PropertiesLocaleEnabledHandler(new SafeBundleLoader(\"./data/i18n/" + MENU_PROJECT_LANG_FILENAME+ "\"));"));
         } else {
             builder.addStatement(new GeneratedJavaMethod(METHOD_IF_MISSING, "LocaleMappingHandler", "localeHandler")
                     .withTcComponent().withStatement("return LocaleMappingHandler.NOOP_IMPLEMENTATION;"));

tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/generator/ejava/EmbeddedJavaGenerator.java

@@ -36,7 +36,6 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Objects;
@@ -140,6 +139,9 @@ public void testMbedConversion() throws IOException {
         var pluginGeneratedH = new String(Files.readAllBytes(generatedDir.resolve("source.h")));
         var pluginGeneratedCPP = new String(Files.readAllBytes(generatedDir.resolve("source.cpp")));
         var pluginGeneratedTransport = new String(Files.readAllBytes(generatedDir.resolve("MySpecialTransport.h")));
+        var langSelectHeader = Files.readString(generatedDir.resolve("project_langSelect.h"));
+        var langCoreHeader = Files.readString(generatedDir.resolve("project_lang.h"));
+        var langFrHeader = Files.readString(generatedDir.resolve("project_lang_fr.h"));
 
         var cppTemplate = new String(Objects.requireNonNull(getClass().getResourceAsStream("/generator/templateMbed.cpp")).readAllBytes());
         var hTemplate = new String(Objects.requireNonNull(getClass().getResourceAsStream("/generator/templateMbed.h")).readAllBytes());
@@ -157,6 +159,37 @@ public void testMbedConversion() throws IOException {
                 My Transport file
                 #define THE_SERIAL Serial
                 """, pluginGeneratedTransport);
+        assertEqualsIgnoringCRLF("""
+                // TcMenu Generated Locale File, do not edit this file.
+                // This is the header to include. Set TC_LOCAL_?? to a locale
+                // or omit for the default language
+                                
+                #if defined(TC_LOCALE_FR)
+                # include "project_lang_fr.h"
+                #else
+                #include "project_lang.h"
+                #endif
+                """, langSelectHeader);
+        assertEqualsIgnoringCRLF("""
+                // TcMenu Generated Locale File, do not edit this file. Locale\s
+                // Never include directly, always include the langSelect header
+                                
+                #define TC_I18N_MENU_10003_NAME "Analog Ram Def"
+                #define TC_I18N_MENU_10002_NAME "IoT Def Text"
+                #define TC_I18N_MENU_10003_UNIT "De"
+                #define TC_I18N_MENU_10004_NAME "Text Edit Def"
+                #define TC_I18N_MENU_10001_NAME "Auth Def Text"
+                """, langCoreHeader);
+        assertEqualsIgnoringCRLF("""
+                // TcMenu Generated Locale File, do not edit this file. Locale fr
+                // Never include directly, always include the langSelect header
+                                
+                #define TC_I18N_MENU_10003_NAME "Analog Ram Fr"
+                #define TC_I18N_MENU_10002_NAME "IoT Fr Text"
+                #define TC_I18N_MENU_10003_UNIT "Fr"
+                #define TC_I18N_MENU_10004_NAME "Text Edit"
+                #define TC_I18N_MENU_10001_NAME "Auth Fr Text"
+                """, langFrHeader);
     }
 
     private void putLocaleFilesInPlace(Path i18n) throws IOException {