Skip to content

Commit 1b3b135

Browse files
author
Jake Ginnivan
committed
Fixing review feedback
1 parent cf0991a commit 1b3b135

5 files changed

Lines changed: 14 additions & 16 deletions

File tree

TestStack.BDDfy.Tests/Scanner/FluentScanner/FluentWithExamples.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public void ExampleTypeMismatch()
4545
})
4646
.BDDfy());
4747

48-
ex.Message.ShouldBe("Wrong type: System.Object cannot be assigned to Int32");
48+
ex.Message.ShouldBe("System.Object cannot be assigned to Int32 (Column: 'Wrong type', Row: 1)");
4949
}
5050

5151
private void AndIUseA(string multiWordHeading)

TestStack.BDDfy/Scanners/StepScanners/StepScannerExtensions.cs renamed to TestStack.BDDfy/Scanners/StepScanners/ArgumentCleaningExtensions.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33

44
namespace TestStack.BDDfy
55
{
6-
internal static class StepScannerExtensions
6+
internal static class ArgumentCleaningExtensions
77
{
88
internal static object[] FlattenArrays(this object[] inputs)
99
{
10-
return inputs.Select(FlattenArrays).ToArray();
10+
return inputs.Select(FlattenArray).ToArray();
1111
}
1212

13-
public static object FlattenArrays(this object input)
13+
public static object FlattenArray(this object input)
1414
{
1515
var inputArray = input as Array;
1616
if (inputArray != null)

TestStack.BDDfy/Scanners/StepScanners/Examples/ExampleValue.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,10 @@ public object GetValue(Type targetType)
5858
}
5959
catch (InvalidCastException ex)
6060
{
61-
throw new UnassignableExampleException(string.Format("{0}: {1} cannot be assigned to {2}", Header, _underlyingValue == null ? "<null>" : _underlyingValue.ToString(), targetType.Name), ex);
61+
throw new UnassignableExampleException(string.Format(
62+
"{0} cannot be assigned to {1} (Column: '{2}', Row: {3})",
63+
_underlyingValue == null ? "<null>" : _underlyingValue.ToString(),
64+
targetType.Name, Header, Row), ex, this);
6265
}
6366
}
6467

@@ -71,7 +74,7 @@ public override string ToString()
7174

7275
public string GetValueAsString()
7376
{
74-
return _underlyingValue.FlattenArrays().ToString();
77+
return _underlyingValue.FlattenArray().ToString();
7578
}
7679
}
7780
}

TestStack.BDDfy/Scanners/StepScanners/Examples/UnassignableExampleException.cs

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,17 @@ namespace TestStack.BDDfy
66
[Serializable]
77
public class UnassignableExampleException : Exception
88
{
9-
public UnassignableExampleException()
10-
{
11-
}
12-
13-
public UnassignableExampleException(string message) : base(message)
14-
{
15-
}
16-
17-
public UnassignableExampleException(string message, Exception inner) : base(message, inner)
9+
public UnassignableExampleException(string message, Exception inner, ExampleValue exampleValue) : base(message, inner)
1810
{
11+
ExampleValue = exampleValue;
1912
}
2013

2114
protected UnassignableExampleException(
2215
SerializationInfo info,
2316
StreamingContext context) : base(info, context)
2417
{
2518
}
19+
20+
public ExampleValue ExampleValue { get; private set; }
2621
}
2722
}

TestStack.BDDfy/TestStack.BDDfy.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@
162162
<Compile Include="Scanners\StepScanners\MethodName\MethodNameMatcher.cs" />
163163
<Compile Include="Scanners\StepScanners\MethodName\MethodNameStepScanner.cs" />
164164
<Compile Include="Scanners\StepScanners\StepActionFactory.cs" />
165-
<Compile Include="Scanners\StepScanners\StepScannerExtensions.cs" />
165+
<Compile Include="Scanners\StepScanners\ArgumentCleaningExtensions.cs" />
166166
<Compile Include="Scanners\StepScanners\StepTitleException.cs" />
167167
<Compile Include="Scanners\StoryAttributeMetadataScanner.cs" />
168168
<Compile Include="StoryNarrativeAttribute.cs" />

0 commit comments

Comments
 (0)