[System.IO.Compression.FileSystem] Switch tests to use embedded test resources

7 files changed, 15 insertions, 5 deletions

diff --git a/mcs/class/System.IO.Compression.FileSystem/Makefile b/mcs/class/System.IO.Compression.FileSystem/Makefile
index c66c602fd91..73fb0a1faec 100644
--- a/mcs/class/System.IO.Compression.FileSystem/Makefile
+++ b/mcs/class/System.IO.Compression.FileSystem/Makefile
@@ -6,7 +6,14 @@ LIBRARY = System.IO.Compression.FileSystem.dll
 LIB_REFS = System System.IO.Compression
 KEYFILE = ../ecma.pub
 LIB_MCS_FLAGS = -unsafe -nowarn:436
-TEST_MCS_FLAGS =
+
+TEST_RESOURCE_FILES = \
+	Test/resources/foo/foo.txt \
+	Test/resources/foo/bar.txt \
+	Test/resources/foo/foobar/foo.txt \
+	Test/resources/foo/foobar/bar.txt
+
+TEST_MCS_FLAGS = $(foreach r, $(TEST_RESOURCE_FILES), -resource:$(r),$(r))
 TEST_LIB_REFS = System System.Core System.IO.Compression
 LIBRARY_WARN_AS_ERROR = yes
 
diff --git a/mcs/class/System.IO.Compression.FileSystem/System.IO.Compression.FileSystem_test.dll.sources b/mcs/class/System.IO.Compression.FileSystem/System.IO.Compression.FileSystem_test.dll.sources
index dc67ea0cf1c..8e32b6ea22e 100644
--- a/mcs/class/System.IO.Compression.FileSystem/System.IO.Compression.FileSystem_test.dll.sources
+++ b/mcs/class/System.IO.Compression.FileSystem/System.IO.Compression.FileSystem_test.dll.sources
@@ -1 +1,2 @@
+../../test-helpers/TestResourceHelper.cs
 System.IO.Compression.FileSystem/ZipTest.cs
diff --git a/mcs/class/System.IO.Compression.FileSystem/Test/System.IO.Compression.FileSystem/ZipTest.cs b/mcs/class/System.IO.Compression.FileSystem/Test/System.IO.Compression.FileSystem/ZipTest.cs
index ea6c65d4c77..d55d5c9ae4b 100644
--- a/mcs/class/System.IO.Compression.FileSystem/Test/System.IO.Compression.FileSystem/ZipTest.cs
+++ b/mcs/class/System.IO.Compression.FileSystem/Test/System.IO.Compression.FileSystem/ZipTest.cs
@@ -31,6 +31,8 @@ using System.Linq;
 using System.Security.Cryptography;
 using NUnit.Framework;
 
+using MonoTests.Helpers;
+
 namespace MonoTests.System.IO.Compression.FileSystem
 {
 	[TestFixture]
@@ -55,7 +57,7 @@ namespace MonoTests.System.IO.Compression.FileSystem
 			if (File.Exists (tmpFile))
 				File.Delete (tmpFile);
 
-			ZipFile.CreateFromDirectory ("foo", tmpFile);
+			ZipFile.CreateFromDirectory (TestResourceHelper.GetFullPathOfResource ("Test/resources/foo"), tmpFile);
 			Assert.IsTrue(File.Exists(tmpFile));
 
 			using (var archive = new ZipArchive (File.Open (tmpFile, FileMode.Open),
@@ -75,7 +77,7 @@ namespace MonoTests.System.IO.Compression.FileSystem
 			if (File.Exists (tmpFile))
 				File.Delete (tmpFile);
 
-			ZipFile.CreateFromDirectory ("foo", tmpFile, CompressionLevel.Fastest,
+			ZipFile.CreateFromDirectory (TestResourceHelper.GetFullPathOfResource ("Test/resources/foo"), tmpFile, CompressionLevel.Fastest,
 				includeBaseDirectory: true);
 			Assert.IsTrue (File.Exists (tmpFile));
 
@@ -100,7 +102,7 @@ namespace MonoTests.System.IO.Compression.FileSystem
 			if (File.Exists (tmpFile))
 				File.Delete (tmpFile);
 
-			ZipFile.CreateFromDirectory ("foo", tmpFile);
+			ZipFile.CreateFromDirectory (TestResourceHelper.GetFullPathOfResource ("Test/resources/foo"), tmpFile);
 
 			ZipFile.ExtractToDirectory (tmpFile, extractDir);
 			Assert.IsTrue(Directory.Exists (extractDir));
@@ -120,7 +122,7 @@ namespace MonoTests.System.IO.Compression.FileSystem
 			if (File.Exists (tmpFile))
 				File.Delete (tmpFile);
 
-			var file = "foo/foo.txt";
+			var file = TestResourceHelper.GetFullPathOfResource ("Test/resources/foo/foo.txt");
 			using (var archive = new ZipArchive(File.Open(tmpFile, FileMode.Create),
 				ZipArchiveMode.Update))
 			{
diff --git a/mcs/class/System.IO.Compression.FileSystem/foo/bar.txt b/mcs/class/System.IO.Compression.FileSystem/Test/resources/foo/bar.txt
index e69de29bb2d..e69de29bb2d 100644
--- a/mcs/class/System.IO.Compression.FileSystem/foo/bar.txt
+++ b/mcs/class/System.IO.Compression.FileSystem/Test/resources/foo/bar.txt
diff --git a/mcs/class/System.IO.Compression.FileSystem/foo/foo.txt b/mcs/class/System.IO.Compression.FileSystem/Test/resources/foo/foo.txt
index 257cc5642cb..257cc5642cb 100644
--- a/mcs/class/System.IO.Compression.FileSystem/foo/foo.txt
+++ b/mcs/class/System.IO.Compression.FileSystem/Test/resources/foo/foo.txt
diff --git a/mcs/class/System.IO.Compression.FileSystem/foo/foobar/bar.txt b/mcs/class/System.IO.Compression.FileSystem/Test/resources/foo/foobar/bar.txt
index e69de29bb2d..e69de29bb2d 100644
--- a/mcs/class/System.IO.Compression.FileSystem/foo/foobar/bar.txt
+++ b/mcs/class/System.IO.Compression.FileSystem/Test/resources/foo/foobar/bar.txt
diff --git a/mcs/class/System.IO.Compression.FileSystem/foo/foobar/foo.txt b/mcs/class/System.IO.Compression.FileSystem/Test/resources/foo/foobar/foo.txt
index e69de29bb2d..e69de29bb2d 100644
--- a/mcs/class/System.IO.Compression.FileSystem/foo/foobar/foo.txt
+++ b/mcs/class/System.IO.Compression.FileSystem/Test/resources/foo/foobar/foo.txt