Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add tests for keyed and unkeyed int types #62

Merged
merged 4 commits into from Jan 8, 2019
Merged

Add tests for keyed and unkeyed int types #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2474299
Roll back to old IntTests.swift version
hodovani Jan 8, 2019
68f0a9c
Add tests for keyed and unkeyed int types
hodovani Jan 8, 2019
809271d
Fix KeyedIntTests.swift test
hodovani Jan 8, 2019
b728554
Remove repeated func in UnkeyedIntTests.swift
hodovani Jan 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
150 changes: 15 additions & 135 deletions Tests/XMLCoderTests/Minimal/IntTests.swift
View file
Open in desktop
Expand Up @@ -4,82 +4,32 @@
//
// Created by Vincent Esche on 12/19/18.
//

import XCTest
@testable import XMLCoder

protocol IntegerContainer {
associatedtype Integer: BinaryInteger

var value: Integer { get }
}

extension IntegerContainer {
var intValue: Int {
return Int(value)
}
}

private struct ContainerInt: Codable, Equatable, IntegerContainer {
let value: Int
}

private struct ContainerInt8: Codable, Equatable, IntegerContainer {
let value: Int8
}

private struct ContainerInt16: Codable, Equatable, IntegerContainer {
let value: Int16
}

private struct ContainerInt32: Codable, Equatable, IntegerContainer {
let value: Int32
}

private struct ContainerInt64: Codable, Equatable, IntegerContainer {
let value: Int64
}

private struct ContainerUInt: Codable, Equatable, IntegerContainer {
let value: UInt
}

private struct ContainerUInt8: Codable, Equatable, IntegerContainer {
let value: UInt8
}

private struct ContainerUInt16: Codable, Equatable, IntegerContainer {
let value: UInt16
}

private struct ContainerUInt32: Codable, Equatable, IntegerContainer {
let value: UInt32
}

private struct ContainerUInt64: Codable, Equatable, IntegerContainer {
let value: UInt64
}

class IntTests: XCTestCase {
typealias Value = Int

struct Container<T>: Codable, Equatable, IntegerContainer where T: Codable & Equatable & BinaryInteger {
let value: T
struct Container: Codable, Equatable {
let value: Value
}

let values: [(Value, String)] = [
(-42, "-42"),
(0, "0"),
(42, "42"),
]

func testMissing<T: Decodable>(_ type: T.Type) throws {
func testMissing() {
let decoder = XMLDecoder()

let xmlString = "<container />"
let xmlData = xmlString.data(using: .utf8)!
XCTAssertThrowsError(try decoder.decode(type, from: xmlData))

XCTAssertThrowsError(try decoder.decode(Container.self, from: xmlData))
}

func testAttribute<T: Codable & IntegerContainer>(_ type: T.Type) throws {
func testAttribute() throws {
let decoder = XMLDecoder()
let encoder = XMLEncoder()

Expand All @@ -94,15 +44,15 @@ class IntTests: XCTestCase {
"""
let xmlData = xmlString.data(using: .utf8)!

let decoded = try decoder.decode(type, from: xmlData)
XCTAssertEqual(decoded.intValue, value)
let decoded = try decoder.decode(Container.self, from: xmlData)
XCTAssertEqual(decoded.value, value)

let encoded = try encoder.encode(decoded, withRootKey: "container")
XCTAssertEqual(String(data: encoded, encoding: .utf8)!, xmlString)
}
}

func testElement<T: Codable & IntegerContainer>(_ type: T.Type) throws {
func testElement() throws {
let decoder = XMLDecoder()
let encoder = XMLEncoder()

Expand All @@ -117,86 +67,16 @@ class IntTests: XCTestCase {
"""
let xmlData = xmlString.data(using: .utf8)!

let decoded = try decoder.decode(type, from: xmlData)
XCTAssertEqual(decoded.intValue, value)
let decoded = try decoder.decode(Container.self, from: xmlData)
XCTAssertEqual(decoded.value, value)

let encoded = try encoder.encode(decoded, withRootKey: "container")
XCTAssertEqual(String(data: encoded, encoding: .utf8)!, xmlString)
}
}

func testIntegerTypeMissing() throws {
try testMissing(Container<Int>.self)
try testMissing(Container<Int8>.self)
try testMissing(Container<Int16>.self)
try testMissing(Container<Int32>.self)
try testMissing(Container<Int64>.self)
try testMissing(Container<UInt>.self)
try testMissing(Container<UInt8>.self)
try testMissing(Container<UInt16>.self)
try testMissing(Container<UInt32>.self)
try testMissing(Container<UInt64>.self)
try testMissing(ContainerInt.self)
try testMissing(ContainerInt8.self)
try testMissing(ContainerInt16.self)
try testMissing(ContainerInt32.self)
try testMissing(ContainerInt64.self)
try testMissing(ContainerUInt.self)
try testMissing(ContainerUInt8.self)
try testMissing(ContainerUInt16.self)
try testMissing(ContainerUInt32.self)
try testMissing(ContainerUInt64.self)
}

func testIntegerTypeAttribute() throws {
try testAttribute(Container<Int>.self)
try testAttribute(Container<Int8>.self)
try testAttribute(Container<Int16>.self)
try testAttribute(Container<Int32>.self)
try testAttribute(Container<Int64>.self)
try testAttribute(Container<UInt>.self)
try testAttribute(Container<UInt8>.self)
try testAttribute(Container<UInt16>.self)
try testAttribute(Container<UInt32>.self)
try testAttribute(Container<UInt64>.self)
try testAttribute(ContainerInt.self)
try testAttribute(ContainerInt8.self)
try testAttribute(ContainerInt16.self)
try testAttribute(ContainerInt32.self)
try testAttribute(ContainerInt64.self)
try testAttribute(ContainerUInt.self)
try testAttribute(ContainerUInt8.self)
try testAttribute(ContainerUInt16.self)
try testAttribute(ContainerUInt32.self)
try testAttribute(ContainerUInt64.self)
}

func testIntegerTypeElement() throws {
try testElement(Container<Int>.self)
try testElement(Container<Int8>.self)
try testElement(Container<Int16>.self)
try testElement(Container<Int32>.self)
try testElement(Container<Int64>.self)
try testElement(Container<UInt>.self)
try testElement(Container<UInt8>.self)
try testElement(Container<UInt16>.self)
try testElement(Container<UInt32>.self)
try testElement(Container<UInt64>.self)
try testElement(ContainerInt.self)
try testElement(ContainerInt8.self)
try testElement(ContainerInt16.self)
try testElement(ContainerInt32.self)
try testElement(ContainerInt64.self)
try testElement(ContainerUInt.self)
try testElement(ContainerUInt8.self)
try testElement(ContainerUInt16.self)
try testElement(ContainerUInt32.self)
try testElement(ContainerUInt64.self)
}

static var allTests = [
("testIntegerTypeMissing", testIntegerTypeMissing),
("testIntegerTypeAttribute", testIntegerTypeAttribute),
("testIntegerTypeElement", testIntegerTypeElement),
("testAttribute", testAttribute),
("testElement", testElement),
]
}