Merge pull request #46 from klefevre/fix/mailimap_set_conversion

Fix mailimap_set conversion (+ add tests)

Author: Kevin Lefèvre

Postal/IMAPSession+Fetch.swift

@@ -125,10 +125,10 @@ extension IndexSet {
         let result: UnsafeMutablePointer<mailimap_set> = mailimap_set_new_empty()
 
         rangeView.forEach { (range) in
-            let safeLocation = UInt32(truncatingBitPattern: range.startIndex)
-            let safeLength = UInt32(truncatingBitPattern: range.upperBound)
+            let safeFirst = UInt32(truncatingBitPattern: range.startIndex)
+            let safeLast = UInt32(truncatingBitPattern: range.upperBound - 1)
 
-            mailimap_set_add_interval(result, safeLocation, safeLength)
+            mailimap_set_add_interval(result, safeFirst, safeLast)
         }
         return result
     }

Postal/Libetpan+Util.swift

@@ -200,10 +200,10 @@ extension mailimap_set {
         var result: IndexSet = IndexSet()
 
         sequence(set_list, of: mailimap_set_item.self)
-            .map { (item: mailimap_set_item) -> CountableRange<Int> in
-                return Int(item.set_first)..<Int(item.set_last)
+            .map { (item: mailimap_set_item) -> CountableClosedRange<Int> in
+                return Int(item.set_first)...Int(item.set_last)
             }
-            .forEach { (range: CountableRange<Int>) in
+            .forEach { (range: CountableClosedRange<Int>) in
                 result.insert(integersIn: range)
             }
         return result
@@ -213,10 +213,10 @@ extension mailimap_set {
         var result: [Int] = []
 
         sequence(set_list, of: mailimap_set_item.self)
-            .map { (item: mailimap_set_item) -> CountableRange<Int> in
-                return Int(item.set_first)..<Int(item.set_last)
+            .map { (item: mailimap_set_item) -> CountableClosedRange<Int> in
+                return Int(item.set_first)...Int(item.set_last)
             }
-            .forEach { (range: CountableRange<Int>) in
+            .forEach { (range: CountableClosedRange<Int>) in
                 result.append(contentsOf: range)
             }
         return result

PostalTests/IMAPSessionTests.swift

@@ -74,9 +74,21 @@ extension IMAPSessionTests {
 // TODO: We should test retrieved ids as well as the number of messages count
 
 extension IMAPSessionTests {
+    
+    func test_fetch_one_message_from_uid() throws {
+        let indexSet = IndexSet(integer: 50)
+        
+        var results = [FetchResult]()
+        try imapSession.fetchMessages("INBOX", set: .uid(indexSet), flags: []) { results.append($0) }
+        
+        print("1 messages:");
+        results.forEach { print("\t\($0)") }
+        
+        XCTAssertEqual(results.count, 1, "should have retrieved the 1 first messages")
+    }
 
     func test_fetch_ten_first_messages() throws {
-        let indexSet = IndexSet(1..<10)
+        let indexSet = IndexSet(1...10)
 
         var results = [FetchResult]()
         try imapSession.fetchMessages("INBOX", set: .indexes(indexSet), flags: []) { results.append($0) }

PostalTests/LibetpanConversionTests.swift

@@ -12,7 +12,21 @@ import libetpan
 
 class LibetpanConversionTests: XCTestCase {
 
-    func test_indexset_to_imapset() {
+    func test_indexset_to_imapset_with_one_value() {
+        let givenIndexSet = IndexSet(integer: 50)
+        
+        let retrievedImapSet = givenIndexSet.unreleasedMailimapSet
+        defer { mailimap_set_free(retrievedImapSet) }
+        
+        let retrievedImapSetSequence = sequence(retrievedImapSet.pointee.set_list, of: mailimap_set_item.self)
+        retrievedImapSetSequence.enumerated().forEach { (offset: Int, element: mailimap_set_item) in
+            let givenRange = givenIndexSet.rangeView[offset]
+            XCTAssertEqual(Int(element.set_first), givenRange.lowerBound)
+            XCTAssertEqual(Int(element.set_last), givenRange.upperBound - 1)
+        }
+    }
+    
+    func test_indexset_to_imapset_with_multiple_values() {
         var givenIndexSet = IndexSet(1...5)
         givenIndexSet.remove(3)
 
@@ -23,7 +37,7 @@ class LibetpanConversionTests: XCTestCase {
         retrievedImapSetSequence.enumerated().forEach { (offset: Int, element: mailimap_set_item) in
             let givenRange = givenIndexSet.rangeView[offset]
             XCTAssertEqual(Int(element.set_first), givenRange.lowerBound)
-            XCTAssertEqual(Int(element.set_last), givenRange.upperBound)
+            XCTAssertEqual(Int(element.set_last), givenRange.upperBound - 1)
         }
     }
 
@@ -44,8 +58,19 @@ class LibetpanConversionTests: XCTestCase {
             XCTAssertEqual(element.set_last, expectedUpperBound)
         }
     }
+
+    func test_imapset_to_indexset_with_one_value() {
+        let expectedIndexSet = IndexSet(integer: 42)
+        
+        let imapSet = expectedIndexSet.unreleasedMailimapSet
+        defer { mailimap_set_free(imapSet) }
+        
+        let retrievedIndexSet = imapSet.pointee.indexSet
+        
+        XCTAssertEqual(expectedIndexSet, retrievedIndexSet)
+    }
 
-    func test_imapset_to_indexset() {
+    func test_imapset_to_indexset_with_multiple_values() {
         var expectedIndexSet = IndexSet(1...5)
         expectedIndexSet.remove(3)
 
@@ -57,7 +82,19 @@ class LibetpanConversionTests: XCTestCase {
         XCTAssertEqual(expectedIndexSet, retrievedIndexSet)
     }
 
-    func test_imapset_to_array() {
+    func test_imapset_to_array_with_one_value() {
+        let expectedIndexSet = IndexSet(integer: 42)
+        
+        let imapSet = expectedIndexSet.unreleasedMailimapSet
+        defer { mailimap_set_free(imapSet) }
+        
+        let expectedArray = [42]
+        let retrievedArray = imapSet.pointee.array
+        
+        XCTAssertEqual(expectedArray, retrievedArray)
+    }
+    
+    func test_imapset_to_array_with_multiple_values() {
         var expectedIndexSet = IndexSet(1...5)
         expectedIndexSet.remove(3)