Refactor Android model extraction and clean up tests

Refactored TryExtractAndroidModel in UserAgentHelpers.cs for clarity by extracting helper methods and modularizing logic. Improved code style in ChunkedStreamTests.cs by clarifying arithmetic expressions. Removed unused IPv6 test code from IpAddressHelpersTests.cs. No changes to core logic or behavior.

Author: bvdcode

Sources/EasyExtensions.Tests/ChunkedStreamTests.cs

@@ -59,7 +59,7 @@ public void GetChunks_FinalChunkIsSmaller_WhenLengthNotMultipleOfChunkSize()
             {
                 Assert.That(chunks[0].Length, Is.EqualTo(chunkSize));
                 Assert.That(chunks[1].Length, Is.EqualTo(chunkSize));
-                Assert.That(chunks[2].Length, Is.EqualTo(totalSize - 2 * chunkSize));
+                Assert.That(chunks[2].Length, Is.EqualTo(totalSize - (2 * chunkSize)));
             }
 
             // Verify content of last chunk (do not dispose before reading)
@@ -211,7 +211,7 @@ public void GetChunks_ReturnsConsistentChunkSizes_ForLargeStreams()
         {
             // Arrange: create stream larger than typical buffer sizes
             var chunkSize = 8 * 1024 * 1024; // 8 MB
-            var totalSize = chunkSize * 5 + chunkSize / 2; // 5.5 chunks
+            var totalSize = (chunkSize * 5) + (chunkSize / 2); // 5.5 chunks
             var data = new byte[totalSize];
             new Random(1234).NextBytes(data);
             using var baseStream = new MemoryStream(data);

Sources/EasyExtensions.Tests/IpAddressHelpersTests.cs

@@ -135,11 +135,7 @@ public void GetMaskAddress_WithInvalidSubnetMask_ThrowsArgumentOutOfRangeExcepti
             Assert.Throws<ArgumentOutOfRangeException>(() => IpAddressHelpers.GetMaskAddress(invalidSubnetMask, AddressFamily.InterNetwork));
         }
 
-
-
         // IPv6 tests
-
-
         [Test]
         public void ConvertIpV6ToNumber_ValidInput_ValidOutput()
         {
@@ -149,11 +145,9 @@ public void ConvertIpV6ToNumber_ValidInput_ValidOutput()
             Assert.That(actual, Is.EqualTo(expected));
         }
 
-
         // 2607:fb90:7328:47bf:3dfe:3f80:a256:8f65
         // network: 2607:fb90:7300::/40
         // broadcast: 2607:fb90:73ff:ffff:ffff:ffff:ffff:ffff
-
         [Test]
         public void GetNetworkV6Address_ValidInput_ValidOutput()
         {
@@ -296,7 +290,6 @@ public void CalculateV4_WithValidInput_ValidOutput()
             forceParsed = IpAddressHelpers.IpToNumber(broadcastAddress);
             Assert.That(forceParsed, Is.EqualTo(expectedBroadcast));
 
-
             var subnet = IpAddressHelpers.ExtractMask(network);
             Assert.That(subnet?.ToString(), Is.EqualTo("255.255.252.0"));
             var actualNetwork = iPAddress.GetNetwork(subnet!).ToNumber();

Sources/EasyExtensions/Helpers/UserAgentHelpers.cs

@@ -236,6 +236,47 @@ private static UserAgentDeviceType ResolveSamsungType(string samsungModelCode)
             return UserAgentDeviceType.SamsungPhone;
         }
 
+        private static string[]? TryGetParenthesesParts(string ua)
+        {
+            var p = Regex.Match(ua, @"\(([^)]*)\)");
+            return p.Success ? p.Groups[1].Value.Split(';') : null;
+        }
+
+        private static bool HasTabletToken(string[] parts)
+        {
+            foreach (var part in parts)
+            {
+                if (part.Trim().Equals("tablet", StringComparison.OrdinalIgnoreCase))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        private static bool IsAndroidToken(string token)
+        {
+            return token.StartsWith("Android", StringComparison.OrdinalIgnoreCase);
+        }
+
+        private static bool IsNoiseModelToken(string token, bool hasTabletToken)
+        {
+            if (string.IsNullOrWhiteSpace(token))
+            {
+                return true;
+            }
+
+            if (token.Equals("wv", StringComparison.OrdinalIgnoreCase)
+                || token.Equals("mobile", StringComparison.OrdinalIgnoreCase)
+                || token.Equals("tablet", StringComparison.OrdinalIgnoreCase))
+            {
+                return true;
+            }
+
+            return hasTabletToken && token.StartsWith("rv:", StringComparison.OrdinalIgnoreCase);
+        }
+
         private static string? TryExtractAndroidModel(string ua)
         {
             // Pattern 1: ...; <model> Build/...
@@ -247,40 +288,25 @@ private static UserAgentDeviceType ResolveSamsungType(string samsungModelCode)
             }
 
             // Pattern 2: (Linux; Android 13; SM-G981B)  => take token after Android version
-            var p = Regex.Match(ua, @"\(([^)]*)\)");
-            if (!p.Success) return null;
-
-            var parts = p.Groups[1].Value.Split(';');
-            var hasTabletToken = false;
-            for (var k = 0; k < parts.Length; k++)
+            var parts = TryGetParenthesesParts(ua);
+            if (parts == null)
             {
-                if (parts[k].Trim().Equals("tablet", StringComparison.OrdinalIgnoreCase))
-                {
-                    hasTabletToken = true;
-                    break;
-                }
+                return null;
             }
 
+            var hasTabletToken = HasTabletToken(parts);
             for (var i = 0; i < parts.Length; i++)
             {
                 var token = parts[i].Trim();
-                if (!token.StartsWith("Android", StringComparison.OrdinalIgnoreCase)) continue;
+                if (!IsAndroidToken(token))
+                {
+                    continue;
+                }
 
                 for (var j = i + 1; j < parts.Length; j++)
                 {
                     var cand = parts[j].Trim();
-                    if (string.IsNullOrWhiteSpace(cand)) continue;
-
-                    // ignore common noise tokens
-                    if (cand.Equals("wv", StringComparison.OrdinalIgnoreCase)
-                        || cand.Equals("mobile", StringComparison.OrdinalIgnoreCase)
-                        || cand.Equals("tablet", StringComparison.OrdinalIgnoreCase))
-                    {
-                        continue;
-                    }
-
-                    // If this UA explicitly says "Tablet", then tokens like "rv:102.0" are not a device model.
-                    if (hasTabletToken && cand.StartsWith("rv:", StringComparison.OrdinalIgnoreCase))
+                    if (IsNoiseModelToken(cand, hasTabletToken))
                     {
                         continue;
                     }
@@ -291,6 +317,7 @@ private static UserAgentDeviceType ResolveSamsungType(string samsungModelCode)
 
                 return null;
             }
+
             return null;
         }