Cleanup tests, support OpenCombine

Sources/XMLCoder/Decoder/XMLDecoder.swift

@@ -374,6 +374,10 @@ open class XMLDecoder {
 
 #if canImport(Combine)
 import protocol Combine.TopLevelDecoder
+#elseif canImport(OpenCombine)
+import protocol OpenCombine.TopLevelDecoder
+#endif
 
+#if canImport(Combine) || canImport(OpenCombine)
 extension XMLDecoder: TopLevelDecoder {}
 #endif

Tests/XMLCoderTests/BenchmarkTests.swift

@@ -1,7 +1,7 @@
 import XCTest
 @testable import XMLCoder
 
-class BenchmarkTests: XCTestCase {
+final class BenchmarkTests: XCTestCase {
     struct Container<T: Codable>: Codable {
         let unkeyed: [T]
         let keyed: [String: T]

Tests/XMLCoderTests/ClassTests.swift

@@ -90,7 +90,7 @@ private let xmlData = """
 </s>
 """.data(using: .utf8)!
 
-class ClassTests: XCTestCase {
+final class ClassTests: XCTestCase {
     func testEmpty() throws {
         let decoder = XMLDecoder()
         let encoder = XMLEncoder()

Tests/XMLCoderTests/CombineTests.swift

@@ -5,8 +5,13 @@
 //  Created by Adam Sharp on 9/29/19.
 //
 
-#if canImport(Combine) && !os(macOS)
+#if canImport(Combine)
 import Combine
+#elseif canImport(OpenCombine)
+import OpenCombine
+#endif
+
+#if canImport(Combine) || canImport(OpenCombine)
 import Foundation
 import XCTest
 import XMLCoder
@@ -23,7 +28,7 @@ private struct Foo: Decodable {
 }
 
 @available(iOS 13.0, macOS 10.15.0, tvOS 13.0, watchOS 6.0, *)
-class CombineTests: XCTestCase {
+final class CombineTests: XCTestCase {
     func testDecodeFromXMLDecoder() {
         let data = Just(xml)
         var foo: Foo?

Tests/XMLCoderTests/CompositeChoiceTests.swift

@@ -47,7 +47,7 @@ extension IntOrStringWrapper: Codable {
     }
 }
 
-class EnumAssociatedValueTestComposite: XCTestCase {
+final class EnumAssociatedValueTestComposite: XCTestCase {
     var encoder: XMLEncoder {
         let encoder = XMLEncoder()
         encoder.outputFormatting = [.prettyPrinted]

Tests/XMLCoderTests/DecodingContainerTests.swift

@@ -85,7 +85,7 @@ private struct Foo: Codable {
     }
 }
 
-class DecodingContainerTests: XCTestCase {
+final class DecodingContainerTests: XCTestCase {
     func testExample() throws {
         let foo = Foo(
             foo: [

Tests/XMLCoderTests/EmptyArrayTest.swift

@@ -45,7 +45,7 @@ private let xmlContainsEmpty = """
 </container>
 """
 
-class EmptyArrayTest: XCTestCase {
+final class EmptyArrayTest: XCTestCase {
     func testEmptyArrayDecode() throws {
         let decoded = try XMLDecoder().decode([Empty].self, from: xml.data(using: .utf8)!)
         XCTAssertEqual(decoded, [Empty(), Empty(), Empty()])

Tests/XMLCoderTests/EmptyElementEmptyStringTests.swift

@@ -8,7 +8,7 @@
 import XCTest
 import XMLCoder
 
-class EmptyElementEmptyStringTests: XCTestCase {
+final class EmptyElementEmptyStringTests: XCTestCase {
     struct ExplicitNestingContainer: Equatable, Decodable {
         let things: ContainedArray
 

Tests/XMLCoderTests/MixedChoiceAndNonChoiceTests.swift

@@ -131,7 +131,7 @@ extension TwoChoiceElements: Codable {
     }
 }
 
-class MixedChoiceAndNonChoiceTests: XCTestCase {
+final class MixedChoiceAndNonChoiceTests: XCTestCase {
     func testMixedChoiceFirstEncode() throws {
         let first = MixedIntOrStringFirst(intOrString: .int(4), otherValue: "other")
         let firstEncoded = try XMLEncoder().encode(first, withRootKey: "container")

Tests/XMLCoderTests/NamespaceTest.swift

@@ -251,7 +251,7 @@ private struct NamespacedRow: Codable {
     }
 }
 
-class NameSpaceTest: XCTestCase {
+final class NamespaceTest: XCTestCase {
     func testTable() throws {
         let decoder = XMLDecoder()
         decoder.shouldProcessNamespaces = true

Tests/XMLCoderTests/NestedAttributeChoiceTests.swift

@@ -96,7 +96,7 @@ extension Entry: Codable {
     }
 }
 
-class NestedAttributeChoiceTests: XCTestCase {
+final class NestedAttributeChoiceTests: XCTestCase {
     private var encoder: XMLEncoder {
         let encoder = XMLEncoder()
         encoder.outputFormatting = [.prettyPrinted]

Tests/XMLCoderTests/NestedChoiceArrayTest.swift

@@ -70,7 +70,7 @@ extension Book: Equatable {}
 extension Chapter: Equatable {}
 extension Chapter.Content: Equatable {}
 
-class NestedChoiceArrayTest: XCTestCase {
+final class NestedChoiceArrayTest: XCTestCase {
     func testDecodingNestedChoiceArray() throws {
         let xml = """
         <?xml version="1.0" encoding="UTF-8"?>

Tests/XMLCoderTests/NestedChoiceTests.swift

@@ -83,7 +83,7 @@ extension Entry: Codable {
     }
 }
 
-class NestedChoiceTests: XCTestCase {
+final class NestedChoiceTests: XCTestCase {
     func testBreakDecoding() throws {
         let xml = "<br></br>"
         let result = try XMLDecoder().decode(Break.self, from: xml.data(using: .utf8)!)

Tests/XMLCoderTests/RJITest.swift

@@ -140,7 +140,7 @@ private struct Enclosure: Codable, Equatable {
     let type: String
 }
 
-class RJITest: XCTestCase {
+final class RJITest: XCTestCase {
     func testRSS() throws {
         let decoder = XMLDecoder()
 //        let encoder = XMLEncoder()

Tests/XMLCoderTests/RootLevelAttributeTest.swift

@@ -32,7 +32,7 @@ let expected = """
 </policy>
 """
 
-class RootLevelAttributeTest: XCTestCase {
+final class RootLevelAttributeTest: XCTestCase {
     func testPolicyEncodingAtRoot() throws {
         let encoder = XMLEncoder()
         encoder.outputFormatting = [.prettyPrinted]

Tests/XMLCoderTests/SimpleChoiceTests.swift

@@ -8,7 +8,7 @@
 import XCTest
 import XMLCoder
 
-class SimpleChoiceTests: XCTestCase {
+final class SimpleChoiceTests: XCTestCase {
     func testIntOrStringIntDecoding() throws {
         let xml = """
         <container>

Tests/XMLCoderTests/XCTestManifests.swift

@@ -120,6 +120,15 @@ extension BreakfastTest {
     ]
 }
 
+extension CDATATest {
+    // DO NOT MODIFY: This is autogenerated, use:
+    //   `swift test --generate-linuxmain`
+    // to regenerate.
+    static let __allTests__CDATATest = [
+        ("testXML", testXML),
+    ]
+}
+
 extension CDTest {
     // DO NOT MODIFY: This is autogenerated, use:
     //   `swift test --generate-linuxmain`
@@ -439,11 +448,20 @@ extension MixedContainerTest {
     ]
 }
 
-extension NameSpaceTest {
+extension MixedContentTests {
+    // DO NOT MODIFY: This is autogenerated, use:
+    //   `swift test --generate-linuxmain`
+    // to regenerate.
+    static let __allTests__MixedContentTests = [
+        ("testMixed", testMixed),
+    ]
+}
+
+extension NamespaceTest {
     // DO NOT MODIFY: This is autogenerated, use:
     //   `swift test --generate-linuxmain`
     // to regenerate.
-    static let __allTests__NameSpaceTest = [
+    static let __allTests__NamespaceTest = [
         ("testTable", testTable),
         ("testTableWithoutNamespaces", testTableWithoutNamespaces),
         ("testWorksheet", testWorksheet),
@@ -832,6 +850,7 @@ public func __allTests() -> [XCTestCaseEntry] {
         testCase(BorderTest.__allTests__BorderTest),
         testCase(BoxTreeTests.__allTests__BoxTreeTests),
         testCase(BreakfastTest.__allTests__BreakfastTest),
+        testCase(CDATATest.__allTests__CDATATest),
         testCase(CDTest.__allTests__CDTest),
         testCase(ClassTests.__allTests__ClassTests),
         testCase(DataBoxTests.__allTests__DataBoxTests),
@@ -858,7 +877,8 @@ public func __allTests() -> [XCTestCaseEntry] {
         testCase(KeyedTests.__allTests__KeyedTests),
         testCase(MixedChoiceAndNonChoiceTests.__allTests__MixedChoiceAndNonChoiceTests),
         testCase(MixedContainerTest.__allTests__MixedContainerTest),
-        testCase(NameSpaceTest.__allTests__NameSpaceTest),
+        testCase(MixedContentTests.__allTests__MixedContentTests),
+        testCase(NamespaceTest.__allTests__NamespaceTest),
         testCase(NestedAttributeChoiceTests.__allTests__NestedAttributeChoiceTests),
         testCase(NestedChoiceArrayTest.__allTests__NestedChoiceArrayTest),
         testCase(NestedChoiceTests.__allTests__NestedChoiceTests),