WI #1282 An empty dependency folder should not stop the generation

CLI/test/CLITest.cs

@@ -57,12 +57,23 @@ public void TestDependencies() {
             CLITestHelper.ReadConsole("dependencies_4", ReturnCode.DependenciesError);            //No dependencies found
             CLITestHelper.Test("dependencies_5", ReturnCode.Success);
             CLITestHelper.Test("dependencies_6", ReturnCode.Success);
-            CLITestHelper.Test("dependency_with_copy_loading", ReturnCode.Success); 
+            CLITestHelper.Test("dependency_with_copy_loading", ReturnCode.Success);
 #if EUROINFO_RULES
             CLITestHelper.Test("ei_dependencies_1", ReturnCode.ParsingDiagnostics);
 #endif
         }
 
+        [TestMethod]
+        public void TestEmptyDependency()
+        {
+            var testFolderName = "empty_dependency_folder";
+            Directory.CreateDirectory("ressources" + Path.DirectorySeparatorChar + testFolderName + Path.DirectorySeparatorChar +  "emptyFolder");
+
+            CLITestHelper.ReadConsoleWarnings(testFolderName, ReturnCode.Success);
+        }
+
+
+
         /// <summary>
         /// Test that even with a execToStep>Preprocessor, then the parsing will halt on preprocessor phase because copy are missing
         /// </summary>
@@ -218,6 +229,29 @@ internal static void ReadConsole(string testFolderName, ReturnCode expectedRetur
                     Environment.NewLine, standardOutput, expectedoutput, Environment.NewLine, standardOutput.Length, expectedoutput.Length));
         }
 
+        internal static void ReadConsoleWarnings(string testFolderName, ReturnCode expectedReturnCode)
+        {
+            var workingDirectory = "ressources" + Path.DirectorySeparatorChar + testFolderName;
+            string arguments = File.ReadAllText(workingDirectory + Path.DirectorySeparatorChar + "CLIArguments.txt");
+            string standardOutput = Test(workingDirectory, arguments, expectedReturnCode).Trim();
+            string warnings = string.Empty;
+
+            foreach (string line in standardOutput.Split(new string[] { "\r\n" }, StringSplitOptions.None))
+            {
+                if (line.StartsWith("Line"))
+                    warnings += line + "\r\n";
+            }
+
+            warnings = warnings.Trim();
+            string expectedoutput = File.ReadAllText(workingDirectory + Path.DirectorySeparatorChar + "ExpectedConsole.txt").Trim();
+            if (!string.Equals(warnings, expectedoutput, StringComparison.CurrentCultureIgnoreCase))
+                throw new Exception(string.Format("console outputs not equals.{0}" +
+                                                  "Console: {4}{0}{1}{0}" +
+                                                  "Expected: {5}{0}{2}{0}" +
+                                                  "{3}",
+                    Environment.NewLine, warnings, expectedoutput, Environment.NewLine, warnings.Length, expectedoutput.Length));
+        }
+
         /// <summary>
         /// Use the folder ressources\[testFolderName]
         /// Run command TypeCobol.CLI with the content of CLIArguments.txt as arguments

CLI/test/ressources/arguments_errors_1/ExpectedConsole.txt

@@ -4,7 +4,7 @@ Code: 1022 TypeCobol.CLI.exe: Error diagnostics path is unreachable.
 Code: 1024 TypeCobol.CLI.exe: Missing copy path given is unreachable.
 Code: 1027 TypeCobol.CLI.exe: Intrinsic files given are unreachable.
 Code: 1028 TypeCobol.CLI.exe: Copies files given are unreachable.
-Code: 1029 TypeCobol.CLI.exe: Dependencies files given are unreachable.
+Code: 1029 TypeCobol.CLI.exe: Dependencies files given are unreachable: input\MissingDependencies1
 Code: 1030 TypeCobol.CLI.exe: Maximum diagnostics have to be an integer.
 Code: 1031 TypeCobol.CLI.exe: Unexpected parameter given for Output format option. Accepted parameters are Cobol85/0(default), PublicSignature/1.
 Code: 1032 TypeCobol.CLI.exe: Expanding copy path given is unreachable.

CLI/test/ressources/dependencies_4/ExpectedConsole.txt

@@ -1,2 +1,2 @@
-Code: 1029 TypeCobol.CLI.exe: Dependencies files given are unreachable.
+Code: 1029 TypeCobol.CLI.exe: Dependencies files given are unreachable: input\DoesntExists.rdz.tcbl
 Try TypeCobol.CLI.exe --help for usage information.

CLI/test/ressources/empty_dependency_folder/CLIArguments.txt

@@ -0,0 +1 @@
+-1 -i input\PGM3.rdz.tcbl -o output\PGM3.rdz.tcbl -d output\error.txt --dependencies emptyFolder\ -s ..\skeletons.xml -e rdz

CLI/test/ressources/empty_dependency_folder/ExpectedConsole.txt

@@ -0,0 +1 @@
+Line 1[1,1] <35, Warning, Semantics> - Error while parsing dependency file: emptyFolder\, no dependencies found

CLI/test/ressources/empty_dependency_folder/input/PGM3.rdz.tcbl

@@ -0,0 +1,13 @@
+       IDENTIFICATION DIVISION.
+       PROGRAM-ID. PGM3.
+
+       DATA DIVISION.
+       Working-STORAGE SECTION.
+
+       01  somedate     TYPE Date.
+       01  msg      PIC X(80).
+
+       PROCEDURE DIVISION.
+            GOBACK.
+
+       END PROGRAM PGM3.

CLI/test/ressources/empty_dependency_folder/output_expected/PGM3.rdz.tcbl

@@ -0,0 +1,19 @@
+      *TypeCobol_Version:0.1(alpha)
+       IDENTIFICATION DIVISION.
+       PROGRAM-ID. PGM3.
+
+       DATA DIVISION.
+       Working-STORAGE SECTION.
+
+      *01  somedate     TYPE Date.
+       01 somedate.
+           02 YYYY PIC 9(4).
+           02 MM PIC 9(2).
+           02 DD PIC 9(2).
+
+       01  msg      PIC X(80).
+
+       PROCEDURE DIVISION.
+            GOBACK.
+
+       END PROGRAM PGM3.

CLI/test/ressources/empty_dependency_folder/output_expected/error.txt

@@ -0,0 +1,2 @@
+ReturnCode=Success_
+No error in "input\PGM3.rdz.tcbl".

TypeCobol/Tools/Options-Config/TypeCobolConfiguration.cs

@@ -78,7 +78,7 @@ public bool IsErrorXML
             { ReturnCode.EncodingError,          "Unexpected parameter given for encoding option. Accepted parameters are \"rdz\"(default), \"zos\", \"utf8\"." },
             { ReturnCode.IntrinsicError,         "Intrinsic files given are unreachable." },
             { ReturnCode.CopiesError,            "Copies files given are unreachable." },
-            { ReturnCode.DependenciesError,      "Dependencies files given are unreachable." },
+            { ReturnCode.DependenciesError,      "Dependencies files given are unreachable: " },
             { ReturnCode.MaxDiagnosticsError,    "Maximum diagnostics have to be an integer." },
             { ReturnCode.OutputFormatError,      "Unexpected parameter given for Output format option. Accepted parameters are Cobol85/0(default), PublicSignature/1." },
             { ReturnCode.ExpandingCopyError,     "Expanding copy path given is unreachable." },
@@ -256,8 +256,22 @@ public static Dictionary<ReturnCode, string> InitializeCobolOptions(TypeCobolCon
             //CopiesError
             VerifFiles(config.CopyFolders, ReturnCode.CopiesError, ref errorStack, true);
 
-            //DependenciesError
-            VerifFiles(config.Dependencies, ReturnCode.DependenciesError, ref errorStack);
+            ////DependencyFolderMissing
+            if (config.ExecToStep == ExecutionStep.Generate && !errorStack.ContainsKey(ReturnCode.ExecToStepError))
+            {
+                foreach (string dependency in config.Dependencies)
+                {
+                    string directory = Path.GetDirectoryName(dependency);
+                    string file = Path.GetFileName(dependency);
+
+                    if (file?.Contains("*") == true)
+                        file = string.Empty;
+
+                    if ((!Directory.Exists(directory) || !file.IsNullOrEmpty() && !File.Exists(dependency)) && !errorStack.ContainsKey(ReturnCode.DependenciesError))
+                        errorStack.Add(ReturnCode.DependenciesError, TypeCobolConfiguration.ErrorMessages[ReturnCode.DependenciesError] + directory + Path.DirectorySeparatorChar + file);
+
+                }
+            }
 
             // MaxDiagnosticsError
             if (!config.RawMaximumDiagnostics.IsNullOrEmpty())