refactor to consolidate console code

HiltonRoscoe · May 4, 2019 · e2db318 · e2db318
1 parent 28aa9b3
commit e2db318
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 54 deletions.
diff --git a/CdfValidator.sln → CdfTools.sln b/CdfValidator.sln → CdfTools.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26124.0
 MinimumVisualStudioVersion = 15.0.26124.0
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CdfValidator", "CdfTools\CdfTools.csproj", "{50D1F743-698E-41A0-887D-A8E2727C529F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CdfTools", "CdfTools\CdfTools.csproj", "{50D1F743-698E-41A0-887D-A8E2727C529F}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CdfTools.Tests", "CdfTools.Tests\CdfTools.Tests.csproj", "{BB62A6B2-8651-4961-9E40-344EDDBB3497}"
 EndProject

diff --git a/CdfTools/JsonSchemaValidator.cs b/CdfTools/JsonSchemaValidator.cs
@@ -8,9 +8,8 @@ namespace CdfTools
 {
     class JsonSchemaValidator
     {
-        public static void jsonSchema(string inputPath, string schemaPath)
-        {
-            System.Console.WriteLine("Invoking JSON Schema Validation");
+        public static List<String> jsonSchema(string inputPath, string schemaPath)
+        {            
             using (StreamReader schemaFile = File.OpenText(schemaPath))
             {
                 using (StreamReader inputFile = File.OpenText(inputPath))
@@ -24,12 +23,10 @@ public static void jsonSchema(string inputPath, string schemaPath)
                             {
                                 validatingReader.Schema = schema;
 
-                                IList<string> errorList = new List<string>();
+                                List<string> errorList = new List<string>();
                                 validatingReader.ValidationEventHandler += (o, a) =>
                                 {
-                                    errorList.Add(a.Message);
-                                    // send out immediately
-                                    // Console.WriteLine(a.Message);
+                                    errorList.Add(a.Message);             
                                 };
 
                                 JsonSerializer serializer = new JsonSerializer();
@@ -39,21 +36,7 @@ public static void jsonSchema(string inputPath, string schemaPath)
                                 {
                                 }
 
-                                if (errorList.Count > 0)
-                                {
-                                    Console.ForegroundColor = ConsoleColor.Red;
-                                    foreach (var error in errorList)
-                                    {
-                                        Console.WriteLine(error);
-                                    }
-                                    Console.WriteLine("JSON Instance has one or more errors");
-                                }
-                                else
-                                {
-                                    Console.ForegroundColor = ConsoleColor.Green;
-                                    Console.WriteLine("JSON Instance is Valid");
-                                }
-                                Console.ResetColor();
+                                return errorList;
                             }
                         }
                     }

diff --git a/CdfTools/ValidateCommand.cs b/CdfTools/ValidateCommand.cs
@@ -20,7 +20,6 @@ class ValidateCommand
 
         [LegalFilePath]
         [Option(Template = "-t|--schematron", Description = "Input schematron file")]
-        //    [Required]
         public string SchematronFile { get; }
         // You can use this pattern when the parent command may have options or methods you want to
         // use from sub-commands.
@@ -39,12 +38,44 @@ public void OnExecute()
                         throw new NotImplementedException("Schematron support is not available at this time");
                         // XmlValidationHarness.schematron(this.InputFile, this.SchematronFile);
                     }
-                    XmlValidationHarness.xsd(this.InputFile, this.SchemaFile);
+                    System.Console.WriteLine("Invoking XSD Validation");
+                    var errorList = XmlValidationHarness.xsd(this.InputFile, this.SchemaFile);
+                    if (errorList.Count > 0)
+                    {
+                        Console.ForegroundColor = ConsoleColor.Red;
+                        foreach (var error in errorList)
+                        {
+                            Console.WriteLine(error);
+                        }
+                        Console.WriteLine("XML Instance has one or more errors");
+                    }
+                    else
+                    {
+                        Console.ForegroundColor = ConsoleColor.Green;
+                        Console.WriteLine("XML Instance is Valid");
+                    }
+                    Console.ResetColor();
                 }
                 else if (this.InputFile.EndsWith(".json"))
                 {
                     // note that schematron flag is ignored in this case
-                    JsonSchemaValidator.jsonSchema(this.InputFile, this.SchemaFile);
+                    System.Console.WriteLine("Invoking JSON Schema Validation");
+                    var errorList = JsonSchemaValidator.jsonSchema(this.InputFile, this.SchemaFile);
+                    if (errorList.Count > 0)
+                    {
+                        Console.ForegroundColor = ConsoleColor.Red;
+                        foreach (var error in errorList)
+                        {
+                            Console.WriteLine(error);
+                        }
+                        Console.WriteLine("JSON Instance has one or more errors");
+                    }
+                    else
+                    {
+                        Console.ForegroundColor = ConsoleColor.Green;
+                        Console.WriteLine("JSON Instance is Valid");
+                    }
+                    Console.ResetColor();
                 }
                 else
                 {

diff --git a/CdfTools/XmlValidationHarness.cs b/CdfTools/XmlValidationHarness.cs
@@ -1,4 +1,4 @@
-using System;
+using System.Collections.Generic;
 using System.Xml;
 namespace CdfTools
 {
@@ -17,7 +17,7 @@ public static void schematron(string inputFile, string schematronFile)
             var nsmgr = new XmlNamespaceManager(svrl.NameTable);
             nsmgr.AddNamespace("svrl", "http://purl.oclc.org/dsdl/svrl");
             var errors = svrl.SelectNodes("/svrl:schematron-output/svrl:failed-assert", nsmgr);
-            if (errors.Count > 0)
+           /* if (errors.Count > 0)
             {
                 Console.ForegroundColor = ConsoleColor.Red;
                 foreach (XmlNode error in errors)
@@ -30,44 +30,24 @@ public static void schematron(string inputFile, string schematronFile)
                 Console.ForegroundColor = ConsoleColor.Green;
                 Console.WriteLine("Schematron validation passed");
             }
-            Console.ResetColor();
+            Console.ResetColor();*/
             //TODO: remove short circuit
             return;
         }
 
 
-        public static void xsd(string inputFile, string schemaFile)
+        public static List<string> xsd(string inputFile, string schemaFile)
         {
             try
             {
                 // TODO: sanitize uris/filenames
-                System.Console.WriteLine("Invoking XSD Validation");
                 var validator = new XsdValidator();
-                var errorList = validator.Validate(schemaFile, inputFile);
-                if (errorList.Count > 0)
-                {
-                    Console.ForegroundColor = ConsoleColor.Red;
-                    foreach (var error in errorList)
-                    {
-                        Console.WriteLine(error);
-                    }
-                    Console.WriteLine("XML Instance has one or more errors");
-                }
-                else
-                {
-                    Console.ForegroundColor = ConsoleColor.Green;
-                    Console.WriteLine("XML Instance is Valid");
-                }
-                Console.ResetColor();
+                return validator.Validate(schemaFile, inputFile);
+
             }
-            catch (System.Xml.Schema.XmlSchemaException)
+            catch (System.Xml.Schema.XmlSchemaException ex)
             {
-                Console.ForegroundColor = ConsoleColor.DarkRed;
-                Console.WriteLine("Problem processing the XML Schema Definition");
-                // if (Parent.Verbose)
-                // {
-                //    Console.WriteLine(ex.Message);
-                // }
+                throw new System.Exception("Problem processing the XML Schema Definition", ex);                        
             }
         }
     }