[Camera][Non-ACR][Wait TC until capture is completed]

Change-Id: Ic51eaae8ad6716c9b73570d1d2e35129d5ddb62e
Signed-off-by: Haesu Gwon <haesu.gwon@samsung.com>

diff --git a/tct-suite-vs/Tizen.Camera.Tests/testcase/TSCamera.cs b/tct-suite-vs/Tizen.Camera.Tests/testcase/TSCamera.cs
index 09be6e1..d5a791a 100644 (file)
--- a/tct-suite-vs/Tizen.Camera.Tests/testcase/TSCamera.cs
+++ b/tct-suite-vs/Tizen.Camera.Tests/testcase/TSCamera.cs
@@ -77,11 +77,17 @@ namespace Tizen.Multimedia.Tests
              * DeviceState is internally translated from NotOpened state to Working state after calling StartPreview method.
              */
 
-            // Check Working State.
-            TestCamera.StartPreview();
-            await Task.Delay(500);
+            using (var eventWaiter = EventAwaiter<PreviewEventArgs>.Create())
+            {
+                TestCamera.Preview += eventWaiter;
+
+                TestCamera.StartPreview();
 
-            Assert.That(Camera.GetDeviceState(CameraDevice.Rear), Is.EqualTo(CameraDeviceState.Working));
+                await eventWaiter.IsRaisedAsync();
+
+                // Check Working State.
+                Assert.That(Camera.GetDeviceState(CameraDevice.Rear), Is.EqualTo(CameraDeviceState.Working));
+            }
         }
 
         [Test]
@@ -183,12 +189,16 @@ namespace Tizen.Multimedia.Tests
         {
             TestCamera.StartPreview();
 
+            using (var completeWaiter = EventAwaiter<CameraCapturingEventArgs>.Create())
             using (var tokenSource = new CancellationTokenSource())
             {
                 try
                 {
+                    TestCamera.Capturing += completeWaiter;
+
                     TestCamera.StartCapture(10, 100, tokenSource.Token);
-                    await Task.Delay(1000);
+
+                    await completeWaiter.IsRaisedAsync();
                 }
                 catch (NotSupportedException)
                 {
@@ -203,8 +213,14 @@ namespace Tizen.Multimedia.Tests
                 }
 
                 /* TESTCODE */
-                tokenSource.Cancel();
-                await Task.Delay(500);
+                using (var eventWaiter = EventAwaiter<CameraStateChangedEventArgs>.Create())
+                {
+                    TestCamera.StateChanged += eventWaiter;
+
+                    tokenSource.Cancel();
+
+                    await eventWaiter.IsRaisedAsync();
+                }
 
                 Assert.That(TestCamera.State, Is.EqualTo(CameraState.Captured));
             }
@@ -522,16 +538,21 @@ namespace Tizen.Multimedia.Tests
                 Assert.Pass("HDR feature is not supported.");
             }
 
+            using (var completeWaiter = EventAwaiter.Create())
             using (var eventWaiter = EventAwaiter<HdrCaptureProgressEventArgs>.Create())
             {
                 TestCamera.Settings.HdrMode = CameraHdrMode.Enable;
+
                 TestCamera.HdrCaptureProgress += eventWaiter;
+                TestCamera.CaptureCompleted += completeWaiter;
 
                 TestCamera.StartPreview();
                 TestCamera.StartCapture();
 
                 var eventArgs = await eventWaiter.GetResultAsync();
                 Assert.That(eventArgs.Percent, Is.GreaterThan(0), "HDR progress should be bigger than 0.");
+
+                await completeWaiter.IsRaisedAsync();
             }
         }
 
@@ -544,16 +565,21 @@ namespace Tizen.Multimedia.Tests
         [Property("AUTHOR", "Vivek Ellur, vivek.ellur@samsung.com")]
         public static async Task Capturing_CHECK_EVENT()
         {
+            using (var completeWaiter = EventAwaiter.Create())
             using (var eventWaiter = EventAwaiter<CameraCapturingEventArgs>.Create())
             {
                 TestCamera.Settings.ImageQuality = 100;
                 TestCamera.Settings.CapturePixelFormat = CameraPixelFormat.Jpeg;
+
                 TestCamera.Capturing += eventWaiter;
+                TestCamera.CaptureCompleted += completeWaiter;
 
                 TestCamera.StartPreview();
                 TestCamera.StartCapture();
 
                 Assert.That(await eventWaiter.IsRaisedAsync());
+
+                await completeWaiter.IsRaisedAsync();
             }
         }
 
@@ -566,16 +592,21 @@ namespace Tizen.Multimedia.Tests
         [Property("AUTHOR", "Vivek Ellur, vivek.ellur@samsung.com")]
         public static async Task CaptureCompleted_CHECK_EVENT()
         {
+            using (var completeWaiter = EventAwaiter.Create())
             using (var eventWaiter = EventAwaiter<EventArgs>.Create())
             {
                 TestCamera.Settings.ImageQuality = 100;
                 TestCamera.Settings.CapturePixelFormat = CameraPixelFormat.Jpeg;
+
                 TestCamera.CaptureCompleted += eventWaiter;
+                TestCamera.CaptureCompleted += completeWaiter;
 
                 TestCamera.StartPreview();
                 TestCamera.StartCapture();
 
                 Assert.That(await eventWaiter.IsRaisedAsync());
+
+                await completeWaiter.IsRaisedAsync();
             }
         }
 

diff --git a/tct-suite-vs/Tizen.Camera.Tests/testcase/TSCameraCapturingEventArgs.cs b/tct-suite-vs/Tizen.Camera.Tests/testcase/TSCameraCapturingEventArgs.cs
old mode 100755 (executable)
new mode 100644 (file)
index f14ed2e..efe25a1
--- a/tct-suite-vs/Tizen.Camera.Tests/testcase/TSCameraCapturingEventArgs.cs
+++ b/tct-suite-vs/Tizen.Camera.Tests/testcase/TSCameraCapturingEventArgs.cs
@@ -32,15 +32,19 @@ namespace Tizen.Multimedia.Tests
         [Property("AUTHOR", "Vivek Ellur, vivek.ellur@samsung.com")]
         public static async Task MainImage_PROPERTY_READ_ONLY()
         {
+            using (var completeWaiter = EventAwaiter.Create())
             using (var eventWaiter = EventAwaiter<CameraCapturingEventArgs>.Create())
             {
                 TestCamera.Capturing += eventWaiter;
+                TestCamera.CaptureCompleted += completeWaiter;
 
                 TestCamera.StartPreview();
                 TestCamera.StartCapture();
 
                 var eventArgs = await eventWaiter.GetResultAsync();
                 Assert.That(eventArgs.MainImage.Data.Length, Is.GreaterThan(0));
+
+                await completeWaiter.IsRaisedAsync();
             }
         }
 
@@ -53,14 +57,18 @@ namespace Tizen.Multimedia.Tests
         [Property("AUTHOR", "Vivek Ellur, vivek.ellur@samsung.com")]
         public static async Task PostView_PROPERTY_READ_ONLY()
         {
+            using (var completeWaiter = EventAwaiter.Create())
             using (var eventWaiter = EventAwaiter<CameraCapturingEventArgs>.Create())
             {
                 TestCamera.Capturing += eventWaiter;
+                TestCamera.CaptureCompleted += completeWaiter;
 
                 TestCamera.StartPreview();
                 TestCamera.StartCapture();
 
                 Assert.That(await eventWaiter.IsRaisedAsync());
+
+                await completeWaiter.IsRaisedAsync();
             }
         }
 
@@ -73,14 +81,18 @@ namespace Tizen.Multimedia.Tests
         [Property("AUTHOR", "Vivek Ellur, vivek.ellur@samsung.com")]
         public static async Task Thumbnail_PROPERTY_READ_ONLY()
         {
+            using (var completeWaiter = EventAwaiter.Create())
             using (var eventWaiter = EventAwaiter<CameraCapturingEventArgs>.Create())
             {
                 TestCamera.Capturing += eventWaiter;
+                TestCamera.CaptureCompleted += completeWaiter;
 
                 TestCamera.StartPreview();
                 TestCamera.StartCapture();
 
                 Assert.That(await eventWaiter.IsRaisedAsync());
+
+                await completeWaiter.IsRaisedAsync();
             }
         }
     }

diff --git a/tct-suite-vs/Tizen.Camera.Tests/testcase/TSHdrCaptureProgressEventArgs.cs b/tct-suite-vs/Tizen.Camera.Tests/testcase/TSHdrCaptureProgressEventArgs.cs
old mode 100755 (executable)
new mode 100644 (file)
index 3435daf..b03ea69
--- a/tct-suite-vs/Tizen.Camera.Tests/testcase/TSHdrCaptureProgressEventArgs.cs
+++ b/tct-suite-vs/Tizen.Camera.Tests/testcase/TSHdrCaptureProgressEventArgs.cs
@@ -33,15 +33,19 @@ namespace Tizen.Multimedia.Tests
         [Property("AUTHOR", "Vivek Ellur, vivek.ellur@samsung.com")]
         public static async Task Percent_PROPERTY_READ_ONLY()
         {
+            using (var completeWaiter = EventAwaiter.Create())
             using (var eventWaiter = EventAwaiter<HdrCaptureProgressEventArgs>.Create())
             {
                 TestCamera.HdrCaptureProgress += eventWaiter;
+                TestCamera.CaptureCompleted += completeWaiter;
 
                 TestCamera.StartPreview();
                 TestCamera.StartCapture();
 
                 var eventArgs = await eventWaiter.GetResultAsync();
                 Assert.That(eventArgs.Percent, Is.GreaterThan(0));
+
+                await completeWaiter.IsRaisedAsync();
             }
         }
     }

diff --git a/tct-suite-vs/Tizen.Camera.Tests/testcase/TSStillImage.cs b/tct-suite-vs/Tizen.Camera.Tests/testcase/TSStillImage.cs
old mode 100755 (executable)
new mode 100644 (file)
index a8776d5..4d27807
--- a/tct-suite-vs/Tizen.Camera.Tests/testcase/TSStillImage.cs
+++ b/tct-suite-vs/Tizen.Camera.Tests/testcase/TSStillImage.cs
@@ -30,15 +30,19 @@ namespace Tizen.Multimedia.Tests
         [Property("AUTHOR", "Vivek Ellur, vivek.ellur@samsung.com")]
         public static async Task Data_PROPERTY_READ_ONLY()
         {
+            using (var completeWaiter = EventAwaiter.Create())
             using (var eventWaiter = EventAwaiter<CameraCapturingEventArgs>.Create())
             {
                 TestCamera.Capturing += eventWaiter;
+                TestCamera.CaptureCompleted += completeWaiter;
 
                 TestCamera.StartPreview();
                 TestCamera.StartCapture();
 
                 var eventArgs = await eventWaiter.GetResultAsync();
                 Assert.IsNotNull(eventArgs.MainImage.Data);
+
+                await completeWaiter.IsRaisedAsync();
             }
         }
 
@@ -51,9 +55,11 @@ namespace Tizen.Multimedia.Tests
         [Property("AUTHOR", "Vivek Ellur, vivek.ellur@samsung.com")]
         public static async Task Resolution_PROPERTY_READ_ONLY()
         {
+            using (var completeWaiter = EventAwaiter.Create())
             using (var eventWaiter = EventAwaiter<CameraCapturingEventArgs>.Create())
             {
                 TestCamera.Capturing += eventWaiter;
+                TestCamera.CaptureCompleted += completeWaiter;
 
                 TestCamera.StartPreview();
                 TestCamera.StartCapture();
@@ -61,6 +67,8 @@ namespace Tizen.Multimedia.Tests
                 var eventArgs = await eventWaiter.GetResultAsync();
                 Assert.That(eventArgs.MainImage.Resolution.Width, Is.GreaterThan(0));
                 Assert.That(eventArgs.MainImage.Resolution.Height, Is.GreaterThan(0));
+
+                await completeWaiter.IsRaisedAsync();
             }
         }
 
@@ -73,15 +81,19 @@ namespace Tizen.Multimedia.Tests
         [Property("AUTHOR", "Vivek Ellur, vivek.ellur@samsung.com")]
         public static async Task Format_PROPERTY_READ_ONLY()
         {
+            using (var completeWaiter = EventAwaiter.Create())
             using (var eventWaiter = EventAwaiter<CameraCapturingEventArgs>.Create())
             {
                 TestCamera.Capturing += eventWaiter;
+                TestCamera.CaptureCompleted += completeWaiter;
 
                 TestCamera.StartPreview();
                 TestCamera.StartCapture();
 
                 var eventArgs = await eventWaiter.GetResultAsync();
                 Assert.That(eventArgs.MainImage.Format, Is.EqualTo(CameraPixelFormat.Jpeg));
+
+                await completeWaiter.IsRaisedAsync();
             }
         }
 
@@ -94,15 +106,19 @@ namespace Tizen.Multimedia.Tests
         [Property("AUTHOR", "Vivek Ellur, vivek.ellur@samsung.com")]
         public static async Task Exif_PROPERTY_READ_ONLY()
         {
+            using (var completeWaiter = EventAwaiter.Create())
             using (var eventWaiter = EventAwaiter<CameraCapturingEventArgs>.Create())
             {
                 TestCamera.Capturing += eventWaiter;
+                TestCamera.CaptureCompleted += completeWaiter;
 
                 TestCamera.StartPreview();
                 TestCamera.StartCapture();
 
                 var eventArgs = await eventWaiter.GetResultAsync();
                 Assert.IsNotNull(eventArgs.MainImage.Exif);
+
+                await completeWaiter.IsRaisedAsync();
             }
         }
     }