chore: remove dependency on System.ValueTuple. (#82)

* chore: remove dependency on System.ValueTuple. * fix: use a class instead of Value Tuple in xunit.
spekt · Jun 24, 2024 · a4a1ee3 · a4a1ee3
1 parent 16f8768
commit a4a1ee3
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 13 deletions.
diff --git a/src/JUnit.Xml.TestLogger/JUnit.Xml.TestLogger.csproj b/src/JUnit.Xml.TestLogger/JUnit.Xml.TestLogger.csproj
@@ -16,6 +16,5 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="15.5.0" />
-    <PackageReference Include="System.ValueTuple" Version="4.3.0" />
   </ItemGroup>
 </Project>
diff --git a/src/NUnit.Xml.TestLogger/NUnit.Xml.TestLogger.csproj b/src/NUnit.Xml.TestLogger/NUnit.Xml.TestLogger.csproj
@@ -16,7 +16,6 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="15.5.0" />
-    <PackageReference Include="System.ValueTuple" Version="4.3.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Xunit.Xml.TestLogger/Xunit.Xml.TestLogger.csproj b/src/Xunit.Xml.TestLogger/Xunit.Xml.TestLogger.csproj
@@ -17,7 +17,6 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="15.5.0" />
-    <PackageReference Include="System.ValueTuple" Version="4.3.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Xunit.Xml.TestLogger/XunitXmlSerializer.cs b/src/Xunit.Xml.TestLogger/XunitXmlSerializer.cs
@@ -93,13 +93,13 @@ orderby resultsByType.Key
 
             foreach (var collection in collections)
             {
-                total += collection.total;
-                passed += collection.passed;
-                failed += collection.failed;
-                skipped += collection.skipped;
-                errors += collection.error;
+                total += collection.Total;
+                passed += collection.Passed;
+                failed += collection.Failed;
+                skipped += collection.Skipped;
+                errors += collection.Error;
 
-                element.Add(collection.element);
+                element.Add(collection.Element);
             }
 
             // Handle errors
@@ -175,7 +175,7 @@ private static XElement CreateFailureElement(string exceptionType, string messag
             return failureElement;
         }
 
-        private static (XElement element, int total, int passed, int failed, int skipped, int error, TimeSpan time) CreateCollection(IGrouping<string, TestResultInfo> resultsByType, List<TestResultInfo> testResultAsError)
+        private static TestCollection CreateCollection(IGrouping<string, TestResultInfo> resultsByType, List<TestResultInfo> testResultAsError)
         {
             var element = new XElement("collection");
 
@@ -227,7 +227,7 @@ private static (XElement element, int total, int passed, int failed, int skipped
             element.SetAttributeValue("name", $"Test collection for {resultsByType.Key}");
             element.SetAttributeValue("time", time.TotalSeconds.ToString("F3", CultureInfo.InvariantCulture));
 
-            return (element, total, passed, failed, skipped, error, time);
+            return new TestCollection { Element = element, Total = total, Passed = passed, Failed = failed, Skipped = skipped, Error = error, Time = time };
         }
 
         private static bool IsError(TestResultInfo result)
@@ -318,5 +318,22 @@ private static string OutcomeToString(TestOutcome outcome)
                     return "Unknown";
             }
         }
+
+        private class TestCollection
+        {
+            public XElement Element { get; set; }
+
+            public int Total { get; set; }
+
+            public int Passed { get; set; }
+
+            public int Failed { get; set; }
+
+            public int Skipped { get; set; }
+
+            public int Error { get; set; }
+
+            public TimeSpan Time { get; set; }
+        }
     }
 }
diff --git a/test/Json.TestLogger.TestAdapter/Json.TestLogger.TestAdapter.csproj b/test/Json.TestLogger.TestAdapter/Json.TestLogger.TestAdapter.csproj
@@ -29,6 +29,5 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="15.5.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="System.ValueTuple" Version="4.3.0" />
   </ItemGroup>
 </Project>
diff --git a/test/Json.TestLogger/Json.TestLogger.csproj b/test/Json.TestLogger/Json.TestLogger.csproj
@@ -27,7 +27,6 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="15.5.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="System.ValueTuple" Version="4.3.0" />
   </ItemGroup>
 
 </Project>