huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

port aspnet/WebSockets#149 (#301)

This commit is contained in:
Andrew Stanton-Nurse 2017-03-15 15:45:06 -07:00 committed by GitHub
parent d48663da2a
commit 77e763a516
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
test/Microsoft.AspNetCore.WebSockets.Internal.ConformanceTest/Autobahn/AutobahnExpectations.cs
View File

@ -22,7 +22,6 @@ namespace Microsoft.AspNetCore.WebSockets.Internal.ConformanceTest.Autobahn
public AutobahnExpectations Fail(params string[] caseSpecs) => Expect(Expectation.Fail, caseSpecs); public AutobahnExpectations Fail(params string[] caseSpecs) => Expect(Expectation.Fail, caseSpecs);
public AutobahnExpectations NonStrict(params string[] caseSpecs) => Expect(Expectation.NonStrict, caseSpecs); public AutobahnExpectations NonStrict(params string[] caseSpecs) => Expect(Expectation.NonStrict, caseSpecs);
public AutobahnExpectations OkOrNonStrict(params string[] caseSpecs) => Expect(Expectation.OkOrNonStrict, caseSpecs);
public AutobahnExpectations OkOrFail(params string[] caseSpecs) => Expect(Expectation.OkOrFail, caseSpecs); public AutobahnExpectations OkOrFail(params string[] caseSpecs) => Expect(Expectation.OkOrFail, caseSpecs);
public AutobahnExpectations Expect(Expectation expectation, params string[] caseSpecs) public AutobahnExpectations Expect(Expectation expectation, params string[] caseSpecs)
@ -62,21 +61,15 @@ namespace Microsoft.AspNetCore.WebSockets.Internal.ConformanceTest.Autobahn
} }
break; break;
case Expectation.Ok: case Expectation.Ok:
if (!caseResult.BehaviorIs("OK"))
{
failures.AppendLine($"Case {serverResult.Name}:{caseResult.Name}. Expected 'OK', but got '{caseResult.ActualBehavior}'");
}
break;
case Expectation.OkOrNonStrict:
if (!caseResult.BehaviorIs("NON-STRICT") && !caseResult.BehaviorIs("OK")) if (!caseResult.BehaviorIs("NON-STRICT") && !caseResult.BehaviorIs("OK"))
{ {
failures.AppendLine($"Case {serverResult.Name}:{caseResult.Name}. Expected 'NON-STRICT' or 'OK', but got '{caseResult.ActualBehavior}'"); failures.AppendLine($"Case {serverResult.Name}:{caseResult.Name}. Expected 'NON-STRICT' or 'OK', but got '{caseResult.ActualBehavior}'");
} }
break; break;
case Expectation.OkOrFail: case Expectation.OkOrFail:
if (!caseResult.BehaviorIs("FAILED") && !caseResult.BehaviorIs("OK")) if (!caseResult.BehaviorIs("NON-STRICT") && !caseResult.BehaviorIs("FAILED") && !caseResult.BehaviorIs("OK"))
{ {
failures.AppendLine($"Case {serverResult.Name}:{caseResult.Name}. Expected 'FAILED' or 'OK', but got '{caseResult.ActualBehavior}'"); failures.AppendLine($"Case {serverResult.Name}:{caseResult.Name}. Expected 'FAILED', 'NON-STRICT' or 'OK', but got '{caseResult.ActualBehavior}'");
} }
break; break;
default: default:
@ -86,4 +79,4 @@ namespace Microsoft.AspNetCore.WebSockets.Internal.ConformanceTest.Autobahn
} }
} }
} }
} }

5
test/Microsoft.AspNetCore.WebSockets.Internal.ConformanceTest/Autobahn/Expectation.cs
View File

@ -8,7 +8,6 @@ namespace Microsoft.AspNetCore.WebSockets.Internal.ConformanceTest.Autobahn
Fail, Fail,
NonStrict, NonStrict,
OkOrFail, OkOrFail,
Ok, Ok
OkOrNonStrict
} }
} }