Refactor

oldbit-com · May 30, 2024 · a924397 · a924397
1 parent b8b2a3b
commit a924397
Show file tree

Hide file tree

Showing 11 changed files with 33 additions and 16 deletions.
diff --git a/src/Beeper/AudioPlayer.cs b/src/Beeper/AudioPlayer.cs
@@ -1,5 +1,5 @@
-using OldBit.Beeper.IO;
 using OldBit.Beeper.MacOS;
+using OldBit.Beeper.Readers;
 using OldBit.Beeper.Windows;
 
 namespace OldBit.Beeper;

diff --git a/src/Beeper/Beeper.csproj b/src/Beeper/Beeper.csproj
@@ -15,4 +15,8 @@
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     </PropertyGroup>
 
+    <ItemGroup>
+        <InternalsVisibleTo Include="OldBit.Beeper.UnitTests" />
+    </ItemGroup>
+
 </Project>
diff --git a/src/Beeper/IAudioPlayer.cs b/src/Beeper/IAudioPlayer.cs
@@ -1,5 +1,5 @@
 using OldBit.Beeper.Helpers;
-using OldBit.Beeper.IO;
+using OldBit.Beeper.Readers;
 
 namespace OldBit.Beeper;
 

diff --git a/src/Beeper/MacOS/AudioQueuePlayer.cs b/src/Beeper/MacOS/AudioQueuePlayer.cs
@@ -2,8 +2,8 @@
 using System.Runtime.Versioning;
 using System.Threading.Channels;
 using OldBit.Beeper.Helpers;
-using OldBit.Beeper.IO;
 using OldBit.Beeper.MacOS.AudioToolboxInterop;
+using OldBit.Beeper.Readers;
 
 namespace OldBit.Beeper.MacOS;
 

diff --git a/src/Beeper/IO/ByteStream.cs → src/Beeper/Readers/ByteStream.cs b/src/Beeper/IO/ByteStream.cs → src/Beeper/Readers/ByteStream.cs
@@ -1,4 +1,4 @@
-namespace OldBit.Beeper.IO;
+namespace OldBit.Beeper.Readers;
 
 /// <summary>
 /// The ByteStream class allows reading enumeration of bytes as a stream.

diff --git a/src/Beeper/IO/PcmDataReader.cs → src/Beeper/Readers/PcmDataReader.cs b/src/Beeper/IO/PcmDataReader.cs → src/Beeper/Readers/PcmDataReader.cs
@@ -1,7 +1,6 @@
 using OldBit.Beeper.Extensions;
-using OldBit.Beeper.Helpers;
 
-namespace OldBit.Beeper.IO;
+namespace OldBit.Beeper.Readers;
 
 /// <summary>
 /// Reads PCM audio data from a stream. It converts the data to a float array.

diff --git a/src/Beeper/Windows/WasapiPlayer.cs b/src/Beeper/Windows/WasapiPlayer.cs
@@ -1,5 +1,5 @@
 using System.Runtime.Versioning;
-using OldBit.Beeper.IO;
+using OldBit.Beeper.Readers;
 using OldBit.Beeper.Windows.WasapiInterop;
 using OldBit.Beeper.Windows.WasapiInterop.Enums;
 

diff --git a/tests/Beeper.UnitTests/Beeper.UnitTests.csproj b/tests/Beeper.UnitTests/Beeper.UnitTests.csproj
@@ -12,6 +12,7 @@
     </PropertyGroup>
 
     <ItemGroup>
+        <PackageReference Include="FluentAssertions" Version="6.12.0" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0"/>
         <PackageReference Include="xunit" Version="2.4.2"/>
         <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">

diff --git a/tests/Beeper.UnitTests/FloatTypeTests.cs → ...eeper.UnitTests/Helpers/FloatTypeTests.cs b/tests/Beeper.UnitTests/FloatTypeTests.cs → ...eeper.UnitTests/Helpers/FloatTypeTests.cs
@@ -1,7 +1,7 @@
+using FluentAssertions;
 using OldBit.Beeper.Extensions;
-using OldBit.Beeper.Helpers;
 
-namespace OldBit.Beeper.UnitTests;
+namespace OldBit.Beeper.UnitTests.Helpers;
 
 public class FloatTypeTests
 {
@@ -13,6 +13,6 @@ public void GetByteSize_ShouldReturnCorrectNumberOfBytes(AudioFormat audioFormat
     {
         var numberOfBytes = audioFormat.GetByteSize();
 
-        Assert.Equal(expectedBytes, numberOfBytes);
+        numberOfBytes.Should().Be(expectedBytes);
     }
 }
diff --git a/tests/Beeper.UnitTests/PcmDataConverterTests.cs b/tests/Beeper.UnitTests/PcmDataConverterTests.cs
diff --git a/tests/Beeper.UnitTests/Readers/ByteStreamTests.cs b/tests/Beeper.UnitTests/Readers/ByteStreamTests.cs
@@ -0,0 +1,19 @@
+using FluentAssertions;
+using OldBit.Beeper.Readers;
+
+namespace OldBit.Beeper.UnitTests.Readers;
+
+public class ByteStreamTests
+{
+    [Fact]
+    public void Read_ShouldReturnCorrectNumberOfBytes()
+    {
+        var data = Enumerable.Range(0, 100).Select(i => (byte)i).ToArray();
+        using var stream = new ByteStream(data);
+        var buffer = new byte[200];
+
+        var bytesRead = stream.Read(buffer, 0, buffer.Length);
+
+        bytesRead.Should().Be(data.Length);
+    }
+}