From 94cf7b01d8b402a09e399090b1b556dd3ec7b651 Mon Sep 17 00:00:00 2001 From: Haesu Gwon Date: Sat, 31 Mar 2018 16:16:34 +0900 Subject: [PATCH] [Multimedia][Non-ACR] Add null conditional operator Change-Id: Ib0aac422f1f6241f0fc6cc590aa9e0f293551c89 Signed-off-by: Haesu Gwon (cherry picked from commit bb83e1cbb073467668cb7d8c436cb658e6b66163) --- .../Tizen.Metadata.Tests/testcase/MetadataEditor/TSMetadataEditor.cs | 2 +- .../testcase/MetadataExtractor/TSAudioMetadata.cs | 2 +- .../Tizen.Metadata.Tests/testcase/MetadataExtractor/TSMetadata.cs | 2 +- .../testcase/MetadataExtractor/TSMetadataExtractor.cs | 4 ++-- .../testcase/MetadataExtractor/TSVideoMetadata.cs | 2 +- .../Tizen.MultimediaUtil.Tests/testcase/ImageUtil/TSBitmapFrame.cs | 4 +--- 6 files changed, 7 insertions(+), 9 deletions(-) mode change 100755 => 100644 tct-suite-vs/Tizen.Metadata.Tests/testcase/MetadataEditor/TSMetadataEditor.cs mode change 100755 => 100644 tct-suite-vs/Tizen.Metadata.Tests/testcase/MetadataExtractor/TSAudioMetadata.cs mode change 100755 => 100644 tct-suite-vs/Tizen.Metadata.Tests/testcase/MetadataExtractor/TSMetadata.cs mode change 100755 => 100644 tct-suite-vs/Tizen.Metadata.Tests/testcase/MetadataExtractor/TSMetadataExtractor.cs mode change 100755 => 100644 tct-suite-vs/Tizen.Metadata.Tests/testcase/MetadataExtractor/TSVideoMetadata.cs mode change 100755 => 100644 tct-suite-vs/Tizen.MultimediaUtil.Tests/testcase/ImageUtil/TSBitmapFrame.cs diff --git a/tct-suite-vs/Tizen.Metadata.Tests/testcase/MetadataEditor/TSMetadataEditor.cs b/tct-suite-vs/Tizen.Metadata.Tests/testcase/MetadataEditor/TSMetadataEditor.cs old mode 100755 new mode 100644 index 596c29b..b8675a1 --- a/tct-suite-vs/Tizen.Metadata.Tests/testcase/MetadataEditor/TSMetadataEditor.cs +++ b/tct-suite-vs/Tizen.Metadata.Tests/testcase/MetadataEditor/TSMetadataEditor.cs @@ -25,7 +25,7 @@ namespace Tizen.Multimedia.Tests [TearDown] public void TearDown() { - _metadata.Dispose(); + _metadata?.Dispose(); } [Test] diff --git a/tct-suite-vs/Tizen.Metadata.Tests/testcase/MetadataExtractor/TSAudioMetadata.cs b/tct-suite-vs/Tizen.Metadata.Tests/testcase/MetadataExtractor/TSAudioMetadata.cs old mode 100755 new mode 100644 index a2aa691..1166659 --- a/tct-suite-vs/Tizen.Metadata.Tests/testcase/MetadataExtractor/TSAudioMetadata.cs +++ b/tct-suite-vs/Tizen.Metadata.Tests/testcase/MetadataExtractor/TSAudioMetadata.cs @@ -20,7 +20,7 @@ namespace Tizen.Multimedia.Tests [TearDown] public static void Destroy() { - _metadataExtractor.Dispose(); + _metadataExtractor?.Dispose(); } [Test] diff --git a/tct-suite-vs/Tizen.Metadata.Tests/testcase/MetadataExtractor/TSMetadata.cs b/tct-suite-vs/Tizen.Metadata.Tests/testcase/MetadataExtractor/TSMetadata.cs old mode 100755 new mode 100644 index e59a235..d9be028 --- a/tct-suite-vs/Tizen.Metadata.Tests/testcase/MetadataExtractor/TSMetadata.cs +++ b/tct-suite-vs/Tizen.Metadata.Tests/testcase/MetadataExtractor/TSMetadata.cs @@ -20,7 +20,7 @@ namespace Tizen.Multimedia.Tests [TearDown] public static void Destroy() { - _metadataExtractor.Dispose(); + _metadataExtractor?.Dispose(); } [Test] diff --git a/tct-suite-vs/Tizen.Metadata.Tests/testcase/MetadataExtractor/TSMetadataExtractor.cs b/tct-suite-vs/Tizen.Metadata.Tests/testcase/MetadataExtractor/TSMetadataExtractor.cs old mode 100755 new mode 100644 index 00b64ac..510f053 --- a/tct-suite-vs/Tizen.Metadata.Tests/testcase/MetadataExtractor/TSMetadataExtractor.cs +++ b/tct-suite-vs/Tizen.Metadata.Tests/testcase/MetadataExtractor/TSMetadataExtractor.cs @@ -28,8 +28,8 @@ namespace Tizen.Multimedia.Tests public static void Destroy() { Log.Info(LogTag, "MetadataExtractor Test Destroy"); - _metadataExtractorForArtwork.Dispose(); - _metadataExtractor.Dispose(); + _metadataExtractorForArtwork?.Dispose(); + _metadataExtractor?.Dispose(); } [Test] diff --git a/tct-suite-vs/Tizen.Metadata.Tests/testcase/MetadataExtractor/TSVideoMetadata.cs b/tct-suite-vs/Tizen.Metadata.Tests/testcase/MetadataExtractor/TSVideoMetadata.cs old mode 100755 new mode 100644 index 6f18e6f..fd8dc13 --- a/tct-suite-vs/Tizen.Metadata.Tests/testcase/MetadataExtractor/TSVideoMetadata.cs +++ b/tct-suite-vs/Tizen.Metadata.Tests/testcase/MetadataExtractor/TSVideoMetadata.cs @@ -20,7 +20,7 @@ namespace Tizen.Multimedia.Tests [TearDown] public static void Destroy() { - _metadataExtractor.Dispose(); + _metadataExtractor?.Dispose(); } [Test] diff --git a/tct-suite-vs/Tizen.MultimediaUtil.Tests/testcase/ImageUtil/TSBitmapFrame.cs b/tct-suite-vs/Tizen.MultimediaUtil.Tests/testcase/ImageUtil/TSBitmapFrame.cs old mode 100755 new mode 100644 index e93790e..9ca7ffb --- a/tct-suite-vs/Tizen.MultimediaUtil.Tests/testcase/ImageUtil/TSBitmapFrame.cs +++ b/tct-suite-vs/Tizen.MultimediaUtil.Tests/testcase/ImageUtil/TSBitmapFrame.cs @@ -32,7 +32,7 @@ namespace Tizen.Multimedia.Util.Tests [TearDown] public void Destroy() { - _jpegDecoder.Dispose(); + _jpegDecoder?.Dispose(); } [Test] @@ -62,7 +62,5 @@ namespace Tizen.Multimedia.Util.Tests Assert.That(frame.Size.Height, Is.Positive); } - } - } -- 2.7.4