Change namespace

Models to .Models Receivers to .Receivers Extensions to .Polyfills
SharpAdb · Oct 29, 2023 · 8fb4a3e · 8fb4a3e
1 parent 9dad0ef
commit 8fb4a3e
Show file tree

Hide file tree

Showing 131 changed files with 317 additions and 383 deletions.
diff --git a/AdvancedSharpAdbClient.Tests/AdbClientTests.Async.cs b/AdvancedSharpAdbClient.Tests/AdbClientTests.Async.cs
@@ -1,6 +1,4 @@
-using AdvancedSharpAdbClient.Exceptions;
-using AdvancedSharpAdbClient.Logs;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Imaging;

diff --git a/AdvancedSharpAdbClient.Tests/AdbClientTests.cs b/AdvancedSharpAdbClient.Tests/AdbClientTests.cs
@@ -1,6 +1,4 @@
-using AdvancedSharpAdbClient.Exceptions;
-using AdvancedSharpAdbClient.Logs;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Imaging;

diff --git a/AdvancedSharpAdbClient.Tests/AdbCommandLineClientTests.Async.cs b/AdvancedSharpAdbClient.Tests/AdbCommandLineClientTests.Async.cs
@@ -1,5 +1,4 @@
-using AdvancedSharpAdbClient.Exceptions;
-using System;
+using System;
 using Xunit;
 
 namespace AdvancedSharpAdbClient.Tests

diff --git a/AdvancedSharpAdbClient.Tests/AdbCommandLineClientTests.cs b/AdvancedSharpAdbClient.Tests/AdbCommandLineClientTests.cs
@@ -1,5 +1,4 @@
-using AdvancedSharpAdbClient.Exceptions;
-using System;
+using System;
 using Xunit;
 
 namespace AdvancedSharpAdbClient.Tests

diff --git a/AdvancedSharpAdbClient.Tests/AdbServerTests.Async.cs b/AdvancedSharpAdbClient.Tests/AdbServerTests.Async.cs
@@ -1,5 +1,4 @@
-using AdvancedSharpAdbClient.Exceptions;
-using NSubstitute;
+using NSubstitute;
 using NSubstitute.ExceptionExtensions;
 using System;
 using System.Net.Sockets;

diff --git a/AdvancedSharpAdbClient.Tests/AdbServerTests.cs b/AdvancedSharpAdbClient.Tests/AdbServerTests.cs
@@ -1,5 +1,4 @@
-using AdvancedSharpAdbClient.Exceptions;
-using NSubstitute;
+using NSubstitute;
 using System;
 using System.Net;
 using System.Net.Sockets;

diff --git a/AdvancedSharpAdbClient.Tests/AdbSocketTests.Async.cs b/AdvancedSharpAdbClient.Tests/AdbSocketTests.Async.cs
@@ -1,5 +1,4 @@
-using AdvancedSharpAdbClient.Exceptions;
-using System;
+using System;
 using System.IO;
 using System.Text;
 using System.Threading;

diff --git a/AdvancedSharpAdbClient.Tests/AdbSocketTests.cs b/AdvancedSharpAdbClient.Tests/AdbSocketTests.cs
@@ -1,5 +1,4 @@
-using AdvancedSharpAdbClient.Exceptions;
-using System;
+using System;
 using System.IO;
 using System.Text;
 using Xunit;

diff --git a/AdvancedSharpAdbClient.Tests/AdvancedSharpAdbClient.Tests.csproj b/AdvancedSharpAdbClient.Tests/AdvancedSharpAdbClient.Tests.csproj
@@ -24,55 +24,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Update="Assets\dumpscreen.txt">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="Assets\dumpscreen_clean.txt">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="Assets\dumpscreen_error.txt">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="Assets\dumpscreen_miui.txt">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="Assets\dumpscreen_miui_clean.txt">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="Assets\dumpsys_package.txt">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="Assets\framebuffer.bin">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="Assets\framebufferheader-empty.bin">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="Assets\framebufferheader-v1.bin">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="Assets\framebufferheader-v2.bin">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="Assets\framebufferheader.bin">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="Assets\fstab.bin">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="Assets\gapps.txt">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="Assets\logcat.bin">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="Assets\logcatevents.bin">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="Assets\test.txt">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="Assets\testapp.apk">
+    <None Update="Assets\**">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>

diff --git a/AdvancedSharpAdbClient.Tests/DeviceCommands/DeviceExtensionsTests.Async.cs b/AdvancedSharpAdbClient.Tests/DeviceCommands/DeviceExtensionsTests.Async.cs
@@ -1,5 +1,4 @@
-using AdvancedSharpAdbClient.Tests;
-using NSubstitute;
+using NSubstitute;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;

diff --git a/AdvancedSharpAdbClient.Tests/DeviceCommands/DeviceExtensionsTests.cs b/AdvancedSharpAdbClient.Tests/DeviceCommands/DeviceExtensionsTests.cs
@@ -1,5 +1,4 @@
-using AdvancedSharpAdbClient.Tests;
-using NSubstitute;
+using NSubstitute;
 using System.Collections.Generic;
 using System.Linq;
 using Xunit;

diff --git a/AdvancedSharpAdbClient.Tests/DeviceCommands/Models/AndroidProcessTests.cs b/AdvancedSharpAdbClient.Tests/DeviceCommands/Models/AndroidProcessTests.cs
@@ -7,7 +7,7 @@
 using System;
 using Xunit;
 
-namespace AdvancedSharpAdbClient.DeviceCommands.Tests
+namespace AdvancedSharpAdbClient.Models.DeviceCommands.Tests
 {
     /// <summary>
     /// Tests the <see cref="AndroidProcess"/> class.

diff --git a/AdvancedSharpAdbClient.Tests/DeviceCommands/Models/VersionInfoTests.cs b/AdvancedSharpAdbClient.Tests/DeviceCommands/Models/VersionInfoTests.cs
@@ -1,6 +1,6 @@
 using Xunit;
 
-namespace AdvancedSharpAdbClient.DeviceCommands.Tests
+namespace AdvancedSharpAdbClient.Models.DeviceCommands.Tests
 {
     /// <summary>
     /// Tests the <see cref="VersionInfo"/> class.

diff --git a/AdvancedSharpAdbClient.Tests/DeviceCommands/PackageManagerTests.Async.cs b/AdvancedSharpAdbClient.Tests/DeviceCommands/PackageManagerTests.Async.cs
@@ -1,5 +1,4 @@
-using AdvancedSharpAdbClient.Tests;
-using System.IO;
+using System.IO;
 using Xunit;
 
 namespace AdvancedSharpAdbClient.DeviceCommands.Tests

diff --git a/AdvancedSharpAdbClient.Tests/DeviceCommands/PackageManagerTests.cs b/AdvancedSharpAdbClient.Tests/DeviceCommands/PackageManagerTests.cs
@@ -1,5 +1,4 @@
-using AdvancedSharpAdbClient.Tests;
-using NSubstitute;
+using NSubstitute;
 using System;
 using System.IO;
 using Xunit;

diff --git a/AdvancedSharpAdbClient.Tests/DeviceCommands/Receivers/EnvironmentVariablesReceiverTests.cs b/AdvancedSharpAdbClient.Tests/DeviceCommands/Receivers/EnvironmentVariablesReceiverTests.cs
@@ -1,6 +1,6 @@
 using Xunit;
 
-namespace AdvancedSharpAdbClient.DeviceCommands.Tests
+namespace AdvancedSharpAdbClient.Receivers.DeviceCommands.Tests
 {
     /// <summary>
     /// Tests the <see cref="EnvironmentVariablesReceiver"/> class.

diff --git a/AdvancedSharpAdbClient.Tests/DeviceCommands/Receivers/GetPropReceiverTests.cs b/AdvancedSharpAdbClient.Tests/DeviceCommands/Receivers/GetPropReceiverTests.cs
@@ -1,8 +1,7 @@
-using AdvancedSharpAdbClient.Tests;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Xunit;
 
-namespace AdvancedSharpAdbClient.DeviceCommands.Tests
+namespace AdvancedSharpAdbClient.Receivers.DeviceCommands.Tests
 {
     public class GetPropReceiverTests
     {

diff --git a/AdvancedSharpAdbClient.Tests/DeviceCommands/Receivers/InstallOutputReceiverTests.cs b/AdvancedSharpAdbClient.Tests/DeviceCommands/Receivers/InstallOutputReceiverTests.cs
@@ -1,6 +1,6 @@
 using Xunit;
 
-namespace AdvancedSharpAdbClient.DeviceCommands.Tests
+namespace AdvancedSharpAdbClient.Receivers.DeviceCommands.Tests
 {
     public class InstallOutputReceiverTests
     {

diff --git a/AdvancedSharpAdbClient.Tests/DeviceCommands/Receivers/PackageManagerReceiverTests.cs b/AdvancedSharpAdbClient.Tests/DeviceCommands/Receivers/PackageManagerReceiverTests.cs
@@ -1,7 +1,6 @@
-using AdvancedSharpAdbClient.Tests;
-using Xunit;
+using Xunit;
 
-namespace AdvancedSharpAdbClient.DeviceCommands.Tests
+namespace AdvancedSharpAdbClient.Receivers.DeviceCommands.Tests
 {
     public class PackageManagerReceiverTests
     {

diff --git a/AdvancedSharpAdbClient.Tests/DeviceCommands/Receivers/ProcessOutputReceiverTests.cs b/AdvancedSharpAdbClient.Tests/DeviceCommands/Receivers/ProcessOutputReceiverTests.cs
@@ -1,6 +1,6 @@
 using Xunit;
 
-namespace AdvancedSharpAdbClient.DeviceCommands.Tests
+namespace AdvancedSharpAdbClient.Receivers.DeviceCommands.Tests
 {
     /// <summary>
     /// Tests the <see cref="ProcessOutputReceiver"/> class.

diff --git a/AdvancedSharpAdbClient.Tests/DeviceCommands/Receivers/VersionInfoReceiverTests.cs b/AdvancedSharpAdbClient.Tests/DeviceCommands/Receivers/VersionInfoReceiverTests.cs
@@ -8,7 +8,7 @@
 using System.IO;
 using Xunit;
 
-namespace AdvancedSharpAdbClient.DeviceCommands.Tests
+namespace AdvancedSharpAdbClient.Receivers.DeviceCommands.Tests
 {
     /// <summary>
     /// Tests the <see cref="VersionInfoReceiver"/> class.
@@ -31,11 +31,11 @@ public void GetVersionTest()
             Assert.Null(receiver.GetVersionCode(string.Empty));
             Assert.Null(receiver.GetVersionCode(" versionCode=10210targetSdk=18"));
 
-            Assert.Equal("4.7.1", (string)receiver.GetVersionName("    versionName=4.7.1"));
-            Assert.Null((string)receiver.GetVersionName(null));
-            Assert.Null((string)receiver.GetVersionName(" test"));
-            Assert.Null((string)receiver.GetVersionName("    versionName"));
-            Assert.Equal(string.Empty, (string)receiver.GetVersionName("    versionName="));
+            Assert.Equal("4.7.1", receiver.GetVersionName("    versionName=4.7.1"));
+            Assert.Null(receiver.GetVersionName(null));
+            Assert.Null(receiver.GetVersionName(" test"));
+            Assert.Null(receiver.GetVersionName("    versionName"));
+            Assert.Equal(string.Empty, receiver.GetVersionName("    versionName="));
 
             string dumpsys = string.Join(Environment.NewLine, File.ReadAllLines(@"Assets/dumpsys_package.txt"));
             receiver = new VersionInfoReceiver();

diff --git a/AdvancedSharpAdbClient.Tests/DeviceMonitorTests.cs b/AdvancedSharpAdbClient.Tests/DeviceMonitorTests.cs
@@ -1,5 +1,4 @@
-using AdvancedSharpAdbClient.Logs;
-using System;
+using System;
 using System.Linq;
 using System.Threading;
 using Xunit;

diff --git a/AdvancedSharpAdbClient.Tests/Dummys/DummyAdbClient.cs b/AdvancedSharpAdbClient.Tests/Dummys/DummyAdbClient.cs
@@ -1,5 +1,4 @@
-using AdvancedSharpAdbClient.Logs;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.IO;

diff --git a/AdvancedSharpAdbClient.Tests/Dummys/DummyAdbSocket.cs b/AdvancedSharpAdbClient.Tests/Dummys/DummyAdbSocket.cs
@@ -1,5 +1,4 @@
-using AdvancedSharpAdbClient.Exceptions;
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Net.Sockets;

diff --git a/AdvancedSharpAdbClient.Tests/Dummys/TracingAdbSocket.cs b/AdvancedSharpAdbClient.Tests/Dummys/TracingAdbSocket.cs
@@ -1,5 +1,4 @@
-using AdvancedSharpAdbClient.Exceptions;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;

diff --git a/...ests/Extensions/DateTimeExtensionTests.cs → ...sts/Extensions/DateTimeExtensionsTests.cs b/...ests/Extensions/DateTimeExtensionTests.cs → ...sts/Extensions/DateTimeExtensionsTests.cs
@@ -1,12 +1,12 @@
 using System;
 using Xunit;
 
-namespace AdvancedSharpAdbClient.Tests
+namespace AdvancedSharpAdbClient.Polyfills.Tests
 {
     /// <summary>
     /// Tests the <see cref="DateTimeExtensions"/> class.
     /// </summary>
-    public class DateTimeExtensionTests
+    public class DateTimeExtensionsTests
     {
         /// <summary>
         /// Tests the <see cref="DateTimeExtensions.FromUnixTimeSeconds(long)"/> method.

diff --git a/AdvancedSharpAdbClient.Tests/Extensions/EnumerableExtensionsTests.cs b/AdvancedSharpAdbClient.Tests/Extensions/EnumerableExtensionsTests.cs
@@ -0,0 +1,36 @@
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using Xunit;
+
+namespace AdvancedSharpAdbClient.Polyfills.Tests
+{
+    /// <summary>
+    /// Tests the <see cref="EnumerableExtensions"/> class.
+    /// </summary>
+    public class EnumerableExtensionsTests
+    {
+        /// <summary>
+        /// Tests the <see cref="EnumerableExtensions.AddRange{TSource}(ICollection{TSource}, IEnumerable{TSource})"/> method.
+        /// </summary>
+        [Fact]
+        public void AddRangeTest()
+        {
+            int[] numbs = [6, 7, 8, 9, 10];
+
+            List<int> list = [1, 2, 3, 4, 5];
+            list.AddRange(numbs);
+            Assert.Equal(10, list.Count);
+            Assert.Equal([1, 2, 3, 4, 5, 6, 7, 8, 9, 10], list);
+
+            HashSet<int> hashSet = [1, 2, 3, 4, 5];
+            hashSet.AddRange(numbs);
+            Assert.Equal(10, hashSet.Count);
+            Assert.Equal([1, 2, 3, 4, 5, 6, 7, 8, 9, 10], hashSet);
+
+            Collection<int> collection = [1, 2, 3, 4, 5];
+            collection.AddRange(numbs);
+            Assert.Equal(10, collection.Count);
+            Assert.Equal([1, 2, 3, 4, 5, 6, 7, 8, 9, 10], collection);
+        }
+    }
+}
diff --git a/AdvancedSharpAdbClient.Tests/Extensions/ExceptionExtensionsTests.cs b/AdvancedSharpAdbClient.Tests/Extensions/ExceptionExtensionsTests.cs
@@ -1,7 +1,7 @@
 using System;
 using Xunit;
 
-namespace AdvancedSharpAdbClient.Tests
+namespace AdvancedSharpAdbClient.Polyfills.Tests
 {
     /// <summary>
     /// Tests the <see cref="ExceptionExtensions"/> class.

diff --git a/AdvancedSharpAdbClient.Tests/Extensions/ExtensionsTests.cs b/AdvancedSharpAdbClient.Tests/Extensions/ExtensionsTests.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.Linq;
 using System.Threading.Tasks;
 using Xunit;
@@ -11,30 +10,6 @@ namespace AdvancedSharpAdbClient.Tests
     /// </summary>
     public class ExtensionsTests
     {
-        /// <summary>
-        /// Tests the <see cref="Extensions.AddRange{TSource}(ICollection{TSource}, IEnumerable{TSource})"/> method.
-        /// </summary>
-        [Fact]
-        public void AddRangeTest()
-        {
-            int[] numbs = [6, 7, 8, 9, 10];
-
-            List<int> list = [1, 2, 3, 4, 5];
-            list.AddRange(numbs);
-            Assert.Equal(10, list.Count);
-            Assert.Equal([1, 2, 3, 4, 5, 6, 7, 8, 9, 10], list);
-
-            HashSet<int> hashSet = [1, 2, 3, 4, 5];
-            hashSet.AddRange(numbs);
-            Assert.Equal(10, hashSet.Count);
-            Assert.Equal([1, 2, 3, 4, 5, 6, 7, 8, 9, 10], hashSet);
-
-            Collection<int> collection = [1, 2, 3, 4, 5];
-            collection.AddRange(numbs);
-            Assert.Equal(10, collection.Count);
-            Assert.Equal([1, 2, 3, 4, 5, 6, 7, 8, 9, 10], collection);
-        }
-
         [Fact]
         public async void TaskToArrayTest()
         {

diff --git a/AdvancedSharpAdbClient.Tests/Models/AdbResponseTests.cs b/AdvancedSharpAdbClient.Tests/Models/AdbResponseTests.cs
@@ -1,6 +1,6 @@
 using Xunit;
 
-namespace AdvancedSharpAdbClient.Tests
+namespace AdvancedSharpAdbClient.Models.Tests
 {
     /// <summary>
     /// Tests the <see cref="AdbResponse"/> class.

diff --git a/AdvancedSharpAdbClient.Tests/Models/AdbServerStatusTests.cs b/AdvancedSharpAdbClient.Tests/Models/AdbServerStatusTests.cs
@@ -1,7 +1,7 @@
 using System;
 using Xunit;
 
-namespace AdvancedSharpAdbClient.Tests
+namespace AdvancedSharpAdbClient.Models.Tests
 {
     /// <summary>
     /// Tests the <see cref="AdbServerStatus"/> class.

diff --git a/AdvancedSharpAdbClient.Tests/Models/DeviceDataTests.cs b/AdvancedSharpAdbClient.Tests/Models/DeviceDataTests.cs
@@ -1,7 +1,7 @@
 using System;
 using Xunit;
 
-namespace AdvancedSharpAdbClient.Tests
+namespace AdvancedSharpAdbClient.Models.Tests
 {
     /// <summary>
     /// Tests the <see cref="DeviceData"/> class.

diff --git a/AdvancedSharpAdbClient.Tests/Models/ForwardDataTests.cs b/AdvancedSharpAdbClient.Tests/Models/ForwardDataTests.cs
@@ -1,6 +1,6 @@
 using Xunit;
 
-namespace AdvancedSharpAdbClient.Tests
+namespace AdvancedSharpAdbClient.Models.Tests
 {
     /// <summary>
     /// Tests the <see cref="ForwardData"/> class.

diff --git a/AdvancedSharpAdbClient.Tests/Models/ForwardSpecTests.cs b/AdvancedSharpAdbClient.Tests/Models/ForwardSpecTests.cs
@@ -1,7 +1,7 @@
 using System;
 using Xunit;
 
-namespace AdvancedSharpAdbClient.Tests
+namespace AdvancedSharpAdbClient.Models.Tests
 {
     /// <summary>
     /// Tests the <see cref="ForwardSpec"/> class.