Skip to content

Type cleanup #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mwhelan merged 6 commits into from
Mar 20, 2014
Merged

Type cleanup #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3b7b94e
renamed ExecutionStep to Step & its StepTitle to Title
MehdiK Mar 20, 2014
81014f0
renamed StepExecutionResult to Result
MehdiK Mar 20, 2014
b41ccc6
Renamed StepAction in Step to Action
MehdiK Mar 20, 2014
bfce04c
moved RunStepWithArgs from root to StepScanners
MehdiK Mar 20, 2014
5914c67
renamed MetaData to Metadata everywhere
MehdiK Mar 20, 2014
5b94473
moved StoryMetadata to Scanners folder
MehdiK Mar 20, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Samples/TestStack.BDDfy.Samples/Atm/HtmlReportConfig.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public class HtmlReportConfig : DefaultHtmlReportConfiguration
{
public override bool RunsOn(Story story)
{
return story.MetaData.Type.Namespace != null && story.MetaData.Type.Namespace.EndsWith("Atm");
return story.Metadata.Type.Namespace != null && story.Metadata.Type.Namespace.EndsWith("Atm");
}

/// <summary>
Expand Down
6 changes: 3 additions & 3 deletions Samples/TestStack.BDDfy.Samples/CustomTextReporter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,14 @@ static CustomTextReporter()
public void Process(Story story)
{
// use this report only for tic tac toe stories
if (story.MetaData == null || !story.MetaData.Type.Name.Contains("TicTacToe"))
if (story.Metadata == null || !story.Metadata.Type.Name.Contains("TicTacToe"))
return;

var scenario = story.Scenarios.First();
var scenarioReport = new StringBuilder();
scenarioReport.AppendLine(string.Format(" SCENARIO: {0} ", scenario.Title));

if (scenario.Result != StepExecutionResult.Passed && scenario.Steps.Any(s => s.Exception != null))
if (scenario.Result != Result.Passed && scenario.Steps.Any(s => s.Exception != null))
{
scenarioReport.Append(string.Format(" {0} : ", scenario.Result));
scenarioReport.AppendLine(scenario.Steps.First(s => s.Result == scenario.Result).Exception.Message);
Expand All @@ -59,7 +59,7 @@ public void Process(Story story)
scenarioReport.AppendLine();

foreach (var step in scenario.Steps)
scenarioReport.AppendLine(string.Format(" [{1}] {0}", step.StepTitle, step.Result));
scenarioReport.AppendLine(string.Format(" [{1}] {0}", step.Title, step.Result));

scenarioReport.AppendLine("--------------------------------------------------------------------------------");
scenarioReport.AppendLine();
Expand Down
2 changes: 1 addition & 1 deletion TestStack.BDDfy.Tests/Configuration/ProcessorPipelineTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public void DoesNotReturnConsoleReportWhenItIsDeactivated()
[Test]
public void DoesNotReturnConsoleReportForExcludedStories()
{
Configurator.Processors.ConsoleReport.RunsOn(s => s.MetaData != null);
Configurator.Processors.ConsoleReport.RunsOn(s => s.Metadata != null);
var processors = Configurator.Processors.GetProcessors(new Story(null)).ToList();

Assert.IsFalse(processors.Any(p => p is ConsoleReporter));
Expand Down
20 changes: 10 additions & 10 deletions TestStack.BDDfy.Tests/Configuration/TestRunnerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,17 +76,17 @@ private static void Verify(Engine testRun)
{
Assert.Throws<Exception>(() => testRun.Run());
var scenario = testRun.Story.Scenarios.First();
Assert.AreEqual(StepExecutionResult.Failed, scenario.Result);
Assert.AreEqual(Result.Failed, scenario.Result);
var steps = scenario.Steps;

Assert.AreEqual(4, steps.Count);
Assert.AreEqual(StepExecutionResult.Passed, steps[0].Result);
Assert.AreEqual(Result.Passed, steps[0].Result);
Assert.AreEqual(ExecutionOrder.SetupState, steps[0].ExecutionOrder);
Assert.AreEqual(StepExecutionResult.Passed, steps[1].Result);
Assert.AreEqual(Result.Passed, steps[1].Result);
Assert.AreEqual(ExecutionOrder.Transition, steps[1].ExecutionOrder);
Assert.AreEqual(StepExecutionResult.Failed, steps[2].Result);
Assert.AreEqual(Result.Failed, steps[2].Result);
Assert.AreEqual(ExecutionOrder.Assertion, steps[2].ExecutionOrder);
Assert.AreEqual(StepExecutionResult.NotExecuted, steps[3].Result);
Assert.AreEqual(Result.NotExecuted, steps[3].Result);
Assert.AreEqual(ExecutionOrder.ConsecutiveAssertion, steps[3].ExecutionOrder);
}
}
Expand Down Expand Up @@ -118,17 +118,17 @@ private static void Verify(Engine testRun)
{
Assert.Throws<Exception>(() => testRun.Run());
var scenario = testRun.Story.Scenarios.First();
Assert.AreEqual(StepExecutionResult.Failed, scenario.Result);
Assert.AreEqual(Result.Failed, scenario.Result);
var steps = scenario.Steps;

Assert.AreEqual(4, steps.Count);
Assert.AreEqual(StepExecutionResult.Passed, steps[0].Result);
Assert.AreEqual(Result.Passed, steps[0].Result);
Assert.AreEqual(ExecutionOrder.SetupState, steps[0].ExecutionOrder);
Assert.AreEqual(StepExecutionResult.Passed, steps[1].Result);
Assert.AreEqual(Result.Passed, steps[1].Result);
Assert.AreEqual(ExecutionOrder.Transition, steps[1].ExecutionOrder);
Assert.AreEqual(StepExecutionResult.Failed, steps[2].Result);
Assert.AreEqual(Result.Failed, steps[2].Result);
Assert.AreEqual(ExecutionOrder.Assertion, steps[2].ExecutionOrder);
Assert.AreEqual(StepExecutionResult.Passed, steps[3].Result);
Assert.AreEqual(Result.Passed, steps[3].Result);
Assert.AreEqual(ExecutionOrder.ConsecutiveAssertion, steps[3].ExecutionOrder);
}
}
Expand Down
24 changes: 12 additions & 12 deletions TestStack.BDDfy.Tests/Exceptions/ExceptionThrowingTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,35 +86,35 @@ private void SetThrowingStep(ThrowingMethods methodToThrow)
}
}

private ExecutionStep GetStep(string stepTitle)
private Step GetStep(string stepTitle)
{
return _scenario.Steps.First(s => s.StepTitle == stepTitle);
return _scenario.Steps.First(s => s.Title == stepTitle);
}

ExecutionStep GivenStep
Step GivenStep
{
get
{
return GetStep("Given");
}
}

ExecutionStep WhenStep
Step WhenStep
{
get {
return GetStep("When");
}
}

ExecutionStep ThenStep
Step ThenStep
{
get
{
return GetStep("Then");
}
}

ExecutionStep TearDownStep
Step TearDownStep
{
get
{
Expand All @@ -134,30 +134,30 @@ Scenario Scenario

public void AssertTearDownMethodIsExecuted()
{
Assert.That(TearDownStep.Result, Is.EqualTo(StepExecutionResult.Passed));
Assert.That(TearDownStep.Result, Is.EqualTo(Result.Passed));
}

public void AssertGivenStepResult(StepExecutionResult result)
public void AssertGivenStepResult(Result result)
{
Assert.That(GivenStep.Result, Is.EqualTo(result));
}

public void AssertWhenStepResult(StepExecutionResult result)
public void AssertWhenStepResult(Result result)
{
Assert.That(WhenStep.Result, Is.EqualTo(result));
}

public void AssertThenStepResult(StepExecutionResult result)
public void AssertThenStepResult(Result result)
{
Assert.That(ThenStep.Result, Is.EqualTo(result));
}

public void AssertScenarioResult(StepExecutionResult result)
public void AssertScenarioResult(Result result)
{
Assert.That(Scenario.Result, Is.EqualTo(result));
}

public void AssertStoryResult(StepExecutionResult result)
public void AssertStoryResult(Result result)
{
Assert.That(Story.Result, Is.EqualTo(result));
}
Expand Down
20 changes: 10 additions & 10 deletions ....BDDfy.Tests/Exceptions/NotImplementedException/WhenGivenThrowsNotImplementedException.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,70 +18,70 @@ private void ExecuteUsingReflectingScanners()
public void GivenIsReportedAsNotImplementedWhenUsingReflectingScanners()
{
ExecuteUsingReflectingScanners();
Sut.AssertGivenStepResult(StepExecutionResult.NotImplemented);
Sut.AssertGivenStepResult(Result.NotImplemented);
}

[Test]
public void GivenIsReportedAsNotImplementedWhenUsingFluentScanners()
{
ExecuteUsingFluentScanner();
Sut.AssertGivenStepResult(StepExecutionResult.NotImplemented);
Sut.AssertGivenStepResult(Result.NotImplemented);
}

[Test]
public void WhenIsNotExecutedWhenUsingReflectingScanners()
{
ExecuteUsingReflectingScanners();
Sut.AssertWhenStepResult(StepExecutionResult.NotExecuted);
Sut.AssertWhenStepResult(Result.NotExecuted);
}

[Test]
public void WhenIsNotExecutedWhenUsingFluentScanners()
{
ExecuteUsingFluentScanner();
Sut.AssertWhenStepResult(StepExecutionResult.NotExecuted);
Sut.AssertWhenStepResult(Result.NotExecuted);
}

[Test]
public void ThenIsNotExecutedWhenUsingReflectingScanner()
{
ExecuteUsingReflectingScanners();
Sut.AssertThenStepResult(StepExecutionResult.NotExecuted);
Sut.AssertThenStepResult(Result.NotExecuted);
}

[Test]
public void ThenIsNotExecutedWhenUsingFluentScanner()
{
ExecuteUsingFluentScanner();
Sut.AssertThenStepResult(StepExecutionResult.NotExecuted);
Sut.AssertThenStepResult(Result.NotExecuted);
}

[Test]
public void ScenarioResultReturnsNotImplementedWhenUsingReflectingScanners()
{
ExecuteUsingReflectingScanners();
Sut.AssertScenarioResult(StepExecutionResult.NotImplemented);
Sut.AssertScenarioResult(Result.NotImplemented);
}

[Test]
public void ScenarioResultReturnsNotImplementedWhenUsingFluentScanner()
{
ExecuteUsingFluentScanner();
Sut.AssertScenarioResult(StepExecutionResult.NotImplemented);
Sut.AssertScenarioResult(Result.NotImplemented);
}

[Test]
public void StoryResultReturnsNotImplementedWhenUsingReflectingScanners()
{
ExecuteUsingReflectingScanners();
Sut.AssertStoryResult(StepExecutionResult.NotImplemented);
Sut.AssertStoryResult(Result.NotImplemented);
}

[Test]
public void StoryResultReturnsNotImplementedWhenUsingFluentScanner()
{
ExecuteUsingFluentScanner();
Sut.AssertStoryResult(StepExecutionResult.NotImplemented);
Sut.AssertStoryResult(Result.NotImplemented);
}

[Test]
Expand Down
20 changes: 10 additions & 10 deletions ...k.BDDfy.Tests/Exceptions/NotImplementedException/WhenThenThrowsNotImplementedException.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,35 +18,35 @@ private void ExecuteUsingFluentScanner()
public void GivenIsReportedAsSuccessfulWhenUsingReflectingScanners()
{
ExecuteUsingReflectingScanners();
Sut.AssertGivenStepResult(StepExecutionResult.Passed);
Sut.AssertGivenStepResult(Result.Passed);
}

[Test]
public void WhenIsReportedAsSuccessfulWhenUsingReflectingScanners()
{
ExecuteUsingReflectingScanners();
Sut.AssertWhenStepResult(StepExecutionResult.Passed);
Sut.AssertWhenStepResult(Result.Passed);
}

[Test]
public void ThenIsReportedAsNotImplemenetedWhenUsingReflectingScanners()
{
ExecuteUsingReflectingScanners();
Sut.AssertThenStepResult(StepExecutionResult.NotImplemented);
Sut.AssertThenStepResult(Result.NotImplemented);
}

[Test]
public void ScenarioResultReturnsNoImplementedWhenUsingReflectingScanners()
{
ExecuteUsingReflectingScanners();
Sut.AssertScenarioResult(StepExecutionResult.NotImplemented);
Sut.AssertScenarioResult(Result.NotImplemented);
}

[Test]
public void StoryResultReturnsNoImplementedWhenUsingReflectingScanners()
{
ExecuteUsingReflectingScanners();
Sut.AssertStoryResult(StepExecutionResult.NotImplemented);
Sut.AssertStoryResult(Result.NotImplemented);
}

[Test]
Expand All @@ -60,35 +60,35 @@ public void TearDownMethodIsExecutedWhenUsingReflectingScanners()
public void GivenIsReportedAsSuccessfulWhenUsingFluentScanner()
{
ExecuteUsingFluentScanner();
Sut.AssertGivenStepResult(StepExecutionResult.Passed);
Sut.AssertGivenStepResult(Result.Passed);
}

[Test]
public void WhenIsReportedAsSuccessfulWhenUsingFluentScanner()
{
ExecuteUsingFluentScanner();
Sut.AssertWhenStepResult(StepExecutionResult.Passed);
Sut.AssertWhenStepResult(Result.Passed);
}

[Test]
public void ThenIsReportedAsNotImplemenetedWhenUsingFluentScanner()
{
ExecuteUsingFluentScanner();
Sut.AssertThenStepResult(StepExecutionResult.NotImplemented);
Sut.AssertThenStepResult(Result.NotImplemented);
}

[Test]
public void ScenarioResultReturnsNoImplementedWhenUsingFluentScanner()
{
ExecuteUsingFluentScanner();
Sut.AssertScenarioResult(StepExecutionResult.NotImplemented);
Sut.AssertScenarioResult(Result.NotImplemented);
}

[Test]
public void StoryResultReturnsNoImplementedWhenUsingFluentScanner()
{
ExecuteUsingFluentScanner();
Sut.AssertStoryResult(StepExecutionResult.NotImplemented);
Sut.AssertStoryResult(Result.NotImplemented);
}

[Test]
Expand Down
Loading