Merge pull request #2627 from spevans/pr_sr_11569_52

[5.2] SR-11569: DateComponents.isValidDate() ignores timeZone

Author: drexin

Foundation/NSCalendar.swift

@@ -1910,7 +1910,7 @@ open class NSDateComponents : NSObject, NSCopying, NSSecureCoding {
         }
         if let date = d {
             let all: NSCalendar.Unit = [.era, .year, .month, .day, .hour, .minute, .second, .weekday, .weekdayOrdinal, .quarter, .weekOfMonth, .weekOfYear, .yearForWeekOfYear]
-            let comps = calendar._bridgeToObjectiveC().components(all, from: date)
+            let comps = cal._bridgeToObjectiveC().components(all, from: date)
             var val = era
             if val != NSDateComponentUndefined {
                 if comps.era != val {

TestFoundation/TestDateComponents.swift

@@ -1,18 +1,13 @@
 // This source file is part of the Swift.org open source project
 //
-// Copyright (c) 2014 - 2018 Apple Inc. and the Swift project authors
+// Copyright (c) 2014 - 2020 Apple Inc. and the Swift project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception
 //
-// See http://swift.org/LICENSE.txt for license information
-// See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 
 class TestDateComponents: XCTestCase {
-    static var allTests: [(String, (TestDateComponents) -> () throws -> Void)] {
-        return [
-            ("test_hash", test_hash),
-        ]
-    }
 
     func test_hash() {
         let c1 = DateComponents(year: 2018, month: 8, day: 1)
@@ -100,4 +95,32 @@ class TestDateComponents: XCTestCase {
             throughValues: integers)
         // isLeapMonth does not have enough values to test it here.
     }
+
+    func test_isValidDate() throws {
+        // SR-11569
+        let calendarTimeZone = try XCTUnwrap(TimeZone(secondsFromGMT: 0))
+        let dateComponentsTimeZone = try XCTUnwrap(TimeZone(secondsFromGMT: 3600))
+
+        var calendar = Calendar(identifier: .gregorian)
+        calendar.timeZone = calendarTimeZone
+
+        var dc = DateComponents()
+        dc.calendar = calendar
+        dc.timeZone = dateComponentsTimeZone
+        dc.year = 2019
+        dc.month = 1
+        dc.day = 2
+        dc.hour = 3
+        dc.minute = 4
+        dc.second = 5
+        dc.nanosecond = 6
+        XCTAssertTrue(dc.isValidDate)
+    }
+
+    static var allTests: [(String, (TestDateComponents) -> () throws -> Void)] {
+        return [
+            ("test_hash", test_hash),
+            ("test_isValidDate", test_isValidDate),
+        ]
+    }
 }