Skip to content

Commit e0c4ce6

Browse files
committed
Resolve tests conflicts
1 parent 0ab8b35 commit e0c4ce6

File tree

4 files changed

+19
-19
lines changed

4 files changed

+19
-19
lines changed

CodingSeb.ExpressionEvaluator.Tests/ExpressionEvaluatorScriptEvaluateTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1541,7 +1541,7 @@ public static IEnumerable<TestCaseData> TestCasesForScriptEvaluateTests
15411541
.SetCategory("new Exception must not throw the exception")
15421542
.Returns(3);
15431543

1544-
yield return new TestCaseData(Resources.Script0102, null, null, null, null)
1544+
yield return new TestCaseData(Resources.Script0105, null, null, null, null)
15451545
.SetCategory("Script")
15461546
.SetCategory("variable with prefix 'test'")
15471547
.SetCategory("new function test")

CodingSeb.ExpressionEvaluator.Tests/Resources.Designer.cs

Lines changed: 14 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

CodingSeb.ExpressionEvaluator.Tests/Resources.resx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -337,13 +337,13 @@
337337
<data name="Script0101" type="System.Resources.ResXFileRef, System.Windows.Forms">
338338
<value>resources\script0101.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
339339
</data>
340-
<data name="Script0102" type="System.Resources.ResXFileRef, System.Windows.Forms">
341-
<value>resources\script0102.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
342-
</data>
343340
<data name="Script0103" type="System.Resources.ResXFileRef, System.Windows.Forms">
344341
<value>resources\script0103.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
345342
</data>
346343
<data name="Script0104" type="System.Resources.ResXFileRef, System.Windows.Forms">
347344
<value>resources\script0104.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
348345
</data>
346+
<data name="Script0105" type="System.Resources.ResXFileRef, System.Windows.Forms">
347+
<value>resources\script0105.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
348+
</data>
349349
</root>

CodingSeb.ExpressionEvaluator.Tests/Resources/Script0102.txt renamed to CodingSeb.ExpressionEvaluator.Tests/Resources/Script0105.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Script0102*/
1+
/* Script0105*/
22
var newList = new(List<string>);
33

44
newList.Add("hello");

0 commit comments

Comments
 (0)