Address PR feedback: fix bounds checking, use localized strings, refactor test

Co-authored-by: rzikm <[email protected]>

Author: Copilot

src/libraries/System.IO.Compression/src/Resources/Strings.resx

@@ -296,4 +296,7 @@
   <data name="InvalidOffsetToZip64EOCD" xml:space="preserve">
     <value>Invalid offset to the Zip64 End of Central Directory record.</value>
   </data>
+  <data name="IO_SeekBeforeBegin" xml:space="preserve">
+    <value>An attempt was made to move the position before the beginning of the stream.</value>
+  </data>
 </root>

src/libraries/System.IO.Compression/src/System/IO/Compression/ZipCustomStreams.cs

@@ -263,7 +263,6 @@ public override long Position
                     throw new NotSupportedException(SR.SeekingNotSupported);
 
                 ArgumentOutOfRangeException.ThrowIfNegative(value);
-                ArgumentOutOfRangeException.ThrowIfGreaterThan(value, _endInSuperStream - _startInSuperStream);
 
                 _positionInSuperStream = _startInSuperStream + value;
             }
@@ -385,10 +384,7 @@ public override long Seek(long offset, SeekOrigin origin)
             };
 
             if (newPositionInSuperStream < _startInSuperStream)
-                throw new IOException("An attempt was made to move the position before the beginning of the stream.");
-
-            if (newPositionInSuperStream > _endInSuperStream)
-                throw new IOException("An attempt was made to move the position beyond the end of the stream.");
+                throw new IOException(SR.IO_SeekBeforeBegin);
 
             _positionInSuperStream = newPositionInSuperStream;
 

src/libraries/System.IO.Compression/tests/ZipArchive/zip_ReadTests.cs

@@ -92,6 +92,17 @@ public static IEnumerable<object[]> Get_TestPartialReads_Data()
             }
         }
 
+        public static IEnumerable<object[]> Get_BooleanCombinations_Data()
+        {
+            foreach (bool async in _bools)
+            {
+                foreach (bool useSeekMethod in _bools)
+                {
+                    yield return new object[] { async, useSeekMethod };
+                }
+            }
+        }
+
         [Theory]
         [MemberData(nameof(Get_TestPartialReads_Data))]
         public static async Task TestPartialReads(string zipFile, string zipFolder, bool async)
@@ -667,8 +678,8 @@ public static async Task ReadStreamSeekOps(bool async)
         }
 
         [Theory]
-        [MemberData(nameof(Get_Booleans_Data))]
-        public static async Task ReadEntryContentTwice(bool async)
+        [MemberData(nameof(Get_BooleanCombinations_Data))]
+        public static async Task ReadEntryContentTwice(bool async, bool useSeekMethod)
         {
             // Create a ZIP archive with stored (uncompressed) entries to test reading content twice
             using (var ms = new MemoryStream())
@@ -697,17 +708,24 @@ public static async Task ReadEntryContentTwice(bool async)
                         // For stored entries, SubReadStream should be seekable when underlying stream is seekable
                         Assert.True(s.CanSeek, $"SubReadStream should be seekable for stored entry '{e.FullName}' when underlying stream is seekable");
 
-                        // Test 1: Read content using Seek method
+                        // Read content first time
                         byte[] firstRead = new byte[e.Length];
                         int bytesRead1 = s.Read(firstRead, 0, (int)e.Length);
                         Assert.Equal(e.Length, bytesRead1);
 
-                        // Seek back to beginning using Seek method
-                        long pos = s.Seek(0, SeekOrigin.Begin);
-                        Assert.Equal(0, pos);
+                        // Rewind to beginning using specified method
+                        if (useSeekMethod)
+                        {
+                            long pos = s.Seek(0, SeekOrigin.Begin);
+                            Assert.Equal(0, pos);
+                        }
+                        else
+                        {
+                            s.Position = 0;
+                        }
                         Assert.Equal(0, s.Position);
 
-                        // Read again using Seek method reset
+                        // Read content second time
                         byte[] secondRead = new byte[e.Length];
                         int bytesRead2 = s.Read(secondRead, 0, (int)e.Length);
                         Assert.Equal(e.Length, bytesRead2);
@@ -717,38 +735,12 @@ public static async Task ReadEntryContentTwice(bool async)
                         Assert.Equal(testData, firstRead);
                         Assert.Equal(testData, secondRead);
 
-                        // Test 2: Read content using Position setter
-                        s.Position = 0;
-                        byte[] thirdRead = new byte[e.Length];
-                        int bytesRead3 = s.Read(thirdRead, 0, (int)e.Length);
-                        Assert.Equal(e.Length, bytesRead3);
-
-                        // Reset using Position setter
-                        s.Position = 0;
-                        Assert.Equal(0, s.Position);
-
-                        // Read again using Position setter reset
-                        byte[] fourthRead = new byte[e.Length];
-                        int bytesRead4 = s.Read(fourthRead, 0, (int)e.Length);
-                        Assert.Equal(e.Length, bytesRead4);
-
-                        // Compare the content - should be identical
-                        Assert.Equal(thirdRead, fourthRead);
-                        Assert.Equal(testData, thirdRead);
-                        Assert.Equal(testData, fourthRead);
-
-                        // All reads should be identical
-                        Assert.Equal(firstRead, thirdRead);
-                        Assert.Equal(secondRead, fourthRead);
-
                         await DisposeStream(async, s);
                     }
                 }
             }
         }
 
-
-
         private static byte[] ReverseCentralDirectoryEntries(byte[] zipFile)
         {
             byte[] destinationBuffer = new byte[zipFile.Length];