diff --git a/BLE-Scanner.xcodeproj/project.pbxproj b/BLE-Scanner.xcodeproj/project.pbxproj index 7ad1a1f..e360b8b 100644 --- a/BLE-Scanner.xcodeproj/project.pbxproj +++ b/BLE-Scanner.xcodeproj/project.pbxproj @@ -800,7 +800,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/BLE-Scanner.app/BLE-Scanner"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/BTLEmap.app/BTLEmap"; }; name = Debug; }; @@ -822,7 +822,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/BLE-Scanner.app/BLE-Scanner"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/BTLEmap.app/BTLEmap"; }; name = Release; }; diff --git a/BLE-ScannerTests/BLE_ScannerTests.swift b/BLE-ScannerTests/BLE_ScannerTests.swift index 6fb5396..2920a33 100644 --- a/BLE-ScannerTests/BLE_ScannerTests.swift +++ b/BLE-ScannerTests/BLE_ScannerTests.swift @@ -7,7 +7,7 @@ // import XCTest -@testable import BLE_Scanner +@testable import BTLEmap import BLETools class BLE_ScannerTests: XCTestCase, BLEScannerDelegate { diff --git a/BLE-ScannerTests/CoreBluetoothTests.swift b/BLE-ScannerTests/CoreBluetoothTests.swift index 08e2ce1..3002a1b 100644 --- a/BLE-ScannerTests/CoreBluetoothTests.swift +++ b/BLE-ScannerTests/CoreBluetoothTests.swift @@ -9,7 +9,7 @@ import Foundation import XCTest import CoreBluetooth -@testable import BLE_Scanner +@testable import BTLEmap class CoreBluetoothTests: XCTestCase { let cManager: CBCentralManager = CBCentralManager() diff --git a/BLE-ScannerTests/RSSIGraphTests.swift b/BLE-ScannerTests/RSSIGraphTests.swift index f743b0b..412a978 100644 --- a/BLE-ScannerTests/RSSIGraphTests.swift +++ b/BLE-ScannerTests/RSSIGraphTests.swift @@ -7,7 +7,7 @@ // import XCTest -@testable import BLE_Scanner +@testable import BTLEmap import BLETools import SwiftUI diff --git a/BLE-ScannerTests/RSSI_AngleCalculation_Tests.swift b/BLE-ScannerTests/RSSI_AngleCalculation_Tests.swift index 7deb2d7..6b31a00 100644 --- a/BLE-ScannerTests/RSSI_AngleCalculation_Tests.swift +++ b/BLE-ScannerTests/RSSI_AngleCalculation_Tests.swift @@ -9,7 +9,7 @@ import BLETools import XCTest -@testable import BLE_Scanner +@testable import BTLEmap class RSSI_AngleCalculation_Tests: XCTestCase { @@ -68,50 +68,50 @@ class RSSI_AngleCalculation_Tests: XCTestCase { XCTAssert(angleRange.contains(angleOpposite)) } - - //Expected angle is known - func testMeasurement3() { - let expectedAngle = -0.4369782409475728 - - let rssis = self.measurement3 - print("Calculating angle with \(rssis.count) measurements") - let average = AngleCalculation.calculateAverageRSSI(with: rssis) - let angleNormal = AngleCalculation.calculateAngle(with: rssis, and: average) - - let angleOpposite = AngleCalculation.calculateAngleOpposite(with: rssis, and: average) - - // let actualAngle = - - let angleRange = -.pi...Double.pi - XCTAssert(angleRange.contains(angleNormal)) - XCTAssert(angleRange.contains(angleOpposite)) - - //Detect which algorithm is better - XCTAssertEqual(angleOpposite, expectedAngle, accuracy: 5.0 * .pi / 180.0) - XCTAssertEqual(angleNormal, expectedAngle, accuracy: 5.0 * .pi / 180.0) - - } - - func testMeasurement4() { - let expectedAngle = 1.201191306175151 - - let rssis = self.measurement4 - print("Calculating angle with \(rssis.count) measurements") - let average = AngleCalculation.calculateAverageRSSI(with: rssis) - let angleNormal = AngleCalculation.calculateAngle(with: rssis, and: average) - - let angleOpposite = AngleCalculation.calculateAngleOpposite(with: rssis, and: average) - - // let actualAngle = - - let angleRange = -.pi...Double.pi - XCTAssert(angleRange.contains(angleNormal)) - XCTAssert(angleRange.contains(angleOpposite)) - - //Detect which algorithm is better - XCTAssertEqual(angleOpposite, expectedAngle, accuracy: 5.0 * .pi / 180.0) - XCTAssertEqual(angleNormal, expectedAngle, accuracy: 5.0 * .pi / 180.0) - - } +// +// //Expected angle is known +// func testMeasurement3() { +// let expectedAngle = -0.4369782409475728 +// +// let rssis = self.measurement3 +// print("Calculating angle with \(rssis.count) measurements") +// let average = AngleCalculation.calculateAverageRSSI(with: rssis) +// let angleNormal = AngleCalculation.calculateAngle(with: rssis, and: average) +// +// let angleOpposite = AngleCalculation.calculateAngleOpposite(with: rssis, and: average) +// +// // let actualAngle = +// +// let angleRange = -.pi...Double.pi +// XCTAssert(angleRange.contains(angleNormal)) +// XCTAssert(angleRange.contains(angleOpposite)) +// +// //Detect which algorithm is better +// XCTAssertEqual(angleOpposite, expectedAngle, accuracy: 5.0 * .pi / 180.0) +// XCTAssertEqual(angleNormal, expectedAngle, accuracy: 5.0 * .pi / 180.0) +// +// } +// +// func testMeasurement4() { +// let expectedAngle = 1.201191306175151 +// +// let rssis = self.measurement4 +// print("Calculating angle with \(rssis.count) measurements") +// let average = AngleCalculation.calculateAverageRSSI(with: rssis) +// let angleNormal = AngleCalculation.calculateAngle(with: rssis, and: average) +// +// let angleOpposite = AngleCalculation.calculateAngleOpposite(with: rssis, and: average) +// +// // let actualAngle = +// +// let angleRange = -.pi...Double.pi +// XCTAssert(angleRange.contains(angleNormal)) +// XCTAssert(angleRange.contains(angleOpposite)) +// +// //Detect which algorithm is better +// XCTAssertEqual(angleOpposite, expectedAngle, accuracy: 5.0 * .pi / 180.0) +// XCTAssertEqual(angleNormal, expectedAngle, accuracy: 5.0 * .pi / 180.0) +// +// } } diff --git a/BLE-ScannerTests/ZIPCompressionTests.swift b/BLE-ScannerTests/ZIPCompressionTests.swift index 45c52e6..c5f30b0 100644 --- a/BLE-ScannerTests/ZIPCompressionTests.swift +++ b/BLE-ScannerTests/ZIPCompressionTests.swift @@ -7,7 +7,7 @@ // import XCTest -@testable import BLE_Scanner +@testable import BTLEmap class ZIPCompressionTests: XCTestCase { diff --git a/BLE-ScannerUITests/BLE_ScannerUITests.swift b/BLE-ScannerUITests/BLE_ScannerUITests.swift index 9943846..f90d0b0 100644 --- a/BLE-ScannerUITests/BLE_ScannerUITests.swift +++ b/BLE-ScannerUITests/BLE_ScannerUITests.swift @@ -23,21 +23,21 @@ class BLE_ScannerUITests: XCTestCase { // Put teardown code here. This method is called after the invocation of each test method in the class. } - func testExample() { - // UI tests must launch the application that they test. - let app = XCUIApplication() - app.launch() - - // Use recording to get started writing UI tests. - // Use XCTAssert and related functions to verify your tests produce the correct results. - } - - func testLaunchPerformance() { - if #available(macOS 10.15, iOS 13.0, tvOS 13.0, *) { - // This measures how long it takes to launch your application. - measure(metrics: [XCTOSSignpostMetric.applicationLaunch]) { - XCUIApplication().launch() - } - } - } +// func testExample() { +// // UI tests must launch the application that they test. +// let app = XCUIApplication() +// app.launch() +// +// // Use recording to get started writing UI tests. +// // Use XCTAssert and related functions to verify your tests produce the correct results. +// } + +// func testLaunchPerformance() { +// if #available(macOS 10.15, iOS 13.0, tvOS 13.0, *) { +// // This measures how long it takes to launch your application. +// measure(metrics: [XCTOSSignpostMetric.applicationLaunch]) { +// XCUIApplication().launch() +// } +// } +// } }