Making ReportTask non-moveable and adjusting where necessary. Fixing error logic to raise proper aws error and added test

Author: DavidOgunsAWS

devicedefender/include/aws/iotdevicedefender/DeviceDefender.h

@@ -51,9 +51,7 @@ namespace Aws
           public:
             ~ReportTask();
             ReportTask(const ReportTask &) = delete;
-            ReportTask(ReportTask &&) noexcept;
             ReportTask &operator=(const ReportTask &) = delete;
-            ReportTask &operator=(ReportTask &&) noexcept;
 
             /**
              * Initiates stopping of the Defender V1 task.
@@ -143,7 +141,7 @@ namespace Aws
             /**
              * Builds a device defender v1 task object from the set options.
              */
-            ReportTask Build() noexcept;
+            std::shared_ptr<ReportTask> Build() noexcept;
 
           private:
             Crt::Allocator *m_allocator;

devicedefender/source/DeviceDefender.cpp

@@ -2,6 +2,7 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0.
  */
+#include "aws/common/error.h"
 #include "aws/crt/Types.h"
 #include "aws/iotdevice/device_defender.h"
 #include <aws/common/clock.h>
@@ -60,45 +61,6 @@ namespace Aws
             }
         }
 
-        ReportTask::ReportTask(ReportTask &&toMove) noexcept
-            : OnTaskCancelled(std::move(toMove.OnTaskCancelled)), cancellationUserdata(toMove.cancellationUserdata),
-              m_allocator(toMove.m_allocator), m_status(toMove.m_status), m_taskConfig(std::move(toMove.m_taskConfig)),
-              m_owningTask(toMove.m_owningTask), m_lastError(toMove.m_lastError),
-              m_mqttConnection(toMove.m_mqttConnection), m_eventLoopGroup(toMove.m_eventLoopGroup)
-        {
-            toMove.m_taskConfig = m_taskConfig;
-            toMove.m_owningTask = m_owningTask;
-            m_owningTask = nullptr;
-            toMove.m_status = ReportTaskStatus::Stopped;
-            toMove.m_owningTask = nullptr;
-            toMove.m_lastError = AWS_ERROR_UNKNOWN;
-        }
-
-        ReportTask &ReportTask::operator=(ReportTask &&toMove) noexcept
-        {
-            if (this != &toMove)
-            {
-                this->~ReportTask();
-
-                OnTaskCancelled = std::move(toMove.OnTaskCancelled);
-                cancellationUserdata = toMove.cancellationUserdata;
-                m_allocator = toMove.m_allocator;
-                m_status = toMove.m_status;
-                m_taskConfig = toMove.m_taskConfig;
-                m_owningTask = toMove.m_owningTask;
-                m_lastError = toMove.m_lastError;
-
-                toMove.OnTaskCancelled = nullptr;
-                toMove.cancellationUserdata = nullptr;
-                toMove.m_allocator = nullptr;
-                toMove.m_status = ReportTaskStatus::Stopped;
-                toMove.m_owningTask = nullptr;
-                toMove.m_lastError = AWS_ERROR_UNKNOWN;
-            }
-
-            return *this;
-        }
-
         ReportTaskStatus ReportTask::GetStatus() noexcept { return this->m_status; }
 
         int ReportTask::StartTask() noexcept
@@ -114,14 +76,17 @@ namespace Aws
                                           aws_event_loop_group_get_next_loop(m_eventLoopGroup.GetUnderlyingHandle())))
                 {
                     this->m_lastError = aws_last_error();
-                    aws_raise_error(this->m_lastError);
                 }
                 else
                 {
                     this->m_status = ReportTaskStatus::Running;
                     return_code = AWS_OP_SUCCESS;
                 }
             }
+            else
+            {
+                aws_raise_error(AWS_ERROR_INVALID_STATE);
+            }
             return return_code;
         }
 
@@ -195,10 +160,9 @@ namespace Aws
             return *this;
         }
 
-        ReportTask ReportTaskBuilder::Build() noexcept
+        std::shared_ptr<ReportTask> ReportTaskBuilder::Build() noexcept
         {
-
-            return ReportTask(
+          return std::shared_ptr<ReportTask>(new ReportTask(
                 m_allocator,
                 m_mqttConnection,
                 m_thingName,
@@ -207,7 +171,7 @@ namespace Aws
                 m_taskPeriodSeconds,
                 m_networkConnectionSamplePeriodSeconds,
                 static_cast<OnTaskCancelledHandler &&>(m_onCancelled),
-                m_cancellationUserdata);
+                m_cancellationUserdata));
         }
 
     } // namespace Iotdevicedefenderv1

devicedefender/tests/DeviceDefenderTest.cpp

@@ -2,6 +2,7 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0.
  */
+#include "aws/common/error.h"
 #include <aws/crt/Api.h>
 
 #include <aws/iotdevicecommon/IotDevice.h>
@@ -61,15 +62,17 @@ static int s_TestDeviceDefenderResourceSafety(Aws::Crt::Allocator *allocator, vo
             .WithTaskCancelledHandler(onCancelled)
             .WithTaskCancellationUserData(&callbackSuccess);
 
-        Aws::Iotdevicedefenderv1::ReportTask task = taskBuilder.Build();
+        std::shared_ptr<Aws::Iotdevicedefenderv1::ReportTask> task = taskBuilder.Build();
 
-        ASSERT_INT_EQUALS((int)Aws::Iotdevicedefenderv1::ReportTaskStatus::Ready, (int)task.GetStatus());
+        ASSERT_INT_EQUALS((int)Aws::Iotdevicedefenderv1::ReportTaskStatus::Ready, (int)task->GetStatus());
 
-        ASSERT_SUCCESS(task.StartTask());
-        ASSERT_INT_EQUALS((int)Aws::Iotdevicedefenderv1::ReportTaskStatus::Running, (int)task.GetStatus());
-        task.StopTask();
+        ASSERT_SUCCESS(task->StartTask());
+        ASSERT_INT_EQUALS((int)Aws::Iotdevicedefenderv1::ReportTaskStatus::Running, (int)task->GetStatus());
+        ASSERT_FAILS(task->StartTask());
+        ASSERT_TRUE(aws_last_error() == AWS_ERROR_INVALID_STATE);
+        task->StopTask();
 
-        ASSERT_TRUE(task.GetStatus() == Aws::Iotdevicedefenderv1::ReportTaskStatus::Stopped);
+        ASSERT_TRUE(task->GetStatus() == Aws::Iotdevicedefenderv1::ReportTaskStatus::Stopped);
 
         {
             std::unique_lock<std::mutex> lock(mutex);
@@ -83,7 +86,7 @@ static int s_TestDeviceDefenderResourceSafety(Aws::Crt::Allocator *allocator, vo
 
         ASSERT_FALSE(mqttClient);
 
-        ASSERT_INT_EQUALS((int)Aws::Iotdevicedefenderv1::ReportTaskStatus::Stopped, (int)task.GetStatus());
+        ASSERT_INT_EQUALS((int)Aws::Iotdevicedefenderv1::ReportTaskStatus::Stopped, (int)task->GetStatus());
     }
 
     return AWS_ERROR_SUCCESS;
@@ -131,12 +134,13 @@ static int s_TestDeviceDefenderFailedTest(Aws::Crt::Allocator *allocator, void *
             .WithTaskPeriodSeconds((uint32_t)1UL)
             .WithReportFormat(Aws::Iotdevicedefenderv1::ReportFormat::AWS_IDDRF_SHORT_JSON);
 
-        Aws::Iotdevicedefenderv1::ReportTask task = taskBuilder.Build();
+        std::shared_ptr<Aws::Iotdevicedefenderv1::ReportTask> task = taskBuilder.Build();
 
-        ASSERT_INT_EQUALS((int)Aws::Iotdevicedefenderv1::ReportTaskStatus::Ready, (int)task.GetStatus());
+        ASSERT_INT_EQUALS((int)Aws::Iotdevicedefenderv1::ReportTaskStatus::Ready, (int)task->GetStatus());
 
-        ASSERT_INT_EQUALS(AWS_OP_ERR, task.StartTask());
-        ASSERT_INT_EQUALS(AWS_ERROR_IOTDEVICE_DEFENDER_UNSUPPORTED_REPORT_FORMAT, task.LastError());
+        ASSERT_INT_EQUALS(AWS_ERROR_IOTDEVICE_DEFENDER_UNSUPPORTED_REPORT_FORMAT, task->LastError());
+        ASSERT_FAILS(task->StartTask());
+        ASSERT_TRUE(aws_last_error() == AWS_ERROR_INVALID_STATE);
 
         mqttConnection->Disconnect();
         ASSERT_TRUE(mqttConnection);