fixed tests. Enabled more tests for SPM

mkrd · Aug 8, 2023 · 5ce5d0d · 5ce5d0d
1 parent 105a15e
commit 5ce5d0d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/BigNumber.podspec b/BigNumber.podspec
@@ -139,7 +139,7 @@ A lightweight, high performance bignum library for Swift for both intergers and
   s.test_spec "BigNumberTests" do |ts|
     ts.platforms = { :ios => "11.0", :osx => "10.11", :tvos => "11.0" }
     ts.source_files = "Sources/MGTools/*.swift", "Tests/BigNumberTests/*.swift", "Tests/MGToolsTests/*.swift"
-    ts.resources = "Tests/BigNumberTests/Resources/*.json"
+    ts.resources = "Tests/BigNumberTests/Resources"
   end
 
 end
diff --git a/Tests/BigNumberTests/BDoubleTests.swift b/Tests/BigNumberTests/BDoubleTests.swift
@@ -1,5 +1,8 @@
 import XCTest
 import Foundation
+#if !COCOAPODS
+@testable import MGTools
+#endif
 @testable import BigNumber
 
 class BDoubleTests : XCTestCase {
@@ -178,7 +181,6 @@ class BDoubleTests : XCTestCase {
 		}
 	}
 
-	#if !SWIFT_PACKAGE
 	func test_decimalExpansionRandom()
 	{
 		func generateDoubleString(preDecimalCount: Int, postDecimalCount: Int) -> String
@@ -254,7 +256,6 @@ class BDoubleTests : XCTestCase {
 
 		}
 	}
-	#endif
 
 	func testRounding() {
 		XCTAssertEqual(BDouble("-1.0")?.rounded(), BInt("-1"))

diff --git a/Tests/BigNumberTests/Test_BIntMath.swift b/Tests/BigNumberTests/Test_BIntMath.swift
@@ -7,6 +7,9 @@
 //
 
 import XCTest
+#if !COCOAPODS
+@testable import MGTools
+#endif
 @testable import BigNumber
 
 class Test_BIntMath: XCTestCase {

diff --git a/Tests/BigNumberTests/Test_Basic_Math.swift b/Tests/BigNumberTests/Test_Basic_Math.swift
@@ -7,6 +7,9 @@
 //
 
 import XCTest
+#if !COCOAPODS
+@testable import MGTools
+#endif
 @testable import BigNumber
 
 class Test_Basic_Math: XCTestCase {
@@ -30,7 +33,6 @@ class Test_Basic_Math: XCTestCase {
 		let arithmetricInt:  [(Int,  Int ) -> Int ] = [(+), (-), (*), (/), (%)]
 		let arithmetricBInt: [(BInt, BInt) -> BInt] = [(+), (-), (*), (/), (%)]
 
-        #if !SWIFT_PACKAGE
 		for (_, i_op) in (0..<iterations)><(0..<arithmetricInt.count)
 		{
 			let (x, y) = (math.random((-m)...m), math.random((-m)...m))
@@ -39,7 +41,6 @@ class Test_Basic_Math: XCTestCase {
 			let resBInt = (arithmetricBInt[i_op])(BInt(x), BInt(y))
 			XCTAssert(resInt.description == resBInt.description)
 		}
-        #endif
 	}
 
 	func test_Comparison_Operators_BInt()
@@ -53,15 +54,13 @@ class Test_Basic_Math: XCTestCase {
 		let compareInt:  [(Int,   Int) -> Bool] = [(<), (<=), (>), (>=), (==), (!=)]
 		let compareBInt: [(BInt, BInt) -> Bool] = [(<), (<=), (>), (>=), (==), (!=)]
 
-        #if !SWIFT_PACKAGE
 		for (_, i_op) in (0..<iterations)><(0..<compareInt.count)
 		{
 			let (x, y) = (math.random((-m)...m), math.random((-m)...m))
 			let resInt = (compareInt[i_op])(x, y)
 			let resBInt = (compareBInt[i_op])(BInt(x), BInt(y))
 			XCTAssert(resInt == resBInt)
 		}
-        #endif
 	}
 
 	func test_Shift_Operators_BInt()
@@ -72,15 +71,13 @@ class Test_Basic_Math: XCTestCase {
 		let shiftInt:  [(UInt64,  UInt64) -> UInt64] = [(<<), (>>)]
 		let shiftBInt: [(BInt,       Int) -> BInt  ] = [(<<), (>>)]
 
-        #if !SWIFT_PACKAGE
 		for (_, i_op) in (0..<iterations)><(0..<shiftInt.count)
 		{
 			let (x, y) = (math.random(0...58), math.random(0...58))
 			let resInt = (shiftInt[i_op])(UInt64(x), UInt64(y))
 			let resBInt = (shiftBInt[i_op])(BInt(x), y)
 			XCTAssert(resInt == resBInt)
 		}
-        #endif
 	}
 
 	func test_Negation_BInt()
@@ -168,7 +165,6 @@ class Test_Basic_Math: XCTestCase {
 
 	func test_Arithmetric_Operators_BDouble()
 	{
-        #if !SWIFT_PACKAGE
 		for _ in 0..<1000
 		{
 			let a = math.random(-10...10)
@@ -244,7 +240,6 @@ class Test_Basic_Math: XCTestCase {
 				XCTAssert(BInt(sign:  a1.sign, limbs: a1.numerator).description == String(a1Int))
 			}
 		}
-        #endif
 	}
 
     func test_Power() {