NUnit V2

Merge lp:~a-schlapsi/nunitv2/bug-432805 into lp:~nunit-core/nunitv2/trunk-before-upgrade

  1. bug-432805
  2. Merge into trunk-before-upgrade
Proposed by Andreas Schlapsi
Status: Merged
Merge reported by: Andreas Schlapsi
Merged at revision: not available
Proposed branch: lp:~a-schlapsi/nunitv2/bug-432805
Merge into: lp:~nunit-core/nunitv2/trunk-before-upgrade
Diff against target: 111 lines
4 files modified
src/GuiException/UiException/Properties/Resources.resx (+8/-8)
src/GuiException/UiException/nunit.uiexception.build (+2/-2)
src/NUnitFramework/framework/Constraints/PathConstraints.cs (+3/-2)
src/NUnitFramework/tests/Constraints/MsgUtilTests.cs (+12/-0)
To merge this branch: bzr merge lp:~a-schlapsi/nunitv2/bug-432805
Reviewer Review Type Date Requested Status
Charlie Poole Approve
Review via email: mp+12393@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Andreas Schlapsi (a-schlapsi) wrote :

I fixed two bugs in this branch:

* Bug #432573: Some Framework Tests don't run on Linux
* Bug #432573: Mono test should be at runtime

Revision history for this message
Charlie Poole (charlie.poole) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/GuiException/UiException/Properties/Resources.resx'
2--- src/GuiException/UiException/Properties/Resources.resx 2009-04-03 16:57:02 +0000
3+++ src/GuiException/UiException/Properties/Resources.resx 2009-09-24 23:35:19 +0000
4@@ -119,24 +119,24 @@
5 </resheader>
6 <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
7 <data name="ImageCopyToClipboard" type="System.Resources.ResXFileRef, System.Windows.Forms">
8- <value>..\..\..\..\src\GuiException\UIException\Resources\ImageCopyToClipboard.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
9+ <value>../../../../src/GuiException/UiException/Resources/ImageCopyToClipboard.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
10 </data>
11 <data name="ImageErrorBrowserHeader" type="System.Resources.ResXFileRef, System.Windows.Forms">
12- <value>..\..\..\..\src\GuiException\UIException\Resources\ImageErrorBrowserHeader.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
13+ <value>../../../../src/GuiException/UiException/Resources/ImageErrorBrowserHeader.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
14 </data>
15 <data name="ImageErrorList" type="System.Resources.ResXFileRef, System.Windows.Forms">
16- <value>..\..\..\..\src\GuiException\UIException\Resources\ImageErrorList.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
17+ <value>../../../../src/GuiException/UiException/Resources/ImageErrorList.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
18 </data>
19 <data name="ImageReverseItemOrder" type="System.Resources.ResXFileRef, System.Windows.Forms">
20- <value>..\..\..\..\src\GuiException\UIException\Resources\ImageReverseItemOrder.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
21+ <value>../../../../src/GuiException/UiException/Resources/ImageReverseItemOrder.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
22 </data>
23 <data name="ImageSourceCodeDisplay" type="System.Resources.ResXFileRef, System.Windows.Forms">
24- <value>..\..\..\..\src\GuiException\UIException\Resources\ImageSourceCodeDisplay.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
25+ <value>../../../../src/GuiException/UiException/Resources/ImageSourceCodeDisplay.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
26 </data>
27 <data name="ImageSplitterBox" type="System.Resources.ResXFileRef, System.Windows.Forms">
28- <value>..\..\..\..\src\GuiException\UIException\Resources\ImageSplitterBox.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
29+ <value>../../../../src/GuiException/UiException/Resources/ImageSplitterBox.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
30 </data>
31 <data name="ImageStackTraceDisplay" type="System.Resources.ResXFileRef, System.Windows.Forms">
32- <value>..\..\..\..\src\GuiException\UIException\Resources\ImageStackTraceDisplay.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
33+ <value>../../../../src/GuiException/UiException/Resources/ImageStackTraceDisplay.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
34 </data>
35-</root>
36\ No newline at end of file
37+</root>
38
39=== modified file 'src/GuiException/UiException/nunit.uiexception.build'
40--- src/GuiException/UiException/nunit.uiexception.build 2009-04-22 01:21:06 +0000
41+++ src/GuiException/UiException/nunit.uiexception.build 2009-09-24 23:35:19 +0000
42@@ -2,7 +2,7 @@
43 <project name="NUnitUiException" default="build" basedir=".">
44
45 <patternset id="source-files">
46- <include name="Properties/Resources.designer.cs"/>
47+ <include name="Properties/Resources.Designer.cs"/>
48 <include name="CodeFormatters/CodeFormatterCollection.cs"/>
49 <include name="CodeFormatters/GeneralCodeFormatter.cs"/>
50 <include name="CodeFormatters/ICodeFormatter.cs"/>
51@@ -91,4 +91,4 @@
52 </copy>
53 </target>
54
55-</project>
56\ No newline at end of file
57+</project>
58
59=== modified file 'src/NUnitFramework/framework/Constraints/PathConstraints.cs'
60--- src/NUnitFramework/framework/Constraints/PathConstraints.cs 2009-04-18 21:11:18 +0000
61+++ src/NUnitFramework/framework/Constraints/PathConstraints.cs 2009-09-24 23:35:19 +0000
62@@ -17,6 +17,8 @@
63 /// </summary>
64 public abstract class PathConstraint : Constraint
65 {
66+ private static readonly char[] DirectorySeparatorChars = new char[] { '\\', '/' };
67+
68 /// <summary>
69 /// The expected path used in the constraint
70 /// </summary>
71@@ -70,8 +72,7 @@
72 /// <returns>The path in standardized form</returns>
73 protected string Canonicalize( string path )
74 {
75- ArrayList parts = new ArrayList(
76- path.Split( Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar ) );
77+ ArrayList parts = new ArrayList( path.Split( DirectorySeparatorChars ) );
78
79 for( int index = 0; index < parts.Count; )
80 {
81
82=== modified file 'src/NUnitFramework/tests/Constraints/MsgUtilTests.cs'
83--- src/NUnitFramework/tests/Constraints/MsgUtilTests.cs 2009-07-09 01:34:33 +0000
84+++ src/NUnitFramework/tests/Constraints/MsgUtilTests.cs 2009-09-24 23:35:19 +0000
85@@ -28,7 +28,11 @@
86 [TestCase("\t", "\\t")]
87 [TestCase("\t\n", "\\t\\n")]
88 [TestCase("\\r\\n", "\\\\r\\\\n")]
89+#if !MONO
90 [TestCase("\0", "\\0")]
91+#endif
92+ // TODO: Figure out why this fails in Mono
93+ //[TestCase("\0", "\\0")]
94 [TestCase("\a", "\\a")]
95 [TestCase("\b", "\\b")]
96 [TestCase("\f", "\\f")]
97@@ -42,6 +46,14 @@
98 Assert.AreEqual( expected, MsgUtils.EscapeControlChars(input) );
99 }
100
101+#if MONO
102+ [Test]
103+ public void EscapeNullCharInString()
104+ {
105+ Assert.That(MsgUtils.EscapeControlChars("\0"), Is.EqualTo("\\0"));
106+ }
107+#endif
108+
109 private const string s52 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
110
111 [TestCase(s52, 52, 0, s52, TestName="NoClippingNeeded")]

Subscribers

People subscribed via source and target branches