fix tests for linux/macos

deislabs · Jul 26, 2021 · 488e009 · 488e009
1 parent c6bda4a
commit 488e009
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 8 deletions.
diff --git a/source/wagi.test/EndpointRouteBuilderExtensionsTest.cs b/source/wagi.test/EndpointRouteBuilderExtensionsTest.cs
@@ -23,7 +23,6 @@ public class EndpointRouteBuilderExtensionsTest
         public async Task Test_Handles_No_Configuration_As_Log_Warning()
         {
             var mockLogger = new Mock<ILogger>();
-
             var mockLoggerFactory = new Mock<ILoggerFactory>();
             mockLoggerFactory.Setup(x => x.CreateLogger(It.IsAny<string>())).Returns(() => mockLogger.Object);
             var testServer = EndpointRouteBuilderExtensionsTest.CreateTestServer("testdata/appsettingsNoConfig.json", mockLoggerFactory);
@@ -36,7 +35,6 @@ public async Task Test_Handles_No_Configuration_As_Log_Warning()
         public async Task Test_Handles_Configuration_With_Empty_Config()
         {
             var mockLogger = new Mock<ILogger>();
-
             var mockLoggerFactory = new Mock<ILoggerFactory>();
             mockLoggerFactory.Setup(x => x.CreateLogger(It.IsAny<string>())).Returns(() => mockLogger.Object);
             var testServer = EndpointRouteBuilderExtensionsTest.CreateTestServer("testdata/appsettingsEmptyConfig.json", mockLoggerFactory);
@@ -49,7 +47,6 @@ public async Task Test_Handles_Configuration_With_Empty_Config()
         public async Task Test_Handles_Configuration_With_WAT_Module()
         {
             var mockLogger = new Mock<ILogger>();
-
             var mockLoggerFactory = new Mock<ILoggerFactory>();
             mockLoggerFactory.Setup(x => x.CreateLogger(It.IsAny<string>())).Returns(() => mockLogger.Object);
             var testServer = EndpointRouteBuilderExtensionsTest.CreateTestServer("testdata/appsettingsWATConfig.json", mockLoggerFactory);
@@ -62,7 +59,6 @@ public async Task Test_Handles_Configuration_With_WAT_Module()
         public async Task Test_Handles_Configuration_With_WAGI_Module()
         {
             var mockLogger = new Mock<ILogger>();
-
             var mockLoggerFactory = new Mock<ILoggerFactory>();
             mockLoggerFactory.Setup(x => x.CreateLogger(It.IsAny<string>())).Returns(() => mockLogger.Object);
             var testServer = EndpointRouteBuilderExtensionsTest.CreateTestServer("testdata/appsettingsWAGIConfig.json", mockLoggerFactory);
@@ -75,18 +71,26 @@ public async Task Test_Handles_Configuration_With_WAGI_Module()
         public void Test_Module_Is_Missing()
         {
             var mockLogger = new Mock<ILogger>();
+            var mockLoggerFactory = new Mock<ILoggerFactory>();
+            mockLoggerFactory.Setup(x => x.CreateLogger(It.IsAny<string>())).Returns(() => mockLogger.Object);
+            var testServer = EndpointRouteBuilderExtensionsTest.CreateTestServer("testdata/appsettingsModuleIsMissingConfig.json", mockLoggerFactory, context => new StartupTest(context.Configuration, typeof(OptionsValidationException), $"Module file testdata/modules{Path.DirectorySeparatorChar}dontexist.wasm not found for module name dontexist{Environment.NewLine}"));
+            testServer.CreateClient();
+        }
 
+        [Fact]
+        public void Test_Route_Is_Missing()
+        {
+            var mockLogger = new Mock<ILogger>();
             var mockLoggerFactory = new Mock<ILoggerFactory>();
             mockLoggerFactory.Setup(x => x.CreateLogger(It.IsAny<string>())).Returns(() => mockLogger.Object);
-            var testServer = EndpointRouteBuilderExtensionsTest.CreateTestServer("testdata/appsettingsModuleIsMissingConfig.json", mockLoggerFactory, context => new StartupTest(context.Configuration, typeof(OptionsValidationException), $"Module file testdata/modules{Path.DirectorySeparatorChar}dontexist.wasm not found for module name dontexist\r\n"));
+            var testServer = EndpointRouteBuilderExtensionsTest.CreateTestServer("testdata/appsettingsRouteIsMissingConfig.json", mockLoggerFactory, context => new StartupTest(context.Configuration, typeof(OptionsValidationException), $"Route should not be null or empty for module name noroute{Environment.NewLine}"));
             testServer.CreateClient();
         }
 
         [Fact]
         public async Task Test_Handles_Configuration_With_Custom_Section_Name()
         {
             var mockLogger = new Mock<ILogger>();
-
             var mockLoggerFactory = new Mock<ILoggerFactory>();
             mockLoggerFactory.Setup(x => x.CreateLogger(It.IsAny<string>())).Returns(() => mockLogger.Object);
             var testServer = EndpointRouteBuilderExtensionsTest.CreateTestServer("testdata/appsettingsCustomSectionNameConfig.json", mockLoggerFactory, context => new StartupTest(context.Configuration, "custom"));
@@ -99,10 +103,9 @@ public async Task Test_Handles_Configuration_With_Custom_Section_Name()
         public void Test_Handles_Modules_Directory_Does_Not_Exist()
         {
             var mockLogger = new Mock<ILogger>();
-
             var mockLoggerFactory = new Mock<ILoggerFactory>();
             mockLoggerFactory.Setup(x => x.CreateLogger(It.IsAny<string>())).Returns(() => mockLogger.Object);
-            var testServer = EndpointRouteBuilderExtensionsTest.CreateTestServer("testdata/appsettingsModulesDirectoryDoesNotExistsConfig.json", mockLoggerFactory, context => new StartupTest(context.Configuration, typeof(OptionsValidationException), $"Module Path not found dontexist\r\nModule file dontexist{Path.DirectorySeparatorChar}fibonacci.wasm not found for module name fibonacci\r\n"));
+            var testServer = EndpointRouteBuilderExtensionsTest.CreateTestServer("testdata/appsettingsModulesDirectoryDoesNotExistsConfig.json", mockLoggerFactory, context => new StartupTest(context.Configuration, typeof(OptionsValidationException), $"Module Path not found dontexist{Environment.NewLine}Module file dontexist{Path.DirectorySeparatorChar}fibonacci.wasm not found for module name fibonacci{Environment.NewLine}"));
             testServer.CreateClient();
         }
 

diff --git a/source/wagi.test/testdata/appsettingsRouteIsMissingConfig.json b/source/wagi.test/testdata/appsettingsRouteIsMissingConfig.json
@@ -0,0 +1,10 @@
+{
+  "Wagi": {
+    "ModulePath": "testdata/modules",
+    "Modules": {
+      "noroute": {
+        "FileName": "module.wasm"
+      }
+    }
+  }
+}
diff --git a/source/wagi.test/wagi.test.csproj b/source/wagi.test/wagi.test.csproj
@@ -52,6 +52,7 @@
       <Content Include="testdata\appsettingsModuleIsMissingConfig.json" />
       <Content Include="testdata\appsettingsModulesDirectoryDoesNotExistsConfig.json" />
       <Content Include="testdata\appsettingsNoConfig.json" />
+      <Content Include="testdata\appsettingsRouteIsMissingConfig.json" />
       <Content Include="testdata\appsettingsWAGIConfig.json" />
       <Content Include="testdata\appsettingsWATConfig.json" />
     </ItemGroup>

diff --git a/source/wagi/Configuration/ValidateConfiguration.cs b/source/wagi/Configuration/ValidateConfiguration.cs
@@ -69,6 +69,7 @@ public ValidateOptionsResult Validate(string name, WagiModules options)
                     if (string.IsNullOrEmpty(route))
                     {
                         result.AppendLine($"Route should not be null or empty for module name {moduleName}");
+                        return ValidateOptionsResult.Fail(result.ToString());
                     }
 
                     if (route.Contains("{", StringComparison.InvariantCulture) && route.Contains("}", StringComparison.InvariantCulture))
@@ -137,6 +138,7 @@ public ValidateOptionsResult Validate(string name, WagiModules options)
                     if (string.IsNullOrEmpty(route))
                     {
                         result.AppendLine($"Route should not be null or empty for bindle {bindleName}");
+                        return ValidateOptionsResult.Fail(result.ToString());
                     }
 
                     if (route.Contains("{", StringComparison.InvariantCulture) && route.Contains("}", StringComparison.InvariantCulture))