From b197e4776e8ac34dbccec78daf7c4f6ef8e2a726 Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Mon, 23 Jul 2018 14:10:26 -0400
Subject: [PATCH] Respond to CR.

---
 Signal/test/util/ByteParserTest.swift | 67 ++++++++++++++++++++++++---
 1 file changed, 60 insertions(+), 7 deletions(-)

diff --git a/Signal/test/util/ByteParserTest.swift b/Signal/test/util/ByteParserTest.swift
index 192d95c9c..c70644c65 100644
--- a/Signal/test/util/ByteParserTest.swift
+++ b/Signal/test/util/ByteParserTest.swift
@@ -9,10 +9,6 @@ class ByteParserTest: XCTestCase {
 
     override func setUp() {
         super.setUp()
-//         self.imageCache = ImageCache()
-//        imageCache.setImage(firstVariation, forKey:cacheKey1, diameter:100)
-//        imageCache.setImage(secondVariation, forKey:cacheKey1, diameter:200)
-//        imageCache.setImage(otherImage, forKey:cacheKey2, diameter:100)
     }
 
     override func tearDown() {
@@ -29,7 +25,7 @@ class ByteParserTest: XCTestCase {
         XCTAssertTrue(parser.hasError)
     }
 
-    func testGetShort() {
+    func testGetShort_littleEndian() {
         let data = Data(bytes: [0x01, 0x00, 0x00, 0x01, 0x01, 0x01 ])
         let parser = ByteParser(data: data, littleEndian: true)
         XCTAssertNotNil(parser)
@@ -48,6 +44,25 @@ class ByteParserTest: XCTestCase {
         XCTAssertTrue(parser.hasError)
     }
 
+    func testGetShort_bigEndian() {
+        let data = Data(bytes: [0x01, 0x00, 0x00, 0x01, 0x01, 0x01 ])
+        let parser = ByteParser(data: data, littleEndian: false)
+        XCTAssertNotNil(parser)
+        XCTAssertFalse(parser.hasError)
+
+        XCTAssertEqual(256, parser.nextShort())
+        XCTAssertFalse(parser.hasError)
+
+        XCTAssertEqual(1, parser.nextShort())
+        XCTAssertFalse(parser.hasError)
+
+        XCTAssertEqual(257, parser.nextShort())
+        XCTAssertFalse(parser.hasError)
+
+        XCTAssertEqual(0, parser.nextShort())
+        XCTAssertTrue(parser.hasError)
+    }
+
     func testGetInt_Empty() {
         let parser = ByteParser(data: Data(), littleEndian: true)
         XCTAssertNotNil(parser)
@@ -57,7 +72,7 @@ class ByteParserTest: XCTestCase {
         XCTAssertTrue(parser.hasError)
     }
 
-    func testGetInt() {
+    func testGetInt_littleEndian() {
         let data = Data(bytes: [0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00 ])
         let parser = ByteParser(data: data, littleEndian: true)
         XCTAssertNotNil(parser)
@@ -76,6 +91,25 @@ class ByteParserTest: XCTestCase {
         XCTAssertTrue(parser.hasError)
     }
 
+    func testGetInt_bigEndian() {
+        let data = Data(bytes: [0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01 ])
+        let parser = ByteParser(data: data, littleEndian: false)
+        XCTAssertNotNil(parser)
+        XCTAssertFalse(parser.hasError)
+
+        XCTAssertEqual(1, parser.nextInt())
+        XCTAssertFalse(parser.hasError)
+
+        XCTAssertEqual(256, parser.nextInt())
+        XCTAssertFalse(parser.hasError)
+
+        XCTAssertEqual(257, parser.nextInt())
+        XCTAssertFalse(parser.hasError)
+
+        XCTAssertEqual(0, parser.nextInt())
+        XCTAssertTrue(parser.hasError)
+    }
+
     func testGetLong_Empty() {
         let parser = ByteParser(data: Data(), littleEndian: true)
         XCTAssertNotNil(parser)
@@ -85,7 +119,7 @@ class ByteParserTest: XCTestCase {
         XCTAssertTrue(parser.hasError)
     }
 
-    func testGetLong() {
+    func testGetLong_littleEndian() {
         let data = Data(bytes: [0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 ])
         let parser = ByteParser(data: data, littleEndian: true)
         XCTAssertNotNil(parser)
@@ -104,6 +138,25 @@ class ByteParserTest: XCTestCase {
         XCTAssertTrue(parser.hasError)
     }
 
+    func testGetLong_bigEndian() {
+        let data = Data(bytes: [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01 ])
+        let parser = ByteParser(data: data, littleEndian: false)
+        XCTAssertNotNil(parser)
+        XCTAssertFalse(parser.hasError)
+
+        XCTAssertEqual(1, parser.nextLong())
+        XCTAssertFalse(parser.hasError)
+
+        XCTAssertEqual(256, parser.nextLong())
+        XCTAssertFalse(parser.hasError)
+
+        XCTAssertEqual(257, parser.nextLong())
+        XCTAssertFalse(parser.hasError)
+
+        XCTAssertEqual(0, parser.nextLong())
+        XCTAssertTrue(parser.hasError)
+    }
+
     func testReadZero_Empty() {
         let parser = ByteParser(data: Data(), littleEndian: true)
         XCTAssertNotNil(parser)