Remove RunSerialyAndSweepTmpFilesAttribute

nissl-lab · Sep 14, 2023 · e7faafb · e7faafb
1 parent 928fa26
commit e7faafb
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 74 deletions.
diff --git a/solution/NPOI.Core.Test.sln b/solution/NPOI.Core.Test.sln
@@ -26,7 +26,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "_build", "..\build\_build.c
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NPOI.Benchmarks", "..\benchmarks\NPOI.Benchmarks\NPOI.Benchmarks.csproj", "{3DA1149D-46F8-4181-9976-E002BF2BFB76}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NPOI.Pack", "NPOI.Pack.csproj", "{6D7A6E15-C914-4FCA-B8E4-FF5C7437C2E0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NPOI.Pack", "NPOI.Pack.csproj", "{6D7A6E15-C914-4FCA-B8E4-FF5C7437C2E0}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -62,6 +62,10 @@ Global
 		{DA2CA3BD-1CAC-470C-9FA2-611A5768A76A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DA2CA3BD-1CAC-470C-9FA2-611A5768A76A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DA2CA3BD-1CAC-470C-9FA2-611A5768A76A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{94B18BCF-84E8-401F-BAAB-0496AA136628}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{94B18BCF-84E8-401F-BAAB-0496AA136628}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{94B18BCF-84E8-401F-BAAB-0496AA136628}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{94B18BCF-84E8-401F-BAAB-0496AA136628}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3DA1149D-46F8-4181-9976-E002BF2BFB76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3DA1149D-46F8-4181-9976-E002BF2BFB76}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3DA1149D-46F8-4181-9976-E002BF2BFB76}.Release|Any CPU.ActiveCfg = Release|Any CPU

diff --git a/testcases/main/RunSerialyAndSweepTmpFilesAttribute.cs b/testcases/main/RunSerialyAndSweepTmpFilesAttribute.cs
diff --git a/testcases/main/Util/TestTempFile.cs b/testcases/main/Util/TestTempFile.cs
@@ -8,7 +8,6 @@ namespace TestCases.Util
     /// Tests of creating temp files
     /// </summary>
     [TestFixture]
-    [NonParallelizable]
     internal class TestTempFile
     {
         [Test]

diff --git a/testcases/ooxml/XSSF/Streaming/GZIPSheetDataWriterTests.cs b/testcases/ooxml/XSSF/Streaming/GZIPSheetDataWriterTests.cs
@@ -22,7 +22,6 @@ limitations under the License.
 namespace TestCases.XSSF.Streaming
 {
     [TestFixture]
-    [NonParallelizable]
     public class GZIPSheetDataWriterTests
     {
         private GZIPSheetDataWriter _objectToTest;

diff --git a/testcases/ooxml/XSSF/Streaming/SheetDataWriterTests.cs b/testcases/ooxml/XSSF/Streaming/SheetDataWriterTests.cs
@@ -24,7 +24,6 @@ limitations under the License.
 namespace TestCases.XSSF.Streaming
 {
     [TestFixture]
-    [NonParallelizable]
     public class SheetDataWriterTests
     {
         private SheetDataWriter _objectToTest;

diff --git a/testcases/ooxml/XSSF/Streaming/TestSXSSFWorkbook.cs b/testcases/ooxml/XSSF/Streaming/TestSXSSFWorkbook.cs
@@ -36,7 +36,6 @@ namespace TestCases.XSSF.Streaming
     using TestCases.Util;
 
     [TestFixture]
-    [NonParallelizable]
     public class TestSXSSFWorkbook : BaseTestXWorkbook
     {
 

diff --git a/testcases/ooxml/XSSF/UserModel/TestXSSFBugs.cs b/testcases/ooxml/XSSF/UserModel/TestXSSFBugs.cs
@@ -2707,7 +2707,7 @@ public void Bug57642()
          *  32,767 must not be -32,768, then -32,767, -32,766
          *  long time test, run over 1 minute.
          */
-        [Test, RunSerialyAndSweepTmpFiles]
+        [Test]
         [Ignore("this test doesn't make sense")]
         public void Bug57880()
         {

diff --git a/testcases/ooxml/XSSF/UserModel/TestXSSFWorkbook.cs b/testcases/ooxml/XSSF/UserModel/TestXSSFWorkbook.cs
@@ -51,7 +51,7 @@ public TestXSSFWorkbook()
         /**
          * Tests that we can save, and then re-load a new document
          */
-        [Test, RunSerialyAndSweepTmpFiles]
+        [Test]
         public void SaveLoadNew()
         {
             XSSFWorkbook wb1 = new XSSFWorkbook();
@@ -121,9 +121,8 @@ public void SaveLoadNew()
             Assert.AreEqual("hello world", sheet1.GetRow(1).GetCell(0).RichStringCellValue.String);
 
             pkg.Close();
-
-            Assert.AreEqual(0, Directory.GetFiles(AppDomain.CurrentDomain.BaseDirectory, "*.tmp").Length, "At Last: There are no temporary files.");
         }
+
         [Test]
         public void Existing()
         {

diff --git a/testcases/openxml4net/OPC/Compliance/TestOPCComplianceCoreProperties.cs b/testcases/openxml4net/OPC/Compliance/TestOPCComplianceCoreProperties.cs
@@ -287,7 +287,7 @@ public void TestNoCoreProperties_saveNew()
          * Document with no core properties - testing at the OPC level,
          *  from a temp-file, saving in-place
          */
-        [Test, RunSerialyAndSweepTmpFiles]
+        [Test]
         public void TestNoCoreProperties_saveInPlace()
         {
             String sampleFileName = "OPCCompliance_NoCoreProperties.xlsx";
@@ -328,8 +328,7 @@ public void TestNoCoreProperties_saveInPlace()
             pkg.Revert();
             tmp.Delete();
 
-            Assert.AreEqual(0, Directory.GetFiles(AppDomain.CurrentDomain.BaseDirectory, "*.tmp").Length, "At Last: There are no temporary files.");
+            Assert.IsFalse(File.Exists(tmp.FullName), $"{tmp.FullName} file exists!");
         }
-
     }
 }
diff --git a/testcases/openxml4net/TestPackage.cs b/testcases/openxml4net/TestPackage.cs
@@ -166,7 +166,7 @@ public void TestCreatePackageAddPart()
          *  document and another part, save and re-load and
          *  have everything Setup as expected
          */
-        [Test, RunSerialyAndSweepTmpFiles]
+        [Test]
         //[Ignore("add relation Uri #Sheet1!A1")]
         public void TestCreatePackageWithCoreDocument()
         {
@@ -256,8 +256,6 @@ public void TestCreatePackageWithCoreDocument()
             {
                 pkg.Close();
             }
-
-            Assert.AreEqual(0, Directory.GetFiles(AppDomain.CurrentDomain.BaseDirectory, "*.tmp").Length, "At Last: There are no temporary files.");
         }
 
         private void assertMSCompatibility(OPCPackage pkg)
@@ -282,7 +280,7 @@ private void assertMSCompatibility(OPCPackage pkg)
         /**
          * Test namespace opening.
          */
-        [Test, RunSerialyAndSweepTmpFiles]
+        [Test]
         public void TestOpenPackage()
         {
             FileInfo targetFile = OpenXml4NetTestDataSamples.GetOutputFile("TestOpenPackageTMP.docx");
@@ -344,7 +342,7 @@ public void TestOpenPackage()
             ZipFileAssert.AssertEqual(expectedFile, targetFile);
             File.Delete(targetFile.FullName);
 
-            Assert.AreEqual(0, Directory.GetFiles(AppDomain.CurrentDomain.BaseDirectory, "*.tmp").Length, "At Last: There are no temporary files.");
+            Assert.IsFalse(File.Exists(targetFile.FullName), $"{targetFile.FullName} file exists!");
         }
 
         /**
@@ -531,7 +529,7 @@ public void TestDeletePartRecursive()
          * Test that we can open a file by path, and then
          *  write Changes to it.
          */
-        [Test, RunSerialyAndSweepTmpFiles, Platform("Win")]
+        [Test, Platform("Win")]
         public void TestOpenFileThenOverWrite()
         {
             string tempFile = TempFile.GetTempFilePath("poiTesting", "tmp");
@@ -568,13 +566,13 @@ public void TestOpenFileThenOverWrite()
             p.Close();
             File.Delete(tempFile);
 
-            Assert.AreEqual(0, Directory.GetFiles(AppDomain.CurrentDomain.BaseDirectory, "*.tmp").Length, "At Last: There are no temporary files.");
+            Assert.IsFalse(File.Exists(tempFile), $"{tempFile} file exists!");
         }
         /**
          * Test that we can open a file by path, save it
          *  to another file, then delete both
          */
-        [Test, RunSerialyAndSweepTmpFiles]
+        [Test]
         public void TestOpenFileThenSaveDelete()
         {
             string tempFile = TempFile.GetTempFilePath("poiTesting", "tmp");
@@ -593,7 +591,8 @@ public void TestOpenFileThenSaveDelete()
             File.Delete(tempFile);
             File.Delete(tempFile2);
 
-            Assert.AreEqual(0, Directory.GetFiles(AppDomain.CurrentDomain.BaseDirectory, "*.tmp").Length, "At Last: There are no temporary files.");
+            Assert.IsFalse(File.Exists(tempFile), $"{tempFile} file exists!");
+            Assert.IsFalse(File.Exists(tempFile2), $"{tempFile2} file exists!");
         }
 
         private static ContentTypeManager GetContentTypeManager(OPCPackage pkg)