adding test for exception in handler

sweetlandj · Jun 23, 2015 · 21a361d · 21a361d
1 parent cdd93fa
commit 21a361d
Show file tree

Hide file tree

Showing 14 changed files with 113 additions and 28 deletions.
diff --git a/RailsSharp.Example/App/TestCtrl.js b/RailsSharp.Example/App/TestCtrl.js
diff --git a/RailsSharp.Example/App/TestCtrl.js.map b/RailsSharp.Example/App/TestCtrl.js.map
diff --git a/RailsSharp.Example/App/TestCtrl.ts b/RailsSharp.Example/App/TestCtrl.ts
@@ -1,20 +1,16 @@
 interface ITestScope extends ng.IScope {
 	testState: TestState;
 	inititeSingleRequestAndResponseTest(): void;
-}
-
-class Status {
-	static Unknown = 'Unknown';
-	static Success = 'Success';
+	inititeRequestThatResultsInErrorTest(): void;
 }
 
 class TestState {
 	constructor() {
-		this.singleRequestAndResponse = Status.Unknown;
+		this.singleRequestAndResponse = false;
+		this.requestThatResultsInError = false;
 	}
-
-	singleRequestAndResponse: Status;
-
+	singleRequestAndResponse: boolean;
+	requestThatResultsInError: boolean;
 }
 
 // ReSharper disable once InconsistentNaming
@@ -27,9 +23,24 @@ function TestCtrl($scope: ITestScope, eventRegistry: jMess.IEventRegistry) {
 
 	eventRegistry.hook(TestEvents.TestSingleResponse,(reply: TestSingleResponse) => {
 		$scope.$apply(() => {
-			$scope.testState.singleRequestAndResponse = Status.Success;	
+			$scope.testState.singleRequestAndResponse = true;
 		});
 	});
+
+	var errorTestRunning = false;
+	$scope.inititeRequestThatResultsInErrorTest = () => {
+		errorTestRunning = true;
+		eventRegistry.raise(TestEvents.TestFailedRequest, {});
+	}
+
+	eventRegistry.hook(ServerEvents.OnError,(error) => {
+		$scope.$apply(() => {
+			if (errorTestRunning) {
+				$scope.testState.requestThatResultsInError = true;
+			}
+		});
+	});
+
 }
 
 TestCtrl.$inject = ['$scope', 'eventRegistry'];
diff --git a/RailsSharp.Example/App/TypeScriptEvents.js b/RailsSharp.Example/App/TypeScriptEvents.js
diff --git a/RailsSharp.Example/App/TypeScriptEvents.js.map b/RailsSharp.Example/App/TypeScriptEvents.js.map
diff --git a/RailsSharp.Example/App/TypeScriptEvents.ts b/RailsSharp.Example/App/TypeScriptEvents.ts
@@ -1,5 +1,7 @@
 
 
+	declare class TestFailedRequest {
+			}
 	declare class TestSingleRequest {
 			}
 	declare class TestSingleResponse {
@@ -10,6 +12,22 @@
 		static TestSingleRequest : string = 'TestTestSingleRequest';
 
 		static TestSingleResponse : string = 'TestTestSingleResponse';
+
+		static TestFailedRequest : string = 'TestTestFailedRequest';
+
+		static TestFailedResponse : string = 'TestTestFailedResponse';
+
+		static TestSingleLegacyRequest : string = 'TestTestSingleLegacyRequest';
+
+		static TestSingleLegacyResponse : string = 'TestTestSingleLegacyResponse';
+
+		static TestDoubleARequest : string = 'TestTestDoubleARequest';
+
+		static TestDoubleAResponse : string = 'TestTestDoubleAResponse';
+
+		static TestDoubleBRequest : string = 'TestTestDoubleBRequest';
+
+		static TestDoubleBResponse : string = 'TestTestDoubleBResponse';
 			}
 
 var ServerEvents = {

diff --git a/RailsSharp.Example/App_Start/HandlerConfig.cs b/RailsSharp.Example/App_Start/HandlerConfig.cs
@@ -8,6 +8,7 @@ public class HandlerConfig
 		public static void RegisterHandlers(IHandlerRepository repository)
 		{
 			repository.AddHandler<TestSingleHandler>(TestEvents.TestSingleRequest);
+			repository.AddHandler<TestFailedHandler>(TestEvents.TestFailedRequest);
 		}
 	}
 }
diff --git a/RailsSharp.Example/RailsSharp.Example.csproj b/RailsSharp.Example/RailsSharp.Example.csproj
@@ -213,6 +213,8 @@
     <Compile Include="Startup.cs" />
     <Compile Include="Test\AnyoneIsAllowedHandlerBase.cs" />
     <Compile Include="Test\TestEvents.cs" />
+    <Compile Include="Test\TestFailedHandler.cs" />
+    <Compile Include="Test\TestFailedRequest.cs" />
     <Compile Include="Test\TestSingleHandler.cs" />
     <Compile Include="Test\TestSingleRequest.cs" />
     <Compile Include="Test\TestSingleResponse.cs" />

diff --git a/RailsSharp.Example/Test/AnyoneIsAllowedHandlerBase.cs b/RailsSharp.Example/Test/AnyoneIsAllowedHandlerBase.cs
@@ -3,9 +3,9 @@
 
 namespace RailsSharp.Example.Test
 {
-	public abstract class AnyoneIsAllowedHandlerBase : HandlerBase<TestSingleRequest, IPrincipal>
+	public abstract class AnyoneIsAllowedHandlerBase<TRequest> : HandlerBase<TRequest, IPrincipal> where TRequest : RequestBase
 	{
-		protected override bool IsAuthorized(TestSingleRequest request, IPrincipal principal)
+		protected override bool IsAuthorized(TRequest request, IPrincipal principal)
 		{
 			return true;
 		}

diff --git a/RailsSharp.Example/Test/TestEvents.cs b/RailsSharp.Example/Test/TestEvents.cs
@@ -4,5 +4,13 @@ public enum TestEvents
 	{
 		TestSingleRequest,
 		TestSingleResponse,
+		TestFailedRequest,
+		TestFailedResponse,
+		TestSingleLegacyRequest,
+		TestSingleLegacyResponse,
+		TestDoubleARequest,
+		TestDoubleAResponse,
+		TestDoubleBRequest,
+		TestDoubleBResponse,
 	}
 }
diff --git a/RailsSharp.Example/Test/TestFailedHandler.cs b/RailsSharp.Example/Test/TestFailedHandler.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Security.Principal;
+
+namespace RailsSharp.Example.Test
+{
+	public class TestFailedHandler : AnyoneIsAllowedHandlerBase<TestFailedRequest>
+	{
+		protected override void Invoke(TestFailedRequest request, IPrincipal principal)
+		{
+			throw new Exception();
+		}
+	}
+}
diff --git a/RailsSharp.Example/Test/TestFailedRequest.cs b/RailsSharp.Example/Test/TestFailedRequest.cs
@@ -0,0 +1,8 @@
+using LAN.Core.Eventing;
+
+namespace RailsSharp.Example.Test
+{
+	public class TestFailedRequest : RequestBase
+	{
+	}
+}
diff --git a/RailsSharp.Example/Test/TestSingleHandler.cs b/RailsSharp.Example/Test/TestSingleHandler.cs
@@ -3,7 +3,7 @@
 
 namespace RailsSharp.Example.Test
 {
-	public class TestSingleHandler : AnyoneIsAllowedHandlerBase
+	public class TestSingleHandler : AnyoneIsAllowedHandlerBase<TestSingleRequest>
 	{
 		private readonly IMessagingContext _messagingContext;
 

diff --git a/RailsSharp.Example/Views/Home/Test.cshtml b/RailsSharp.Example/Views/Home/Test.cshtml
@@ -7,10 +7,20 @@
 	<h3>Request/Response</h3>
 	<button class="btn btn-primary" ng-click="inititeSingleRequestAndResponseTest()">Send Request Expecting Single Reply to client.</button>
 	Result: <span class="glyphicon" ng-class="{
-				  'glyphicon-cog': testState.singleRequestAndResponse === 'Unknown',
-				  'text-warning': testState.singleRequestAndResponse === 'Unknown',
-				  'glyphicon-check': testState.singleRequestAndResponse === 'Success',
-				  'text-success': testState.singleRequestAndResponse === 'Success'}"></span>
+				  'glyphicon-cog': !testState.singleRequestAndResponse,
+				  'text-warning': !testState.singleRequestAndResponse,
+				  'glyphicon-check': testState.singleRequestAndResponse,
+				  'text-success': testState.singleRequestAndResponse}"></span>
+
+	<br />
+	<br />
+
+	<button class="btn btn-primary" ng-click="inititeRequestThatResultsInErrorTest()">Send Request Expecting unhandled exception to get returned to client.</button>
+	Result: <span class="glyphicon" ng-class="{
+				  'glyphicon-cog': !testState.requestThatResultsInError,
+				  'text-warning': !testState.requestThatResultsInError,
+				  'glyphicon-check': testState.requestThatResultsInError,
+				  'text-success': testState.requestThatResultsInError}"></span>
 
 	@* todo: test: group membership to stalwart group *@