From 1bee90aa8fd39b4b9071af4dd54c491d1bdfec8c Mon Sep 17 00:00:00 2001 From: Timofey Solomko Date: Fri, 9 Dec 2016 09:21:42 +0300 Subject: [PATCH] Fixed gzip tests incompatibility. --- Sources/GzipArchive.swift | 2 +- Tests/GzipTests.swift | 32 ++++++++++++++++---------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Sources/GzipArchive.swift b/Sources/GzipArchive.swift index 2878836c..6f22d171 100644 --- a/Sources/GzipArchive.swift +++ b/Sources/GzipArchive.swift @@ -65,7 +65,7 @@ public class GzipArchive: Archive { static func serviceInfo(pointerData: DataWithPointer) throws -> ServiceInfo { // First two bytes should be correct 'magic' bytes let magic = pointerData.intFromBits(count: 16) - guard magic == 0x1f8b else { throw GzipError.WrongMagic } + guard magic == 0x8b1f else { throw GzipError.WrongMagic } // Third byte is a method of compression. Only type 8 (DEFLATE) compression is supported let method = pointerData.alignedByte() diff --git a/Tests/GzipTests.swift b/Tests/GzipTests.swift index 81449f72..5a8b5fc5 100644 --- a/Tests/GzipTests.swift +++ b/Tests/GzipTests.swift @@ -5,7 +5,7 @@ // Created by Timofey Solomko on 14.11.16. // Copyright © 2016 Timofey Solomko. All rights reserved. // - +// import XCTest @testable import SWCompression @@ -23,15 +23,15 @@ class GzipTests: XCTestCase { XCTFail("Failed to get service info") return } - + XCTAssertEqual(testServiceInfo, answerServiceInfo, "Incorrect service info") } func testGzip1() { - self.perform(test: "test1", answer: GzipArchive.ServiceInfo(magic: [31, 139], + self.perform(test: "test1", answer: GzipArchive.ServiceInfo(magic: 0x8b1f, method: 8, flags: 8, - mtime: [219, 127, 19, 88], + mtime: 1477672923, extraFlags: 0, osType: 3, fileName: "test.txt", @@ -40,10 +40,10 @@ class GzipTests: XCTestCase { } func testGzip2() { - self.perform(test: "test2", answer: GzipArchive.ServiceInfo(magic: [31, 139], + self.perform(test: "test2", answer: GzipArchive.ServiceInfo(magic: 0x8b1f, method: 8, flags: 8, - mtime: [193, 93, 43, 88], + mtime: 1479237057, extraFlags: 0, osType: 3, fileName: "test2.answer", @@ -53,10 +53,10 @@ class GzipTests: XCTestCase { func testGzip3() { - self.perform(test: "test3", answer: GzipArchive.ServiceInfo(magic: [31, 139], + self.perform(test: "test3", answer: GzipArchive.ServiceInfo(magic: 0x8b1f, method: 8, flags: 8, - mtime: [27, 94, 43, 88], + mtime: 1479237147, extraFlags: 0, osType: 3, fileName: "test3.answer", @@ -65,10 +65,10 @@ class GzipTests: XCTestCase { } func testGzip4() { - self.perform(test: "test4", answer: GzipArchive.ServiceInfo(magic: [31, 139], + self.perform(test: "test4", answer: GzipArchive.ServiceInfo(magic: 0x8b1f, method: 8, flags: 8, - mtime: [190, 130, 19, 88], + mtime: 1477673662, extraFlags: 0, osType: 3, fileName: "secondtest.txt", @@ -77,10 +77,10 @@ class GzipTests: XCTestCase { } func testGzip5() { - self.perform(test: "test5", answer: GzipArchive.ServiceInfo(magic: [31, 139], + self.perform(test: "test5", answer: GzipArchive.ServiceInfo(magic: 0x8b1f, method: 8, flags: 8, - mtime: [232, 229, 20, 88], + mtime: 1477764584, extraFlags: 0, osType: 3, fileName: "empty.txt", @@ -89,10 +89,10 @@ class GzipTests: XCTestCase { } func testGzip6() { - self.perform(test: "test6", answer: GzipArchive.ServiceInfo(magic: [31, 139], + self.perform(test: "test6", answer: GzipArchive.ServiceInfo(magic: 0x8b1f, method: 8, flags: 8, - mtime: [107, 95, 43, 88], + mtime: 1479237483, extraFlags: 0, osType: 3, fileName: "test6.answer", @@ -101,10 +101,10 @@ class GzipTests: XCTestCase { } func testGzip7() { - self.perform(test: "test7", answer: GzipArchive.ServiceInfo(magic: [31, 139], + self.perform(test: "test7", answer: GzipArchive.ServiceInfo(magic: 0x8b1f, method: 8, flags: 8, - mtime: [233, 74, 48, 88], + mtime: 1479559913, extraFlags: 0, osType: 3, fileName: "test7.answer",