[Recorder][Non-ACR] Code clean 22/216122/2
authorHaesu Gwon <haesu.gwon@samsung.com>
Mon, 21 Oct 2019 07:48:27 +0000 (16:48 +0900)
committerHaesu Gwon <haesu.gwon@samsung.com>
Tue, 22 Oct 2019 01:52:50 +0000 (10:52 +0900)
Change-Id: Ia53870c5764f4fa610694e714a4e36c41e274411

tct-suite-vs/Tizen.Recorder.Tests/testcase/TSAudioStreamStoringEventArgs.cs [changed mode: 0755->0644]
tct-suite-vs/Tizen.Recorder.Tests/testcase/TSMuxedStreamDeliveredEventArgs.cs [changed mode: 0755->0644]
tct-suite-vs/Tizen.Recorder.Tests/testcase/TSRecorder.cs
tct-suite-vs/Tizen.Recorder.Tests/testcase/TSRecorderDeviceStateChangedEventArgs.cs [changed mode: 0755->0644]
tct-suite-vs/Tizen.Recorder.Tests/testcase/TSRecorderStateChangedEventArgs.cs [changed mode: 0755->0644]
tct-suite-vs/Tizen.Recorder.Tests/testcase/TSRecordingLimitReachedEventArgs.cs
tct-suite-vs/Tizen.Recorder.Tests/testcase/TSRecordingStatusChangedEventArgs.cs [changed mode: 0755->0644]
tct-suite-vs/Tizen.Recorder.Tests/testcase/support/AudioRecorderTestBase.cs

old mode 100755 (executable)
new mode 100644 (file)
index 523794b..12d3bb3
@@ -9,18 +9,6 @@ namespace Tizen.Multimedia.Tests
     {
         private const int AudioChannel = 2;
 
-        public async Task<AudioStreamStoringEventArgs> RaiseEvent()
-        {
-            var tcs = new TaskCompletionSource<AudioStreamStoringEventArgs>();
-
-            AudioRecorder.AudioStreamStoring += (s, e) => tcs.TrySetResult(e);
-
-            AudioRecorder.Prepare();
-            AudioRecorder.Start(SavePath);
-
-            return await tcs.Task;
-        }
-
         [Test]
         [Category("P1")]
         [Description("Test AudioStreamStoringEventArgs Stream property")]
@@ -30,7 +18,19 @@ namespace Tizen.Multimedia.Tests
         [Property("AUTHOR", "Haesu Gwon, haesu.gwon@samsung.com")]
         public async Task Stream_PROPERTY_READ_ONLY()
         {
-            Assert.That((await RaiseEvent()).Stream, Is.Not.Null);
+            using (var eventAwaiter = EventAwaiter<AudioStreamStoringEventArgs>.Create())
+            {
+                AudioRecorder.AudioStreamStoring += eventAwaiter;
+
+                AudioRecorder.Prepare();
+                AudioRecorder.Start(SavePath);
+
+                var result = await eventAwaiter.GetResultAsync();
+
+                Assert.That(result.Stream, Is.Not.Null);
+
+                AudioRecorder.AudioStreamStoring -= eventAwaiter;
+            }
         }
 
         [Test]
@@ -42,7 +42,19 @@ namespace Tizen.Multimedia.Tests
         [Property("AUTHOR", "Haesu Gwon, haesu.gwon@samsung.com")]
         public async Task Type_PROPERTY_READ_ONLY()
         {
-            Assert.That((await RaiseEvent()).Type, Is.EqualTo(AudioSampleType.S16Le).Or.EqualTo(AudioSampleType.U8));
+            using (var eventAwaiter = EventAwaiter<AudioStreamStoringEventArgs>.Create())
+            {
+                AudioRecorder.AudioStreamStoring += eventAwaiter;
+
+                AudioRecorder.Prepare();
+                AudioRecorder.Start(SavePath);
+
+                var result = await eventAwaiter.GetResultAsync();
+
+                Assert.That(result.Type, Is.EqualTo(AudioSampleType.S16Le).Or.EqualTo(AudioSampleType.U8));
+
+                AudioRecorder.AudioStreamStoring -= eventAwaiter;
+            }
         }
 
         [Test]
@@ -54,7 +66,19 @@ namespace Tizen.Multimedia.Tests
         [Property("AUTHOR", "Haesu Gwon, haesu.gwon@samsung.com")]
         public async Task Channels_PROPERTY_READ_ONLY()
         {
-            Assert.That((await RaiseEvent()).Channels, Is.EqualTo(AudioChannel));
+            using (var eventAwaiter = EventAwaiter<AudioStreamStoringEventArgs>.Create())
+            {
+                AudioRecorder.AudioStreamStoring += eventAwaiter;
+
+                AudioRecorder.Prepare();
+                AudioRecorder.Start(SavePath);
+
+                var result = await eventAwaiter.GetResultAsync();
+
+                Assert.That(result.Channels, Is.EqualTo(AudioChannel));
+
+                AudioRecorder.AudioStreamStoring -= eventAwaiter;
+            }
         }
 
         [Test]
@@ -66,7 +90,19 @@ namespace Tizen.Multimedia.Tests
         [Property("AUTHOR", "Haesu Gwon, haesu.gwon@samsung.com")]
         public async Task Timestamp_PROPERTY_READ_ONLY()
         {
-            Assert.That((await RaiseEvent()).Timestamp, Is.GreaterThanOrEqualTo(0));
+            using (var eventAwaiter = EventAwaiter<AudioStreamStoringEventArgs>.Create())
+            {
+                AudioRecorder.AudioStreamStoring += eventAwaiter;
+
+                AudioRecorder.Prepare();
+                AudioRecorder.Start(SavePath);
+
+                var result = await eventAwaiter.GetResultAsync();
+
+                Assert.That(result.Timestamp, Is.GreaterThanOrEqualTo(0));
+
+                AudioRecorder.AudioStreamStoring -= eventAwaiter;
+            }
         }
     }
 }
old mode 100755 (executable)
new mode 100644 (file)
index 2b4cb98..b73d1dc
@@ -7,19 +7,6 @@ namespace Tizen.Multimedia.Tests
     [Description("Tizen.Multimedia.MuxedStreamDeliveredEventArgs class for Audio and Video recording.")]
     public class MuxedStreamDeliveredEventArgsTests : VideoRecorderTestBase
     {
-        private async Task<MuxedStreamDeliveredEventArgs> RaiseEvent()
-        {
-            using (var eventAwaiter = EventAwaiter<MuxedStreamDeliveredEventArgs>.Create())
-            {
-                VideoRecorder.MuxedStreamDelivered += eventAwaiter;
-
-                VideoRecorder.Prepare();
-                VideoRecorder.Start(SavePath);
-
-                return await eventAwaiter.GetResultAsync();
-            }
-        }
-
         [Test]
         [Category("P1")]
         [Description("Test MuxedStreamDeliveredEventArgs Stream property")]
@@ -29,7 +16,19 @@ namespace Tizen.Multimedia.Tests
         [Property("AUTHOR", "Haesu Gwon, haesu.gwon@samsung.com")]
         public async Task Stream_PROPERTY_READ_ONLY()
         {
-            Assert.That((await RaiseEvent()).Stream, Is.Not.Null);
+            using (var eventAwaiter = EventAwaiter<MuxedStreamDeliveredEventArgs>.Create())
+            {
+                VideoRecorder.MuxedStreamDelivered += eventAwaiter;
+
+                VideoRecorder.Prepare();
+                VideoRecorder.Start(SavePath);
+
+                var result = await eventAwaiter.GetResultAsync();
+
+                Assert.That(result.Stream, Is.Not.Null);
+
+                VideoRecorder.MuxedStreamDelivered -= eventAwaiter;
+            }
         }
 
         [Test]
@@ -41,7 +40,19 @@ namespace Tizen.Multimedia.Tests
         [Property("AUTHOR", "Haesu Gwon, haesu.gwon@samsung.com")]
         public async Task Offset_PROPERTY_READ_ONLY()
         {
-            Assert.That((await RaiseEvent()).Offset, Is.GreaterThanOrEqualTo(0));
+            using (var eventAwaiter = EventAwaiter<MuxedStreamDeliveredEventArgs>.Create())
+            {
+                VideoRecorder.MuxedStreamDelivered += eventAwaiter;
+
+                VideoRecorder.Prepare();
+                VideoRecorder.Start(SavePath);
+
+                var result = await eventAwaiter.GetResultAsync();
+
+                Assert.That(result.Offset, Is.GreaterThanOrEqualTo(0));
+
+                VideoRecorder.MuxedStreamDelivered -= eventAwaiter;
+            }
         }
     }
 }
index 907ad450f1b9449bdd46d8731f148f62a9a2ab4d..c84e0a83f12f9f2934ae4a1e4108b0d1fb99d9bb 100644 (file)
@@ -42,6 +42,8 @@ namespace Tizen.Multimedia.Tests
                 Assert.AreEqual(RecorderState.Recording, AudioRecorder.State, "Recorder should be in recording state");
 
                 await eventWaiter.IsRaisedAsync();
+
+                AudioRecorder.AudioStreamStoring -= eventWaiter;
             }
 
             /* Test code
@@ -370,6 +372,8 @@ namespace Tizen.Multimedia.Tests
                 AudioRecorder.Start(SavePath);
 
                 await eventWaiter.IsRaisedAsync();
+
+                AudioRecorder.AudioStreamStoring -= eventWaiter;
             }
 
             /* Test code
@@ -397,6 +401,8 @@ namespace Tizen.Multimedia.Tests
                 AudioRecorder.Start(SavePath);
 
                 await eventWaiter.IsRaisedAsync();
+
+                AudioRecorder.AudioStreamStoring -= eventWaiter;
             }
 
             /* Test code
@@ -425,6 +431,8 @@ namespace Tizen.Multimedia.Tests
                 AudioRecorder.Start(SavePath);
 
                 await eventWaiter.IsRaisedAsync();
+
+                AudioRecorder.AudioStreamStoring -= eventWaiter;
             }
 
             /* Test code
@@ -474,6 +482,8 @@ namespace Tizen.Multimedia.Tests
                 AudioRecorder.Start(SavePath);
 
                 await eventWaiter.IsRaisedAsync();
+
+                AudioRecorder.AudioStreamStoring -= eventWaiter;
             }
 
             AudioRecorder.Commit();
@@ -503,6 +513,8 @@ namespace Tizen.Multimedia.Tests
                 AudioRecorder.Start(SavePath);
 
                 await eventWaiter.IsRaisedAsync();
+
+                AudioRecorder.AudioStreamStoring -= eventWaiter;
             }
 
             /* Test code
@@ -545,6 +557,8 @@ namespace Tizen.Multimedia.Tests
                 AudioRecorder.Start(SavePath);
 
                 await eventWaiter.IsRaisedAsync();
+
+                AudioRecorder.AudioStreamStoring -= eventWaiter;
             }
 
             /* Test Recording state */
@@ -619,60 +633,67 @@ namespace Tizen.Multimedia.Tests
 
         [Test]
         [Category("P1")]
-        [Description("Test RecordingLimitReached event")]
-        [Property("SPEC", "Tizen.Multimedia.Recorder.RecordingLimitReached E")]
+        [Description("Test MuxedStreamDelivered event")]
+        [Property("SPEC", "Tizen.Multimedia.Recorder.MuxedStreamDelivered E")]
         [Property("SPEC_URL", "-")]
         [Property("CRITERIA", "EVL")]
-        [Property("AUTHOR", "Vivek ellur, vivek.ellur@samsung.com")]
-        public async Task RecordingLimitReached_CHECK_EVENT()
+        [Property("AUTHOR", "Haesu Gwon, haesu.gwon@samsung.com")]
+        public async Task MuxedStreamDelivered_CHECK_EVENT()
         {
-            using (var eventAwaiter = EventAwaiter<RecordingLimitReachedEventArgs>.Create())
+            using (var eventAwaiter = EventAwaiter<MuxedStreamDeliveredEventArgs>.Create())
             {
-                AudioRecorder.RecordingLimitReached += eventAwaiter;
-
-                AudioRecorder.TimeLimit = 1;
+                AudioRecorder.MuxedStreamDelivered += eventAwaiter;
                 AudioRecorder.Prepare();
                 AudioRecorder.Start(SavePath);
 
                 Assert.That(await eventAwaiter.IsRaisedAsync(), "The event should be raised");
+
+                AudioRecorder.MuxedStreamDelivered -= eventAwaiter;
             }
         }
 
         [Test]
         [Category("P1")]
-        [Description("Test MuxedStreamDelivered event")]
-        [Property("SPEC", "Tizen.Multimedia.Recorder.MuxedStreamDelivered E")]
+        [Description("Test StateChanged event")]
+        [Property("SPEC", "Tizen.Multimedia.Recorder.StateChanged E")]
         [Property("SPEC_URL", "-")]
         [Property("CRITERIA", "EVL")]
-        [Property("AUTHOR", "Haesu Gwon, haesu.gwon@samsung.com")]
-        public async Task MuxedStreamDelivered_CHECK_EVENT()
+        [Property("AUTHOR", "Vivek ellur, vivek.ellur@samsung.com")]
+        public async Task StateChanged_CHECK_EVENT()
         {
-            using (var eventAwaiter = EventAwaiter<MuxedStreamDeliveredEventArgs>.Create())
+            using (var eventAwaiter = EventAwaiter<RecorderStateChangedEventArgs>.Create())
             {
-                AudioRecorder.MuxedStreamDelivered += eventAwaiter;
+                AudioRecorder.StateChanged += eventAwaiter;
                 AudioRecorder.Prepare();
                 AudioRecorder.Start(SavePath);
 
                 Assert.That(await eventAwaiter.IsRaisedAsync(), "The event should be raised");
+
+                AudioRecorder.StateChanged -= eventAwaiter;
             }
         }
 
         [Test]
         [Category("P1")]
-        [Description("Test StateChanged event")]
-        [Property("SPEC", "Tizen.Multimedia.Recorder.StateChanged E")]
+        [Description("Test RecordingLimitReached event")]
+        [Property("SPEC", "Tizen.Multimedia.Recorder.RecordingLimitReached E")]
         [Property("SPEC_URL", "-")]
         [Property("CRITERIA", "EVL")]
         [Property("AUTHOR", "Vivek ellur, vivek.ellur@samsung.com")]
-        public async Task StateChanged_CHECK_EVENT()
+        public async Task RecordingLimitReached_CHECK_EVENT()
         {
-            using (var eventAwaiter = EventAwaiter<RecorderStateChangedEventArgs>.Create())
+            AudioRecorder.SizeLimit = 1;
+
+            using (var eventAwaiter = EventAwaiter<RecordingLimitReachedEventArgs>.Create())
             {
-                AudioRecorder.StateChanged += eventAwaiter;
+                AudioRecorder.RecordingLimitReached += eventAwaiter;
+
                 AudioRecorder.Prepare();
                 AudioRecorder.Start(SavePath);
 
                 Assert.That(await eventAwaiter.IsRaisedAsync(), "The event should be raised");
+
+                AudioRecorder.RecordingLimitReached -= eventAwaiter;
             }
         }
 
@@ -720,6 +741,8 @@ namespace Tizen.Multimedia.Tests
                 AudioRecorder.Start(SavePath);
 
                 Assert.That(await eventAwaiter.IsRaisedAsync(), "The event should be raised");
+
+                AudioRecorder.RecordingStatusChanged -= eventAwaiter;
             }
         }
 
@@ -740,6 +763,8 @@ namespace Tizen.Multimedia.Tests
                 AudioRecorder.Start(SavePath);
 
                 Assert.That(await eventAwaiter.IsRaisedAsync(), "The event should be raised");
+
+                AudioRecorder.AudioStreamStoring -= eventAwaiter;
             }
         }
 
old mode 100755 (executable)
new mode 100644 (file)
index 2bc812c..47c7194
@@ -7,26 +7,6 @@ namespace Tizen.Multimedia.Tests
     [Description("Tizen.Multimedia.RecorderDeviceStateChangedEventArgs Tests")]
     public class RecorderDeviceStateChangedEventArgsTests : AudioRecorderTestBase
     {
-        private async Task<RecorderDeviceStateChangedEventArgs> RaiseEvent()
-        {
-            using (var eventAwaiter = EventAwaiter<RecorderDeviceStateChangedEventArgs>.Create())
-            {
-                Recorder.DeviceStateChanged += eventAwaiter;
-
-                AudioRecorder.Prepare();
-                AudioRecorder.Start(SavePath);
-
-                try
-                {
-                    return await eventAwaiter.GetResultAsync();
-                }
-                finally
-                {
-                    Recorder.DeviceStateChanged -= eventAwaiter;
-                }
-            }
-        }
-
         [Test]
         [Category("P1")]
         [Description("Test RecorderDeviceStateChangedEventArgs Type property.")]
@@ -36,7 +16,19 @@ namespace Tizen.Multimedia.Tests
         [Property("AUTHOR", "Vivek ellur, vivek.ellur@samsung.com")]
         public async Task Type_PROPERTY_READ_ONLY()
         {
-            Assert.That((await RaiseEvent()).Type, Is.EqualTo(RecorderType.Audio));
+            using (var eventAwaiter = EventAwaiter<RecorderDeviceStateChangedEventArgs>.Create())
+            {
+                Recorder.DeviceStateChanged += eventAwaiter;
+
+                AudioRecorder.Prepare();
+                AudioRecorder.Start(SavePath);
+
+                var result = await eventAwaiter.GetResultAsync();
+
+                Assert.That(result.Type, Is.EqualTo(RecorderType.Audio));
+
+                Recorder.DeviceStateChanged -= eventAwaiter;
+            }
         }
 
         [Test]
@@ -48,7 +40,19 @@ namespace Tizen.Multimedia.Tests
         [Property("AUTHOR", "Vivek ellur, vivek.ellur@samsung.com")]
         public async Task DeviceState_PROPERTY_READ_ONLY()
         {
-            Assert.That((await RaiseEvent()).DeviceState, Is.EqualTo(RecorderDeviceState.Recording));
+            using (var eventAwaiter = EventAwaiter<RecorderDeviceStateChangedEventArgs>.Create())
+            {
+                Recorder.DeviceStateChanged += eventAwaiter;
+
+                AudioRecorder.Prepare();
+                AudioRecorder.Start(SavePath);
+
+                var result = await eventAwaiter.GetResultAsync();
+
+                Assert.That(result.DeviceState, Is.EqualTo(RecorderDeviceState.Recording));
+
+                Recorder.DeviceStateChanged -= eventAwaiter;
+            }
         }
     }
 }
old mode 100755 (executable)
new mode 100644 (file)
index fbfcad3..35fd83e
@@ -7,18 +7,6 @@ namespace Tizen.Multimedia.Tests
     [Description("Tizen.Multimedia.RecorderStateChangedEventArgs Tests")]
     public class RecorderStateChangedEventArgsTests : AudioRecorderTestBase
     {
-        private async Task<RecorderStateChangedEventArgs> RaiseEvent()
-        {
-            using (var eventAwaiter = EventAwaiter<RecorderStateChangedEventArgs>.Create())
-            {
-                AudioRecorder.StateChanged += eventAwaiter;
-
-                AudioRecorder.Prepare();
-
-                return await eventAwaiter.GetResultAsync();
-            }
-        }
-
         [Test]
         [Category("P1")]
         [Description("Test RecorderStateChangedEventArgs PreviousState property.")]
@@ -28,7 +16,18 @@ namespace Tizen.Multimedia.Tests
         [Property("AUTHOR", "Vivek ellur, vivek.ellur@samsung.com")]
         public async Task PreviousState_PROPERTY_READ_ONLY()
         {
-            Assert.That((await RaiseEvent()).PreviousState, Is.EqualTo(RecorderState.Idle));
+            using (var eventAwaiter = EventAwaiter<RecorderStateChangedEventArgs>.Create())
+            {
+                AudioRecorder.StateChanged += eventAwaiter;
+
+                AudioRecorder.Prepare();
+
+                var result = await eventAwaiter.GetResultAsync();
+
+                Assert.That(result.PreviousState, Is.EqualTo(RecorderState.Idle));
+
+                AudioRecorder.StateChanged -= eventAwaiter;
+            }
         }
 
         [Test]
@@ -40,7 +39,18 @@ namespace Tizen.Multimedia.Tests
         [Property("AUTHOR", "Vivek ellur, vivek.ellur@samsung.com")]
         public async Task CurrentState_PROPERTY_READ_ONLY()
         {
-            Assert.That((await RaiseEvent()).CurrentState, Is.EqualTo(RecorderState.Ready));
+            using (var eventAwaiter = EventAwaiter<RecorderStateChangedEventArgs>.Create())
+            {
+                AudioRecorder.StateChanged += eventAwaiter;
+
+                AudioRecorder.Prepare();
+
+                var result = await eventAwaiter.GetResultAsync();
+
+                Assert.That(result.CurrentState, Is.EqualTo(RecorderState.Ready));
+
+                AudioRecorder.StateChanged -= eventAwaiter;
+            }
         }
 
         [Test]
@@ -52,7 +62,18 @@ namespace Tizen.Multimedia.Tests
         [Property("AUTHOR", "Vivek ellur, vivek.ellur@samsung.com")]
         public async Task IsStateChangedByPolicy_PROPERTY_READ_ONLY()
         {
-            Assert.That((await RaiseEvent()).IsStateChangedByPolicy, Is.False);
+            using (var eventAwaiter = EventAwaiter<RecorderStateChangedEventArgs>.Create())
+            {
+                AudioRecorder.StateChanged += eventAwaiter;
+
+                AudioRecorder.Prepare();
+
+                var result = await eventAwaiter.GetResultAsync();
+
+                Assert.That(result.IsStateChangedByPolicy, Is.False);
+
+                AudioRecorder.StateChanged -= eventAwaiter;
+            }
         }
     }
 }
index 889e186f60c22d7e4291a38b7f485c71e0af987b..3142df740dd64fb713bed3a9a80351817e7e3103 100644 (file)
@@ -19,19 +19,6 @@ namespace Tizen.Multimedia.Tests
             Assert.That(() => new RecordingLimitReachedEventArgs(RecordingLimitType.Size), Throws.Nothing);
         }
 
-        private async Task<RecordingLimitReachedEventArgs> RaiseEvent()
-        {
-            using (var eventAwaiter = EventAwaiter<RecordingLimitReachedEventArgs>.Create())
-            {
-                AudioRecorder.RecordingLimitReached += eventAwaiter;
-
-                AudioRecorder.Prepare();
-                AudioRecorder.Start(SavePath);
-
-                return await eventAwaiter.GetResultAsync();
-            }
-        }
-
         [Test]
         [Category("P1")]
         [Description("Test Type property for time type.")]
@@ -43,7 +30,19 @@ namespace Tizen.Multimedia.Tests
         {
             AudioRecorder.TimeLimit = 1;
 
-            Assert.That((await RaiseEvent()).Type, Is.EqualTo(RecordingLimitType.Time));
+            using (var eventAwaiter = EventAwaiter<RecordingLimitReachedEventArgs>.Create())
+            {
+                AudioRecorder.RecordingLimitReached += eventAwaiter;
+
+                AudioRecorder.Prepare();
+                AudioRecorder.Start(SavePath);
+
+                var result = await eventAwaiter.GetResultAsync();
+
+                Assert.That(result.Type, Is.EqualTo(RecordingLimitType.Time));
+
+                AudioRecorder.RecordingLimitReached -= eventAwaiter;
+            }
         }
 
         [Test]
@@ -57,7 +56,19 @@ namespace Tizen.Multimedia.Tests
         {
             AudioRecorder.SizeLimit = 1;
 
-            Assert.That((await RaiseEvent()).Type, Is.EqualTo(RecordingLimitType.Size));
+            using (var eventAwaiter = EventAwaiter<RecordingLimitReachedEventArgs>.Create())
+            {
+                AudioRecorder.RecordingLimitReached += eventAwaiter;
+
+                AudioRecorder.Prepare();
+                AudioRecorder.Start(SavePath);
+
+                var result = await eventAwaiter.GetResultAsync();
+
+                Assert.That(result.Type, Is.EqualTo(RecordingLimitType.Size));
+
+                AudioRecorder.RecordingLimitReached -= eventAwaiter;
+            }
         }
     }
 }
old mode 100755 (executable)
new mode 100644 (file)
index e2c78a2..d8cdb6b
@@ -23,19 +23,6 @@ namespace Tizen.Multimedia.Tests
             Assert.That(() => new RecordingStatusChangedEventArgs(100, 100), Throws.Nothing);
         }
 
-        private async Task<RecordingStatusChangedEventArgs> RaiseEvent()
-        {
-            using (var eventAwaiter = EventAwaiter<RecordingStatusChangedEventArgs>.Create())
-            {
-                AudioRecorder.RecordingStatusChanged += eventAwaiter;
-
-                AudioRecorder.Prepare();
-                AudioRecorder.Start(SavePath);
-
-                return await eventAwaiter.GetResultAsync();
-            }
-        }
-
         [Test]
         [Category("P1")]
         [Description("Test ElapsedTime property for read only.")]
@@ -45,7 +32,19 @@ namespace Tizen.Multimedia.Tests
         [Property("AUTHOR", "Vivek ellur, vivek.ellur@samsung.com")]
         public async Task ElapsedTime_PROPERTY_READ_ONLY()
         {
-            Assert.That((await RaiseEvent()).ElapsedTime, Is.GreaterThanOrEqualTo(0));
+            using (var eventAwaiter = EventAwaiter<RecordingStatusChangedEventArgs>.Create())
+            {
+                AudioRecorder.RecordingStatusChanged += eventAwaiter;
+
+                AudioRecorder.Prepare();
+                AudioRecorder.Start(SavePath);
+
+                var result = await eventAwaiter.GetResultAsync();
+
+                Assert.That(result.ElapsedTime, Is.GreaterThanOrEqualTo(0));
+
+                AudioRecorder.RecordingStatusChanged -= eventAwaiter;
+            }
         }
 
         [Test]
@@ -57,11 +56,23 @@ namespace Tizen.Multimedia.Tests
         [Property("AUTHOR", "Vivek ellur, vivek.ellur@samsung.com")]
         public async Task FileSize_PROPERTY_READ_ONLY()
         {
-            /*
-             * FileSize(Kilo Byte) can be 0, if it is smaller than 1024 byte.
-             * So, If RecordingStatusChangedEventArgs event is occured, It can be considered as PASS.
-             */
-            Assert.That((await RaiseEvent()).FileSize, Is.GreaterThanOrEqualTo(0));
+            using (var eventAwaiter = EventAwaiter<RecordingStatusChangedEventArgs>.Create())
+            {
+                AudioRecorder.RecordingStatusChanged += eventAwaiter;
+
+                AudioRecorder.Prepare();
+                AudioRecorder.Start(SavePath);
+
+                var result = await eventAwaiter.GetResultAsync();
+
+                /*
+                 * FileSize(Kilo Byte) can be 0, if it is smaller than 1024 byte.
+                 * So, If RecordingStatusChangedEventArgs event is occured, It can be considered as PASS.
+                 */
+                Assert.That(result.FileSize, Is.GreaterThanOrEqualTo(0));
+
+                AudioRecorder.RecordingStatusChanged -= eventAwaiter;
+            }
         }
     }
 }
index b4ba4aee1aae76c6a64b4cdb20076bf98f9d2926..fabe5ef1bc469e9adb1ef18b68372d45847edb90 100644 (file)
@@ -41,6 +41,11 @@ namespace Tizen.Multimedia.Tests
         [TearDown]
         public void TearDownAudioRecorderBase()
         {
+            if (AudioRecorder.State == RecorderState.Recording)
+            {
+                AudioRecorder.Cancel();
+            }
+
             AudioRecorder?.Dispose();
 
             if (File.Exists(SavePath))