Skip to content

Commit 8cfc65d

Browse files
networkfusionnetworkfusion
authored
Fix Project and update tests (#34)
***NO_CI***
1 parent 9d1aab5 commit 8cfc65d

File tree

18 files changed

+139
-136
lines changed

18 files changed

+139
-136
lines changed

‎System.IO.Streams/System.IO.Streams.nfproj‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@
4949
<ItemGroup>
5050
<None Include="packages.config" />
5151
</ItemGroup>
52+
<ItemGroup>
53+
<Content Include="packages.lock.json" />
54+
</ItemGroup>
5255
<ItemGroup>
5356
<Reference Include="mscorlib, Version=1.12.0.4, Culture=neutral, PublicKeyToken=c07d481e9758c731">
5457
<HintPath>..\packages\nanoFramework.CoreLibrary.1.12.0\lib\mscorlib.dll</HintPath>
@@ -73,4 +76,4 @@
7376
<Error Condition="!Exists('..\packages\Nerdbank.GitVersioning.3.5.119\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Nerdbank.GitVersioning.3.5.119\build\Nerdbank.GitVersioning.targets'))" />
7477
</Target>
7578
<Import Project="..\packages\Nerdbank.GitVersioning.3.5.119\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\packages\Nerdbank.GitVersioning.3.5.119\build\Nerdbank.GitVersioning.targets')" />
76-
</Project>
79+
</Project>

‎UnitTests/MemoryStreamUnitTests/CanRead.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
using System;
99
using System.IO;
1010

11-
namespace Sytem.IO.MemoryStreamUnitTests
11+
namespace System.IO.MemoryStreamUnitTests
1212
{
1313
[TestClass]
1414
public class CanRead
@@ -23,7 +23,7 @@ public void CanRead_Default_Ctor()
2323

2424
using (MemoryStream fs = new MemoryStream())
2525
{
26-
Assert.True(fs.CanRead, "Expected CanRead == true, but got CanRead == false");
26+
Assert.IsTrue(fs.CanRead, "Expected CanRead == true, but got CanRead == false");
2727
}
2828
}
2929
catch (Exception ex)
@@ -43,7 +43,7 @@ public void CanRead_Byte_Ctor()
4343

4444
using (MemoryStream fs = new MemoryStream(buffer))
4545
{
46-
Assert.True(fs.CanRead, "Expected CanRead == true, but got CanRead == false");
46+
Assert.IsTrue(fs.CanRead, "Expected CanRead == true, but got CanRead == false");
4747
}
4848
}
4949
catch (Exception ex)

‎UnitTests/MemoryStreamUnitTests/CanSeek.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
using System;
99
using System.IO;
1010

11-
namespace Sytem.IO.MemoryStreamUnitTests
11+
namespace System.IO.MemoryStreamUnitTests
1212
{
1313
[TestClass]
1414
public class CanSeek
@@ -22,7 +22,7 @@ public void CanSeek_Default_Ctor()
2222

2323
using (MemoryStream fs = new MemoryStream())
2424
{
25-
Assert.True(fs.CanSeek, "Expected CanSeek == true, but got CanSeek == false");
25+
Assert.IsTrue(fs.CanSeek, "Expected CanSeek == true, but got CanSeek == false");
2626
}
2727
}
2828
catch (Exception ex)
@@ -42,7 +42,7 @@ public void CanSeek_Byte_Ctor()
4242

4343
using (MemoryStream fs = new MemoryStream(buffer))
4444
{
45-
Assert.True(fs.CanSeek, "Expected CanSeek == true, but got CanSeek == false");
45+
Assert.IsTrue(fs.CanSeek, "Expected CanSeek == true, but got CanSeek == false");
4646
}
4747
}
4848
catch (Exception ex)

‎UnitTests/MemoryStreamUnitTests/CanWrite.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
using System;
99
using System.IO;
1010

11-
namespace Sytem.IO.MemoryStreamUnitTests
11+
namespace System.IO.MemoryStreamUnitTests
1212
{
1313
[TestClass]
1414
public class CanWrite
@@ -23,7 +23,7 @@ public void CanWrite_Default_Ctor()
2323

2424
using (MemoryStream fs = new MemoryStream())
2525
{
26-
Assert.True(fs.CanWrite, "Expected CanWrite == true, but got CanWrite == false");
26+
Assert.IsTrue(fs.CanWrite, "Expected CanWrite == true, but got CanWrite == false");
2727
}
2828
}
2929
catch (Exception ex)
@@ -43,7 +43,7 @@ public void CanWrite_Byte_Ctor()
4343

4444
using (MemoryStream fs = new MemoryStream(buffer))
4545
{
46-
Assert.True(fs.CanWrite, "Expected CanWrite == true, but got CanWrite == false");
46+
Assert.IsTrue(fs.CanWrite, "Expected CanWrite == true, but got CanWrite == false");
4747
}
4848
}
4949
catch (Exception ex)

‎UnitTests/MemoryStreamUnitTests/Close.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
using System;
99
using System.IO;
1010

11-
namespace Sytem.IO.MemoryStreamUnitTests
11+
namespace System.IO.MemoryStreamUnitTests
1212
{
1313
[TestClass]
1414
public class Close
@@ -26,7 +26,7 @@ public void VerifyClose()
2626
OutputHelper.WriteLine("Close stream");
2727
ms.Close();
2828

29-
Assert.Throws(typeof(ObjectDisposedException),
29+
Assert.ThrowsException(typeof(ObjectDisposedException),
3030
() =>
3131
{
3232
OutputHelper.WriteLine("Verify actually closed by writing to it");

‎UnitTests/MemoryStreamUnitTests/Flush.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
using System;
99
using System.IO;
1010

11-
namespace Sytem.IO.MemoryStreamUnitTests
11+
namespace System.IO.MemoryStreamUnitTests
1212
{
1313
[TestClass]
1414
public class Flush
@@ -25,7 +25,7 @@ public void VerifyFlush()
2525
ms.Write(data, 0, data.Length);
2626
ms.Flush();
2727

28-
Assert.Equal(ms.Length, 5000, $"Expected 5000 bytes, but got {ms.Length}");
28+
Assert.AreEqual(ms.Length, 5000, $"Expected 5000 bytes, but got {ms.Length}");
2929
}
3030
}
3131
catch (Exception ex)

‎UnitTests/MemoryStreamUnitTests/Length.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
using System;
99
using System.IO;
1010

11-
namespace Sytem.IO.MemoryStreamUnitTests
11+
namespace System.IO.MemoryStreamUnitTests
1212
{
1313
[TestClass]
1414
public class Length
@@ -51,7 +51,7 @@ public void ObjectDisposed()
5151

5252
long length = 0;
5353

54-
Assert.Throws(typeof(ObjectDisposedException),
54+
Assert.ThrowsException(typeof(ObjectDisposedException),
5555
() =>
5656
{
5757
length = ms.Length;
@@ -74,32 +74,32 @@ public void LengthTests()
7474
OutputHelper.WriteLine("Set initial length to 50, and position to 50");
7575
ms.SetLength(50);
7676
ms.Position = 50;
77-
Assert.True(TestLength(ms, 50));
77+
Assert.IsTrue(TestLength(ms, 50));
7878

7979
OutputHelper.WriteLine("Write 'foo bar'");
8080

8181
StreamWriter sw = new StreamWriter(ms);
8282
sw.Write("foo bar");
8383
sw.Flush();
84-
Assert.True(TestLength(ms, 57));
84+
Assert.IsTrue(TestLength(ms, 57));
8585

8686
OutputHelper.WriteLine("Shorten Length to 30");
8787
ms.SetLength(30);
88-
Assert.True(TestLength(ms, 30));
88+
Assert.IsTrue(TestLength(ms, 30));
8989

9090
OutputHelper.WriteLine("Verify position was adjusted");
91-
Assert.True(TestPosition(ms, 30));
91+
Assert.IsTrue(TestPosition(ms, 30));
9292

9393
OutputHelper.WriteLine("Extend length to 100");
9494
ms.SetLength(100);
95-
Assert.True(TestLength(ms, 100));
95+
Assert.IsTrue(TestLength(ms, 100));
9696
}
9797

9898
OutputHelper.WriteLine("Verify memorystream is 0 bytes after close");
9999

100100
using (MemoryStream ms = new MemoryStream())
101101
{
102-
Assert.True(TestLength(ms, 0));
102+
Assert.IsTrue(TestLength(ms, 0));
103103
}
104104
}
105105
catch (Exception ex)

‎UnitTests/MemoryStreamUnitTests/MemoryStreamHelper.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
using System;
99
using System.IO;
1010

11-
namespace Sytem.IO.MemoryStreamUnitTests
11+
namespace System.IO.MemoryStreamUnitTests
1212
{
1313
public class MemoryStreamHelper
1414
{

‎UnitTests/MemoryStreamUnitTests/MemoryStream_Ctor.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
using System;
99
using System.IO;
1010

11-
namespace Sytem.IO.MemoryStreamUnitTests
11+
namespace System.IO.MemoryStreamUnitTests
1212
{
1313
[TestClass]
1414
public class MemoryStream_Ctor
@@ -18,7 +18,7 @@ public class MemoryStream_Ctor
1818
[TestMethod]
1919
public void InvalidArguments()
2020
{
21-
Assert.Throws(
21+
Assert.ThrowsException(
2222
typeof(ArgumentNullException), () =>
2323
{
2424
OutputHelper.WriteLine("null buffer");
@@ -35,7 +35,7 @@ public void Valid_Default_Ctor()
3535
{
3636
using (MemoryStream ms = new MemoryStream())
3737
{
38-
Assert.True(ValidateMemoryStream(ms, 0), "Failed to ValidateMemoryStream");
38+
Assert.IsTrue(ValidateMemoryStream(ms, 0), "Failed to ValidateMemoryStream");
3939
}
4040
}
4141
catch (Exception ex)
@@ -58,11 +58,11 @@ public void Variable_Buffer_Ctor()
5858

5959
using (MemoryStream ms = new MemoryStream(buffer))
6060
{
61-
Assert.True(ValidateMemoryStream(ms, i), "Failed to ValidateMemoryStream");
61+
Assert.IsTrue(ValidateMemoryStream(ms, i), "Failed to ValidateMemoryStream");
6262

6363
OutputHelper.WriteLine("Try to extend beyond buffer length");
6464

65-
Assert.Throws(typeof(NotSupportedException),
65+
Assert.ThrowsException(typeof(NotSupportedException),
6666
() =>
6767
{
6868
ms.SetLength(i + 1);
@@ -85,7 +85,7 @@ public void Variable_Buffer_Ctor()
8585

8686
using (MemoryStream ms = new MemoryStream(largeBuffer))
8787
{
88-
Assert.True(ValidateMemoryStream(ms, largeBuffer.Length), "Failed to ValidateMemoryStream");
88+
Assert.IsTrue(ValidateMemoryStream(ms, largeBuffer.Length), "Failed to ValidateMemoryStream");
8989
}
9090
}
9191
catch (Exception ex)

‎UnitTests/MemoryStreamUnitTests/Position.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
using System;
99
using System.IO;
1010

11-
namespace Sytem.IO.MemoryStreamUnitTests
11+
namespace System.IO.MemoryStreamUnitTests
1212
{
1313
[TestClass]
1414
public class Position
@@ -92,7 +92,7 @@ public void InvalidRange()
9292
{
9393
OutputHelper.WriteLine("Try -1 postion");
9494

95-
Assert.Throws(typeof(ArgumentOutOfRangeException),
95+
Assert.ThrowsException(typeof(ArgumentOutOfRangeException),
9696
() =>
9797
{
9898
ms.Position = -1;
@@ -101,7 +101,7 @@ public void InvalidRange()
101101

102102
OutputHelper.WriteLine("Try Long.MinValue postion");
103103

104-
Assert.Throws(typeof(ArgumentOutOfRangeException),
104+
Assert.ThrowsException(typeof(ArgumentOutOfRangeException),
105105
() =>
106106
{
107107
ms.Position = long.MinValue;
@@ -126,7 +126,7 @@ public void GetSetStaticBuffer()
126126

127127
using (MemoryStream ms = new MemoryStream(buffer))
128128
{
129-
Assert.True(GetSetPosition(ms, buffer.Length));
129+
Assert.IsTrue(GetSetPosition(ms, buffer.Length));
130130
}
131131
}
132132
catch (Exception ex)
@@ -144,7 +144,7 @@ public void GetSetDynamicBuffer()
144144

145145
using (MemoryStream ms = new MemoryStream())
146146
{
147-
Assert.True(GetSetPosition(ms, 1000));
147+
Assert.IsTrue(GetSetPosition(ms, 1000));
148148
}
149149
}
150150
catch (Exception ex)

0 commit comments

Comments
 (0)