Adds Driver and NSNotificationCenter tests to Linux.

zsoltkiss · Oct 22, 2016 · 90b5b86 · 90b5b86
1 parent e4dd325
commit 90b5b86
Show file tree

Hide file tree

Showing 7 changed files with 81 additions and 4 deletions.
diff --git a/Sources/AllTestz/Driver+Extensions.swift b/Sources/AllTestz/Driver+Extensions.swift
@@ -0,0 +1 @@
+../../Tests/RxCocoaTests/Driver+Extensions.swift
diff --git a/Sources/AllTestz/Driver+Test.swift b/Sources/AllTestz/Driver+Test.swift
@@ -0,0 +1 @@
+../../Tests/RxCocoaTests/Driver+Test.swift
diff --git a/Sources/AllTestz/NSNotificationCenterTests.swift b/Sources/AllTestz/NSNotificationCenterTests.swift
@@ -0,0 +1 @@
+../../Tests/RxCocoaTests/NSNotificationCenterTests.swift
diff --git a/Sources/AllTestz/main.swift b/Sources/AllTestz/main.swift
@@ -573,6 +573,19 @@ final class ObservableSubscriptionTests_ : ObservableSubscriptionTests, RxTestCa
  ] }
 }
 
+final class NSNotificationCenterTests_ : NSNotificationCenterTests, RxTestCase {
+ #if os(macOS)
+ required override init() {
+ super.init()
+ }
+ #endif
+
+ static var allTests: [(String, (NSNotificationCenterTests_) -> () -> ())] { return [
+ ("testNotificationCenterWithoutObject", NSNotificationCenterTests.testNotificationCenterWithoutObject),
+ ("testNotificationCenterWithObject", NSNotificationCenterTests.testNotificationCenterWithObject),
+ ] }
+}
+
 final class DisposableTest_ : DisposableTest, RxTestCase {
  #if os(macOS)
  required override init() {
@@ -1030,6 +1043,60 @@ final class AnonymousObservableTests_ : AnonymousObservableTests, RxTestCase {
  ] }
 }
 
+final class DriverTest_ : DriverTest, RxTestCase {
+ #if os(macOS)
+ required override init() {
+ super.init()
+ }
+ #endif
+
+ static var allTests: [(String, (DriverTest_) -> () -> ())] { return [
+ ("testDriverSharing_WhenErroring", DriverTest.testDriverSharing_WhenErroring),
+ ("testDriverSharing_WhenCompleted", DriverTest.testDriverSharing_WhenCompleted),
+ ("testVariableAsDriver", DriverTest.testVariableAsDriver),
+ ("testAsDriver_onErrorJustReturn", DriverTest.testAsDriver_onErrorJustReturn),
+ ("testAsDriver_onErrorDriveWith", DriverTest.testAsDriver_onErrorDriveWith),
+ ("testAsDriver_onErrorRecover", DriverTest.testAsDriver_onErrorRecover),
+ ("testAsDriver_deferred", DriverTest.testAsDriver_deferred),
+ ("testAsDriver_map", DriverTest.testAsDriver_map),
+ ("testAsDriver_filter", DriverTest.testAsDriver_filter),
+ ("testAsDriver_switchLatest", DriverTest.testAsDriver_switchLatest),
+ ("testAsDriver_flatMapLatest", DriverTest.testAsDriver_flatMapLatest),
+ ("testAsDriver_flatMapFirst", DriverTest.testAsDriver_flatMapFirst),
+ ("testAsDriver_doOn", DriverTest.testAsDriver_doOn),
+ ("testAsDriver_doOnNext", DriverTest.testAsDriver_doOnNext),
+ ("testAsDriver_doOnCompleted", DriverTest.testAsDriver_doOnCompleted),
+ ("testAsDriver_distinctUntilChanged1", DriverTest.testAsDriver_distinctUntilChanged1),
+ ("testAsDriver_distinctUntilChanged2", DriverTest.testAsDriver_distinctUntilChanged2),
+ ("testAsDriver_distinctUntilChanged3", DriverTest.testAsDriver_distinctUntilChanged3),
+ ("testAsDriver_distinctUntilChanged4", DriverTest.testAsDriver_distinctUntilChanged4),
+ ("testAsDriver_flatMap", DriverTest.testAsDriver_flatMap),
+ ("testAsDriver_merge", DriverTest.testAsDriver_merge),
+ ("testAsDriver_merge2", DriverTest.testAsDriver_merge2),
+ ("testAsDriver_debounce", DriverTest.testAsDriver_debounce),
+ ("testAsDriver_throttle", DriverTest.testAsDriver_throttle),
+ ("testAsDriver_scan", DriverTest.testAsDriver_scan),
+ ("testAsDriver_concat_sequenceType", DriverTest.testAsDriver_concat_sequenceType),
+ ("testAsDriver_concat", DriverTest.testAsDriver_concat),
+ ("testAsDriver_combineLatest_array", DriverTest.testAsDriver_combineLatest_array),
+ ("testAsDriver_combineLatest", DriverTest.testAsDriver_combineLatest),
+ ("testAsDriver_zip_array", DriverTest.testAsDriver_zip_array),
+ ("testAsDriver_zip", DriverTest.testAsDriver_zip),
+ ("testAsDriver_withLatestFrom", DriverTest.testAsDriver_withLatestFrom),
+ ("testAsDriver_withLatestFromDefaultOverload", DriverTest.testAsDriver_withLatestFromDefaultOverload),
+ ("testAsDriver_skip", DriverTest.testAsDriver_skip),
+ ("testAsDriver_startWith", DriverTest.testAsDriver_startWith),
+ ("testAsDriver_interval", DriverTest.testAsDriver_interval),
+ ("testAsDriver_timer", DriverTest.testAsDriver_timer),
+ ("testDriveObserver", DriverTest.testDriveObserver),
+ ("testDriveOptionalObserver", DriverTest.testDriveOptionalObserver),
+ ("testDriveNoAmbiguity", DriverTest.testDriveNoAmbiguity),
+ ("testdriveVariable", DriverTest.testdriveVariable),
+ ("testDriveOptionalVariable", DriverTest.testDriveOptionalVariable),
+ ("testDriveVariableNoAmbiguity", DriverTest.testDriveVariableNoAmbiguity),
+ ] }
+}
+
 final class CurrentThreadSchedulerTest_ : CurrentThreadSchedulerTest, RxTestCase {
  #if os(macOS)
  required override init() {
@@ -1086,6 +1153,7 @@ func XCTMain(_ tests: [() -> ()]) {
  testCase(ReactiveTests_.allTests),
  testCase(ReplaySubjectTest_.allTests),
  testCase(ObservableSubscriptionTests_.allTests),
+ testCase(NSNotificationCenterTests_.allTests),
  testCase(DisposableTest_.allTests),
  testCase(HistoricalSchedulerTest_.allTests),
  testCase(MainSchedulerTest_.allTests),
@@ -1099,6 +1167,7 @@ func XCTMain(_ tests: [() -> ()]) {
  testCase(ObservableConcurrentSchedulerConcurrencyTest_.allTests),
  testCase(ObservableDebugTest_.allTests),
  testCase(AnonymousObservableTests_.allTests),
+ testCase(DriverTest_.allTests),
  testCase(CurrentThreadSchedulerTest_.allTests),
  ])
 //}
diff --git a/Tests/RxCocoaTests/Driver+Test.swift b/Tests/RxCocoaTests/Driver+Test.swift
@@ -7,6 +7,7 @@
 //
 
 import Foundation
+import Dispatch
 import RxSwift
 import RxCocoa
 import XCTest
@@ -768,7 +769,7 @@ extension DriverTest {
 
  func testAsDriver_throttle() {
  let hotObservable = BackgroundThreadPrimitiveHotObservable<Int>()
- let driver = hotObservable.asDriver(onErrorJustReturn: -1).throttle(1.0)
+ let driver = hotObservable.asDriver(onErrorJustReturn: -1).throttle(0.5)
 
  let results = subscribeTwiceOnBackgroundSchedulerAndOnlyOneSubscription(driver) {
  XCTAssertTrue(hotObservable.subscriptions == [SubscribedToHotObservable])

diff --git a/scripts/all-tests.sh b/scripts/all-tests.sh
@@ -190,13 +190,13 @@ fi
 
 if [ "${VALIDATE_UNIX}" -eq 1 ]; then
  if [[ "${UNIX_NAME}" == "${DARWIN}" ]]; then
- # compile and run playgrounds
- . scripts/validate-playgrounds.sh
-
  if [[ "${RX_RUN_LINUX_TESTS}" -eq 1 ]]; then
  ./scripts/test-linux.sh
  fi
 
+ # compile and run playgrounds
+ . scripts/validate-playgrounds.sh
+
  # make sure macOS builds
  for scheme in "RxExample-macOS"
  do
@@ -266,6 +266,7 @@ else
 fi
 
 if [ "${TEST_SPM}" -eq 1 ]; then
+ rm -rf build || true
  swift build -c Release
  swift build -c Debug
 else

diff --git a/scripts/package-spm.swift b/scripts/package-spm.swift
@@ -279,6 +279,9 @@ try packageRelativePath([
  "Tests/TestErrors.swift",
  "Tests/XCTest+AllTests.swift",
  "Platform",
+ "Tests/RxCocoaTests/Driver+Test.swift",
+ "Tests/RxCocoaTests/Driver+Extensions.swift",
+ "Tests/RxCocoaTests/NSNotificationCenterTests.swift",
  ],
  targetDirName: "AllTestz",
  excluded: [