Migrate tests to inside library itself

doublesymmetry · Oct 20, 2023 · e887dfc · e887dfc
1 parent 030c400
commit e887dfc
Show file tree

Hide file tree

Showing 56 changed files with 14 additions and 317 deletions.
diff --git a/Example/SwiftAudio.xcodeproj/project.pbxproj b/Example/SwiftAudio.xcodeproj/project.pbxproj
diff --git a/Example/Tests/Info.plist b/Example/Tests/Info.plist
diff --git a/Package.swift b/Package.swift
@@ -13,7 +13,13 @@ let package = Package(
     targets: [
         .target(
             name: "SwiftAudioEx",
-            dependencies: [],
-            path: "SwiftAudioEx/Classes")
+            dependencies: []),
+        .testTarget(
+            name: "SwiftAudioExTests",
+            dependencies: ["SwiftAudioEx"],
+            resources: [
+                .process("Resources")
+            ]
+        ),
     ]
 )
diff --git a/...ses/AVPlayerWrapper/AVPlayerWrapper.swift → ...oEx/AVPlayerWrapper/AVPlayerWrapper.swift b/...ses/AVPlayerWrapper/AVPlayerWrapper.swift → ...oEx/AVPlayerWrapper/AVPlayerWrapper.swift
diff --git a/...ayerWrapper/AVPlayerWrapperDelegate.swift → ...ayerWrapper/AVPlayerWrapperDelegate.swift b/...ayerWrapper/AVPlayerWrapperDelegate.swift → ...ayerWrapper/AVPlayerWrapperDelegate.swift
diff --git a/...ayerWrapper/AVPlayerWrapperProtocol.swift → ...ayerWrapper/AVPlayerWrapperProtocol.swift b/...ayerWrapper/AVPlayerWrapperProtocol.swift → ...ayerWrapper/AVPlayerWrapperProtocol.swift
diff --git a/...VPlayerWrapper/AVPlayerWrapperState.swift → ...VPlayerWrapper/AVPlayerWrapperState.swift b/...VPlayerWrapper/AVPlayerWrapperState.swift → ...VPlayerWrapper/AVPlayerWrapperState.swift
diff --git a/SwiftAudioEx/Classes/AudioItem.swift → Sources/SwiftAudioEx/AudioItem.swift b/SwiftAudioEx/Classes/AudioItem.swift → Sources/SwiftAudioEx/AudioItem.swift
diff --git a/SwiftAudioEx/Classes/AudioPlayer.swift → Sources/SwiftAudioEx/AudioPlayer.swift b/SwiftAudioEx/Classes/AudioPlayer.swift → Sources/SwiftAudioEx/AudioPlayer.swift
diff --git a/SwiftAudioEx/Classes/AudioPlayerError.swift → Sources/SwiftAudioEx/AudioPlayerError.swift b/SwiftAudioEx/Classes/AudioPlayerError.swift → Sources/SwiftAudioEx/AudioPlayerError.swift
diff --git a/...AudioSessionController/AudioSession.swift → ...AudioSessionController/AudioSession.swift b/...AudioSessionController/AudioSession.swift → ...AudioSessionController/AudioSession.swift
diff --git a/...onController/AudioSessionController.swift → ...onController/AudioSessionController.swift b/...onController/AudioSessionController.swift → ...onController/AudioSessionController.swift
diff --git a/SwiftAudioEx/Classes/Event.swift → Sources/SwiftAudioEx/Event.swift b/SwiftAudioEx/Classes/Event.swift → Sources/SwiftAudioEx/Event.swift
diff --git a/...ingInfoController/MediaItemProperty.swift → ...ingInfoController/MediaItemProperty.swift b/...ingInfoController/MediaItemProperty.swift → ...ingInfoController/MediaItemProperty.swift
diff --git a/...InfoController/NowPlayingInfoCenter.swift → ...InfoController/NowPlayingInfoCenter.swift b/...InfoController/NowPlayingInfoCenter.swift → ...InfoController/NowPlayingInfoCenter.swift
diff --git a/...Controller/NowPlayingInfoController.swift → ...Controller/NowPlayingInfoController.swift b/...Controller/NowPlayingInfoController.swift → ...Controller/NowPlayingInfoController.swift
diff --git a/...er/NowPlayingInfoControllerProtocol.swift → ...er/NowPlayingInfoControllerProtocol.swift b/...er/NowPlayingInfoControllerProtocol.swift → ...er/NowPlayingInfoControllerProtocol.swift
diff --git a/...foController/NowPlayingInfoKeyValue.swift → ...foController/NowPlayingInfoKeyValue.swift b/...foController/NowPlayingInfoKeyValue.swift → ...foController/NowPlayingInfoKeyValue.swift
diff --git a/...foController/NowPlayingInfoProperty.swift → ...foController/NowPlayingInfoProperty.swift b/...foController/NowPlayingInfoProperty.swift → ...foController/NowPlayingInfoProperty.swift
diff --git a/...er/AVPlayerItemNotificationObserver.swift → ...er/AVPlayerItemNotificationObserver.swift b/...er/AVPlayerItemNotificationObserver.swift → ...er/AVPlayerItemNotificationObserver.swift
diff --git a/...asses/Observer/AVPlayerItemObserver.swift → ...dioEx/Observer/AVPlayerItemObserver.swift b/...asses/Observer/AVPlayerItemObserver.swift → ...dioEx/Observer/AVPlayerItemObserver.swift
diff --git a/...x/Classes/Observer/AVPlayerObserver.swift → ...ftAudioEx/Observer/AVPlayerObserver.swift b/...x/Classes/Observer/AVPlayerObserver.swift → ...ftAudioEx/Observer/AVPlayerObserver.swift
diff --git a/...asses/Observer/AVPlayerTimeObserver.swift → ...dioEx/Observer/AVPlayerTimeObserver.swift b/...asses/Observer/AVPlayerTimeObserver.swift → ...dioEx/Observer/AVPlayerTimeObserver.swift
diff --git a/SwiftAudioEx/Classes/QueueManager.swift → Sources/SwiftAudioEx/QueueManager.swift b/SwiftAudioEx/Classes/QueueManager.swift → Sources/SwiftAudioEx/QueueManager.swift
diff --git a/SwiftAudioEx/Classes/QueuedAudioPlayer.swift → Sources/SwiftAudioEx/QueuedAudioPlayer.swift b/SwiftAudioEx/Classes/QueuedAudioPlayer.swift → Sources/SwiftAudioEx/QueuedAudioPlayer.swift
diff --git a/...moteCommandController/RemoteCommand.swift → ...moteCommandController/RemoteCommand.swift b/...moteCommandController/RemoteCommand.swift → ...moteCommandController/RemoteCommand.swift
diff --git a/...dController/RemoteCommandController.swift → ...dController/RemoteCommandController.swift b/...dController/RemoteCommandController.swift → ...dController/RemoteCommandController.swift
diff --git a/SwiftAudioEx/Classes/RepeatMode.swift → Sources/SwiftAudioEx/RepeatMode.swift b/SwiftAudioEx/Classes/RepeatMode.swift → Sources/SwiftAudioEx/RepeatMode.swift
diff --git a/...tAudioEx/Classes/TimeEventFrequency.swift → ...ces/SwiftAudioEx/TimeEventFrequency.swift b/...tAudioEx/Classes/TimeEventFrequency.swift → ...ces/SwiftAudioEx/TimeEventFrequency.swift
diff --git a/...oEx/Classes/Utils/DispatchQueueType.swift → ...wiftAudioEx/Utils/DispatchQueueType.swift b/...oEx/Classes/Utils/DispatchQueueType.swift → ...wiftAudioEx/Utils/DispatchQueueType.swift
diff --git a/SwiftAudioEx.podspec b/SwiftAudioEx.podspec
@@ -22,5 +22,5 @@ DESC
 
   s.ios.deployment_target = '11.0'
   s.swift_version = '5.0'
-  s.source_files = 'SwiftAudioEx/Classes/**/*'
+  s.source_files = 'Sources/SwiftAudioEx/**/*'
 end
diff --git a/SwiftAudioEx/Assets/.gitkeep b/SwiftAudioEx/Assets/.gitkeep
diff --git a/SwiftAudioEx/Classes/.gitkeep b/SwiftAudioEx/Classes/.gitkeep
diff --git a/...PlayerItemNotificationObserverTests.swift → ...PlayerItemNotificationObserverTests.swift b/...PlayerItemNotificationObserverTests.swift → ...PlayerItemNotificationObserverTests.swift
diff --git a/...ple/Tests/AVPlayerItemObserverTests.swift → ...ioExTests/AVPlayerItemObserverTests.swift b/...ple/Tests/AVPlayerItemObserverTests.swift → ...ioExTests/AVPlayerItemObserverTests.swift
diff --git a/Example/Tests/AVPlayerObserverTests.swift → ...tAudioExTests/AVPlayerObserverTests.swift b/Example/Tests/AVPlayerObserverTests.swift → ...tAudioExTests/AVPlayerObserverTests.swift
diff --git a/...ple/Tests/AVPlayerTimeObserverTests.swift → ...ioExTests/AVPlayerTimeObserverTests.swift b/...ple/Tests/AVPlayerTimeObserverTests.swift → ...ioExTests/AVPlayerTimeObserverTests.swift
diff --git a/Example/Tests/AVPlayerWrapperTests.swift → ...ftAudioExTests/AVPlayerWrapperTests.swift b/Example/Tests/AVPlayerWrapperTests.swift → ...ftAudioExTests/AVPlayerWrapperTests.swift
diff --git a/Example/Tests/AudioPlayerEventTests.swift → ...tAudioExTests/AudioPlayerEventTests.swift b/Example/Tests/AudioPlayerEventTests.swift → ...tAudioExTests/AudioPlayerEventTests.swift
diff --git a/Example/Tests/AudioPlayerTests.swift → .../SwiftAudioExTests/AudioPlayerTests.swift b/Example/Tests/AudioPlayerTests.swift → .../SwiftAudioExTests/AudioPlayerTests.swift
diff --git a/...e/Tests/AudioSessionControllerTests.swift → ...ExTests/AudioSessionControllerTests.swift b/...e/Tests/AudioSessionControllerTests.swift → ...ExTests/AudioSessionControllerTests.swift
diff --git a/Example/Tests/Mocks/AudioSession.swift → ...wiftAudioExTests/Mocks/AudioSession.swift b/Example/Tests/Mocks/AudioSession.swift → ...wiftAudioExTests/Mocks/AudioSession.swift
diff --git a/Example/Tests/Mocks/MockDispatchQueue.swift → ...udioExTests/Mocks/MockDispatchQueue.swift b/Example/Tests/Mocks/MockDispatchQueue.swift → ...udioExTests/Mocks/MockDispatchQueue.swift
diff --git a/...le/Tests/Mocks/NowPlayingInfoCenter.swift → ...oExTests/Mocks/NowPlayingInfoCenter.swift b/...le/Tests/Mocks/NowPlayingInfoCenter.swift → ...oExTests/Mocks/NowPlayingInfoCenter.swift
diff --git a/...ests/Mocks/NowPlayingInfoController.swift → ...ests/Mocks/NowPlayingInfoController.swift b/...ests/Mocks/NowPlayingInfoController.swift → ...ests/Mocks/NowPlayingInfoController.swift
diff --git a/...Tests/NowPlayingInfoControllerTests.swift → ...Tests/NowPlayingInfoControllerTests.swift b/...Tests/NowPlayingInfoControllerTests.swift → ...Tests/NowPlayingInfoControllerTests.swift
diff --git a/Example/Tests/NowPlayingInfoTests.swift → ...iftAudioExTests/NowPlayingInfoTests.swift b/Example/Tests/NowPlayingInfoTests.swift → ...iftAudioExTests/NowPlayingInfoTests.swift
diff --git a/Example/Tests/QueueManagerTests.swift → ...SwiftAudioExTests/QueueManagerTests.swift b/Example/Tests/QueueManagerTests.swift → ...SwiftAudioExTests/QueueManagerTests.swift
diff --git a/Example/Tests/QueuedAudioPlayerTests.swift → ...AudioExTests/QueuedAudioPlayerTests.swift b/Example/Tests/QueuedAudioPlayerTests.swift → ...AudioExTests/QueuedAudioPlayerTests.swift
diff --git a/Example/Tests/Source/ShortTestSound.m4a → ...AudioExTests/Resources/ShortTestSound.m4a b/Example/Tests/Source/ShortTestSound.m4a → ...AudioExTests/Resources/ShortTestSound.m4a
diff --git a/Example/Tests/Source/TestSound.m4a → ...SwiftAudioExTests/Resources/TestSound.m4a b/Example/Tests/Source/TestSound.m4a → ...SwiftAudioExTests/Resources/TestSound.m4a
diff --git a/Example/Tests/Source/WAV-MP3.wav → ...s/SwiftAudioExTests/Resources/WAV-MP3.wav b/Example/Tests/Source/WAV-MP3.wav → ...s/SwiftAudioExTests/Resources/WAV-MP3.wav
diff --git a/Example/Tests/Source/five_seconds.m4a → ...ftAudioExTests/Resources/five_seconds.m4a b/Example/Tests/Source/five_seconds.m4a → ...ftAudioExTests/Resources/five_seconds.m4a
diff --git a/Example/Tests/Source/nasa_throttle_up.mp3 → ...dioExTests/Resources/nasa_throttle_up.mp3 b/Example/Tests/Source/nasa_throttle_up.mp3 → ...dioExTests/Resources/nasa_throttle_up.mp3
diff --git a/Example/Tests/Utils/Helpers.swift → Tests/SwiftAudioExTests/Utils/Helpers.swift b/Example/Tests/Utils/Helpers.swift → Tests/SwiftAudioExTests/Utils/Helpers.swift
diff --git a/Example/Tests/Source/Source.swift → ...s/SwiftAudioExTests/Utils/Resources.swift b/Example/Tests/Source/Source.swift → ...s/SwiftAudioExTests/Utils/Resources.swift
@@ -1,17 +1,9 @@
-//
-//  Sources.swift
-//  SwiftAudio_Tests
-//
-//  Created by Jørgen Henrichsen on 05/08/2018.
-//  Copyright © 2018 CocoaPods. All rights reserved.
-//
-
 import Foundation
 import SwiftAudioEx
 import UIKit
 
 struct Source {
-    static let path: String = Bundle.main.path(forResource: "TestSound", ofType: "m4a")!
+    static let path: String = Bundle.module.path(forResource: "TestSound", ofType: "m4a")!
     static let url: URL = URL(fileURLWithPath: Source.path)
 
     static func getAudioItem() -> AudioItem {
@@ -20,7 +12,7 @@ struct Source {
 }
 
 struct ShortSource {
-    static let path: String = Bundle.main.path(forResource: "ShortTestSound", ofType: "m4a")!
+    static let path: String = Bundle.module.path(forResource: "ShortTestSound", ofType: "m4a")!
     static let url: URL = URL(fileURLWithPath: ShortSource.path)
 
     static func getAudioItem() -> AudioItem {
@@ -29,7 +21,7 @@ struct ShortSource {
 }
 
 struct LongSource {
-    static let path: String = Bundle.main.path(forResource: "WAV-MP3", ofType: "wav")!
+    static let path: String = Bundle.module.path(forResource: "WAV-MP3", ofType: "wav")!
     static let url: URL = URL(fileURLWithPath: LongSource.path)
 
     static func getAudioItem() -> AudioItem {
@@ -38,7 +30,7 @@ struct LongSource {
 }
 
 struct FiveSecondSource {
-    static let path: String = Bundle.main.path(forResource: "five_seconds", ofType: "m4a")!
+    static let path: String = Bundle.module.path(forResource: "five_seconds", ofType: "m4a")!
     static let url: URL = URL(fileURLWithPath: FiveSecondSource.path)
 
     static func getAudioItem() -> AudioItem {
@@ -47,7 +39,7 @@ struct FiveSecondSource {
 }
 
 struct FiveSecondSourceWithInitialTimeOfFourSeconds {
-    static let path: String = Bundle.main.path(forResource: "five_seconds", ofType: "m4a")!
+    static let path: String = Bundle.module.path(forResource: "five_seconds", ofType: "m4a")!
     static let url: URL = URL(fileURLWithPath: FiveSecondSource.path)
 
     static func getAudioItem() -> AudioItem {