From 744d3074acbbff992d89990dbacbc1cba129901c Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 24 Jan 2019 14:34:31 -0500 Subject: [PATCH] Fix link preview tests. --- .../src/Messages/Interactions/OWSLinkPreview.swift | 2 +- .../tests/Messages/OWSLinkPreviewTest.swift | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift b/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift index 6fb9b96fc..249d75344 100644 --- a/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift +++ b/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift @@ -167,7 +167,7 @@ public class OWSLinkPreview: MTLModel { let linkPreview = OWSLinkPreview(urlString: urlString, title: title, imageAttachmentId: imageAttachmentId) guard linkPreview.isValid() else { - owsFailDebug("Preview has neither title nor image.") + Logger.error("Preview has neither title nor image.") throw LinkPreviewError.invalidInput } diff --git a/SignalServiceKit/tests/Messages/OWSLinkPreviewTest.swift b/SignalServiceKit/tests/Messages/OWSLinkPreviewTest.swift index b41d30ee0..43930ce86 100644 --- a/SignalServiceKit/tests/Messages/OWSLinkPreviewTest.swift +++ b/SignalServiceKit/tests/Messages/OWSLinkPreviewTest.swift @@ -28,7 +28,7 @@ class OWSLinkPreviewTest: SSKBaseTestSwift { imageAttachmentBuilder.setContentType(OWSMimeTypeImageJpeg) previewBuilder.setImage(try! imageAttachmentBuilder.build()) let dataBuilder = SSKProtoDataMessage.builder() - dataBuilder.setPreview(try! previewBuilder.build()) + dataBuilder.addPreview(try! previewBuilder.build()) self.readWrite { (transaction) in XCTAssertNotNil(try! OWSLinkPreview.buildValidatedLinkPreview(dataMessage: try! dataBuilder.build(), @@ -43,7 +43,7 @@ class OWSLinkPreviewTest: SSKBaseTestSwift { let previewBuilder = SSKProtoDataMessagePreview.builder(url: url) previewBuilder.setTitle("Some Youtube Video") let dataBuilder = SSKProtoDataMessage.builder() - dataBuilder.setPreview(try! previewBuilder.build()) + dataBuilder.addPreview(try! previewBuilder.build()) self.readWrite { (transaction) in XCTAssertNotNil(try! OWSLinkPreview.buildValidatedLinkPreview(dataMessage: try! dataBuilder.build(), @@ -61,7 +61,7 @@ class OWSLinkPreviewTest: SSKBaseTestSwift { imageAttachmentBuilder.setContentType(OWSMimeTypeImageJpeg) previewBuilder.setImage(try! imageAttachmentBuilder.build()) let dataBuilder = SSKProtoDataMessage.builder() - dataBuilder.setPreview(try! previewBuilder.build()) + dataBuilder.addPreview(try! previewBuilder.build()) self.readWrite { (transaction) in XCTAssertNotNil(try! OWSLinkPreview.buildValidatedLinkPreview(dataMessage: try! dataBuilder.build(), @@ -75,13 +75,13 @@ class OWSLinkPreviewTest: SSKBaseTestSwift { let body = "\(url)" let previewBuilder = SSKProtoDataMessagePreview.builder(url: url) let dataBuilder = SSKProtoDataMessage.builder() - dataBuilder.setPreview(try! previewBuilder.build()) + dataBuilder.addPreview(try! previewBuilder.build()) self.readWrite { (transaction) in do { _ = try OWSLinkPreview.buildValidatedLinkPreview(dataMessage: try! dataBuilder.build(), - body: body, - transaction: transaction) + body: body, + transaction: transaction) XCTFail("Missing expected error.") } catch { // Do nothing.