make notes_test_server a bit nicer

jamespharaoh · Apr 7, 2012 · d4da7a6 · d4da7a6
1 parent 62d8f26
commit d4da7a6
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 12 deletions.
diff --git a/test/misc/notes_openid_test.erl b/test/misc/notes_openid_test.erl
@@ -28,9 +28,13 @@ prepare_test () ->
 					"session id",
 					"open id url",
 					true },
+				em:any (),
 				em:any () ],
 
-			{ return, ok }),
+			{ function,
+				fun ([ _Message, _From, State ]) ->
+					{ reply, ok, State }
+					end }),
 
 	?REPLAY,
 
@@ -66,9 +70,13 @@ verify_test () ->
 					"session id",
 					"return to",
 					Params },
+				em:any (),
 				em:any () ],
 
-			{ return, ok }),
+			{ function,
+				fun ([ _Message, _From, State ]) ->
+					{ reply, ok, State }
+					end }),
 
 	?REPLAY,
 

diff --git a/test/misc/notes_server_test.erl b/test/misc/notes_server_test.erl
@@ -20,13 +20,22 @@ call_new_process_test () ->
 	?EXPECT,
 
 		em:strict (Em, ?STUB, handle_call,
-			[ Message, em:any () ],
-			{ return, ok }),
+
+			[	Message,
+				em:any (),
+				em:any () ],
+
+			{	function,
+				fun ([ _Message, _From, State ]) ->
+					{ reply, ok, State }
+					end }),
 
 	?REPLAY,
 
 		?assertEqual (
+
 			ok,
+
 			?TARGET:call (
 				?SERVER,
 				?STUB,
@@ -49,13 +58,22 @@ call_existing_process_test () ->
 	?EXPECT,
 
 		em:strict (Em, ?STUB, handle_call,
-			[ Message, em:any () ],
-			{ return, ok }),
+
+			[	Message,
+				em:any (),
+				em:any () ],
+
+			{	function,
+				fun ([ _Message, _From, State ]) ->
+					{ reply, ok, State }
+					end }),
 
 	?REPLAY,
 
 		?assertEqual (
+
 			ok,
+
 			?TARGET:call (
 				?SERVER,
 				?STUB,

diff --git a/test/misc/notes_test_server.erl b/test/misc/notes_test_server.erl
@@ -46,12 +46,7 @@ handle_call (stop, _From, Target) ->
 
 handle_call (Request, From, Target) ->
 
-	case Target:handle_call (Request, From) of
-
-		ok ->
-			{ reply, ok, Target }
-
-	end.
+	Target:handle_call (Request, From, Target).
 
 handle_cast (Message, Target) ->