Skip to content

Commit

Permalink
UPDATE: Updated to Swift 6.0.
Browse files Browse the repository at this point in the history 
REFACTOR: Converted all tests to use  new Swift Testing framework.
  • Loading branch information
@8rightside
8rightside committed Oct 3, 2024
1 parent 0d81d96 commit 6dad8fa
Show file tree
Hide file tree
Showing 9 changed files with 1,397 additions and 1,427 deletions.
2 changes: 1 addition & 1 deletion Package.swift
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version:5.3
// swift-tools-version:6.0

import PackageDescription

Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
</p>

<p align="center">
<img src="https://img.shields.io/badge/Swift-5.3-blue?logo=swift&logoColor=white" />
<img src="https://img.shields.io/badge/Swift-6.0-blue?logo=swift&logoColor=white" />
<img src="https://img.shields.io/badge/Platforms-iOS%20%7C%20macOS%20%7C%20Linux-blue" alt="iOS Mac Linux" />
</p>

Expand Down
7 changes: 0 additions & 7 deletions Tests/LinuxMain.swift
View file

This file was deleted.

303 changes: 152 additions & 151 deletions Tests/ResistanceTests/E Series/ESeriesTests.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,163 +4,164 @@
* MIT license, see LICENSE file for details
*/

// MARK: Contains Preferred Value
extension ESeriesTests {
func test_containsPreferredValue_returnsTrue_withFractional() {
let sut = E12Series()
let resistor = FourBandResistor(value: 4.7)
let result1 = sut.containsPreferredValue(4.7)
let result2 = sut.containsPreferredValue(resistor)
XCTAssertTrue(result1)
XCTAssertTrue(result2)
}

func test_containsPreferredValue_returnsTrue_with2Digits() {
let sut = E12Series()
let resistor = FiveBandResistor(value: 33)
let result1 = sut.containsPreferredValue(33)
let result2 = sut.containsPreferredValue(resistor)
XCTAssertTrue(result1)
XCTAssertTrue(result2)
}

func test_containsPreferredValue_returnsTrue_with5Digits() {
let sut = E12Series()
let resistor = SixBandResistor(value: 68000)
let result1 = sut.containsPreferredValue(68000)
let result2 = sut.containsPreferredValue(resistor)
XCTAssertTrue(result1)
XCTAssertTrue(result2)
}

func test_containsPreferredValue_returnsFalse_withFractional() {
let sut = E12Series()
let resistor = FourBandResistor(value: 4.6)
let result1 = sut.containsPreferredValue(4.6)
let result2 = sut.containsPreferredValue(resistor)
XCTAssertFalse(result1)
XCTAssertFalse(result2)
}

func test_containsPreferredValue_returnsFalse_with2Digits() {
let sut = E12Series()
let resistor = FiveBandResistor(value: 23)
let result1 = sut.containsPreferredValue(23)
let result2 = sut.containsPreferredValue(resistor)
XCTAssertFalse(result1)
XCTAssertFalse(result2)
}

func test_containsPreferredValue_returnsFalse_with5Digits() {
let sut = E12Series()
let resistor = SixBandResistor(value: 12345)
let result1 = sut.containsPreferredValue(12345)
let result2 = sut.containsPreferredValue(resistor)
XCTAssertFalse(result1)
XCTAssertFalse(result2)
}
}

// MARK: - Next Value Up
extension ESeriesTests {
func test_nextValueUp_with2Digits_notInSeries() {
let sut = E24Series()
let resistor = FourBandResistor(value: 53)
let result1 = sut.nextValueUp(from: 53)
let result2 = sut.nextValueUp(from: resistor)
XCTAssertEqual(result1, 56)
XCTAssertEqual(result2, 56)
}

func test_nextValueUp_with5Digits_notInSeries() {
let sut = E24Series()
let resistor = FiveBandResistor(value: 45000)
let result1 = sut.nextValueUp(from: 45000)
let result2 = sut.nextValueUp(from: resistor)
XCTAssertEqual(result1, 47000)
XCTAssertEqual(result2, 47000)
}

func test_nextValueUp_with2Digits_inSeries() {
let sut = E24Series()
let resistor = SixBandResistor(value: 33)
let result1 = sut.nextValueUp(from: 33)
let result2 = sut.nextValueUp(from: resistor)
XCTAssertEqual(result1, 36)
XCTAssertEqual(result2, 36)
}

func test_nextValueUp_with5Digits_inSeries() {
let sut = E24Series()
let resistor = FourBandResistor(value: 62000)
let result1 = sut.nextValueUp(from: 62000)
let result2 = sut.nextValueUp(from: resistor)
XCTAssertEqual(result1, 68000)
XCTAssertEqual(result2, 68000)
}
}
import Testing
@testable import Resistance

// MARK: - Next Value Down
extension ESeriesTests {
func test_nextValueDown_with2Digits_notInSeries() {
let sut = E24Series()
let resistor = FourBandResistor(value: 53)
let result1 = sut.nextValueDown(from: 53)
let result2 = sut.nextValueDown(from: resistor)
XCTAssertEqual(result1, 51)
XCTAssertEqual(result2, 51)
}

func test_nextValueDown_with5Digits_notInSeries() {
let sut = E24Series()
let resistor = FiveBandResistor(value: 45000)
let result1 = sut.nextValueDown(from: 45000)
let result2 = sut.nextValueDown(from: resistor)
XCTAssertEqual(result1, 43000)
XCTAssertEqual(result2, 43000)
}
@Suite("E Series Tests")
struct ESeriesTests {

func test_nextValueDown_with2Digits_inSeries() {
let sut = E24Series()
let resistor = SixBandResistor(value: 33)
let result1 = sut.nextValueDown(from: 33)
let result2 = sut.nextValueDown(from: resistor)
XCTAssertEqual(result1, 30)
XCTAssertEqual(result2, 30)
// MARK: Contains Preferred Value
@Suite("Contains Preferred Value")
struct ContainsPreferredValue {

@Test("Returns True with Fractional")
static func returnsTrue_withFractional() {
let sut = E12Series()
let resistor = FourBandResistor(value: 4.7)
let result1 = sut.containsPreferredValue(4.7)
let result2 = sut.containsPreferredValue(resistor)
#expect(result1)
#expect(result2)
}

@Test("Returns True with 2 Digits")
static func returnsTrue_with2Digits() {
let sut = E12Series()
let resistor = FiveBandResistor(value: 33)
let result1 = sut.containsPreferredValue(33)
let result2 = sut.containsPreferredValue(resistor)
#expect(result1)
#expect(result2)
}

@Test("Returns True with 5 Digits")
static func returnsTrue_with5Digits() {
let sut = E12Series()
let resistor = SixBandResistor(value: 68000)
let result1 = sut.containsPreferredValue(68000)
let result2 = sut.containsPreferredValue(resistor)
#expect(result1)
#expect(result2)
}

@Test("Returns False with Fractional")
static func returnsFalse_withFractional() {
let sut = E12Series()
let resistor = FourBandResistor(value: 4.6)
let result1 = sut.containsPreferredValue(4.6)
let result2 = sut.containsPreferredValue(resistor)
#expect(!result1)
#expect(!result2)
}

@Test("Returns False with 2 Digits")
static func returnsFalse_with2Digits() {
let sut = E12Series()
let resistor = FiveBandResistor(value: 23)
let result1 = sut.containsPreferredValue(23)
let result2 = sut.containsPreferredValue(resistor)
#expect(!result1)
#expect(!result2)
}

@Test("Returns False with 5 Digits")
static func returnsFalse_with5Digits() {
let sut = E12Series()
let resistor = SixBandResistor(value: 12345)
let result1 = sut.containsPreferredValue(12345)
let result2 = sut.containsPreferredValue(resistor)
#expect(!result1)
#expect(!result2)
}
}

func test_nextValueDown_with5Digits_inSeries() {
let sut = E24Series()
let resistor = FourBandResistor(value: 62000)
let result1 = sut.nextValueDown(from: 62000)
let result2 = sut.nextValueDown(from: resistor)
XCTAssertEqual(result1, 56000)
XCTAssertEqual(result2, 56000)
// MARK: - Next Value Up
@Suite("Next Value Up")
struct NextValueUp {

@Test("2 Digits Not In Series")
static func with2Digits_notInSeries() {
let sut = E24Series()
let resistor = FourBandResistor(value: 53)
let result1 = sut.nextValueUp(from: 53)
let result2 = sut.nextValueUp(from: resistor)
#expect(result1 == 56)
#expect(result2 == 56)
}

@Test("5 Digits Not In Series")
static func with5Digits_notInSeries() {
let sut = E24Series()
let resistor = FiveBandResistor(value: 45000)
let result1 = sut.nextValueUp(from: 45000)
let result2 = sut.nextValueUp(from: resistor)
#expect(result1 == 47000)
#expect(result2 == 47000)
}

@Test("2 Digits In Series")
static func with2Digits_inSeries() {
let sut = E24Series()
let resistor = SixBandResistor(value: 33)
let result1 = sut.nextValueUp(from: 33)
let result2 = sut.nextValueUp(from: resistor)
#expect(result1 == 36)
#expect(result2 == 36)
}

@Test("5 Digits In Series")
static func with5Digits_inSeries() {
let sut = E24Series()
let resistor = FourBandResistor(value: 62000)
let result1 = sut.nextValueUp(from: 62000)
let result2 = sut.nextValueUp(from: resistor)
#expect(result1 == 68000)
#expect(result2 == 68000)
}
}
}

// MARK: - Internal
import XCTest
@testable import Resistance

final class ESeriesTests: XCTestCase {

static var allTests = [
("test_containsPreferredValue_returnsTrue_withFractional", test_containsPreferredValue_returnsTrue_withFractional),
("test_containsPreferredValue_returnsTrue_with2Digits", test_containsPreferredValue_returnsTrue_with2Digits),
("test_containsPreferredValue_returnsTrue_with5Digits", test_containsPreferredValue_returnsTrue_with5Digits),
("test_containsPreferredValue_returnsFalse_withFractional", test_containsPreferredValue_returnsFalse_withFractional),
("test_containsPreferredValue_returnsFalse_with2Digits", test_containsPreferredValue_returnsFalse_with2Digits),
("test_containsPreferredValue_returnsFalse_with5Digits", test_containsPreferredValue_returnsFalse_with5Digits),
// MARK: - Next Value Down
@Suite("Next Value Down")
struct NextValueDown {

@Test("2 Digits Not In Series")
static func with2Digits_notInSeries() {
let sut = E24Series()
let resistor = FourBandResistor(value: 53)
let result1 = sut.nextValueDown(from: 53)
let result2 = sut.nextValueDown(from: resistor)
#expect(result1 == 51)
#expect(result2 == 51)
}

("test_nextValueUp_with2Digits_notInSeries", test_nextValueUp_with2Digits_notInSeries),
("test_nextValueUp_with5Digits_notInSeries", test_nextValueUp_with5Digits_notInSeries),
("test_nextValueDown_with2Digits_inSeries", test_nextValueDown_with2Digits_inSeries),
("test_nextValueUp_with2Digits_inSeries", test_nextValueUp_with2Digits_inSeries),
@Test("5 Digits Not In Series")
static func with5Digits_notInSeries() {
let sut = E24Series()
let resistor = FiveBandResistor(value: 45000)
let result1 = sut.nextValueDown(from: 45000)
let result2 = sut.nextValueDown(from: resistor)
#expect(result1 == 43000)
#expect(result2 == 43000)
}

("test_nextValueDown_with2Digits_notInSeries", test_nextValueDown_with2Digits_notInSeries),
("test_nextValueDown_with5Digits_notInSeries", test_nextValueDown_with5Digits_notInSeries),
("test_nextValueDown_with2Digits_inSeries", test_nextValueDown_with2Digits_inSeries),
("test_nextValueDown_with5Digits_inSeries", test_nextValueDown_with5Digits_inSeries),
]
@Test("2 Digits In Series")
static func with2Digits_inSeries() {
let sut = E24Series()
let resistor = SixBandResistor(value: 33)
let result1 = sut.nextValueDown(from: 33)
let result2 = sut.nextValueDown(from: resistor)
#expect(result1 == 30)
#expect(result2 == 30)
}

@Test("5 Digits In Series")
static func with5Digits_inSeries() {
let sut = E24Series()
let resistor = FourBandResistor(value: 62000)
let result1 = sut.nextValueDown(from: 62000)
let result2 = sut.nextValueDown(from: resistor)
#expect(result1 == 56000)
#expect(result2 == 56000)
}
}
}
Loading

0 comments on commit 6dad8fa

Please sign in to comment.