From 0dca7f3f7abdd0a92aa048123a55dd61165b778b Mon Sep 17 00:00:00 2001
From: ahcorde <ahcorde@gmail.com>
Date: Mon, 28 Jun 2021 13:56:06 +0200
Subject: [PATCH 1/3] Fixed tests

Signed-off-by: ahcorde <ahcorde@gmail.com>
---
 src/Application_TEST.cc                        | 5 ++++-
 src/MainWindow_TEST.cc                         | 5 ++++-
 src/Plugin_TEST.cc                             | 5 ++++-
 src/ign.cc                                     | 5 ++++-
 src/plugins/publisher/Publisher_TEST.cc        | 5 ++++-
 src/plugins/screenshot/Screenshot_TEST.cc      | 5 ++++-
 src/plugins/topic_viewer/TopicViewer_TEST.cc   | 5 ++++-
 src/plugins/world_control/WorldControl_TEST.cc | 5 ++++-
 src/plugins/world_stats/WorldStats_TEST.cc     | 5 ++++-
 test/integration/Examples_TEST.cc              | 5 ++++-
 test/integration/scene3d.cc                    | 5 ++++-
 11 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/src/Application_TEST.cc b/src/Application_TEST.cc
index 1f692e031..154b64137 100644
--- a/src/Application_TEST.cc
+++ b/src/Application_TEST.cc
@@ -27,7 +27,10 @@
 #include "ignition/gui/Plugin.hh"
 
 int g_argc = 1;
-char **g_argv = new char *[g_argc];
+char* g_argv[] =
+{
+    reinterpret_cast<char*>(const_cast<char*>("./Application_TEST")),
+};
 
 using namespace ignition;
 using namespace gui;
diff --git a/src/MainWindow_TEST.cc b/src/MainWindow_TEST.cc
index 3100586d8..a0c0b75a8 100644
--- a/src/MainWindow_TEST.cc
+++ b/src/MainWindow_TEST.cc
@@ -28,7 +28,10 @@
 
 std::string kTestConfigFile = "/tmp/ign-gui-test.config"; // NOLINT(*)
 int g_argc = 1;
-char **g_argv = new char *[g_argc];
+char* g_argv[] =
+{
+    reinterpret_cast<char*>(const_cast<char*>("./MainWindow_TEST")),
+};
 
 using namespace ignition;
 using namespace gui;
diff --git a/src/Plugin_TEST.cc b/src/Plugin_TEST.cc
index 04a21158b..6f156673d 100644
--- a/src/Plugin_TEST.cc
+++ b/src/Plugin_TEST.cc
@@ -26,7 +26,10 @@
 #include "ignition/gui/Plugin.hh"
 
 int g_argc = 1;
-char **g_argv = new char *[g_argc];
+char* g_argv[] =
+{
+    reinterpret_cast<char*>(const_cast<char*>("./Plugin_TEST")),
+};
 
 using namespace ignition;
 using namespace gui;
diff --git a/src/ign.cc b/src/ign.cc
index 1e186a998..35ba80961 100644
--- a/src/ign.cc
+++ b/src/ign.cc
@@ -28,7 +28,10 @@
 #include "ignition/gui/MainWindow.hh"
 
 int g_argc = 1;
-char **g_argv = new char *[g_argc];
+char* g_argv[] =
+{
+    reinterpret_cast<char*>(const_cast<char*>("./ignition")),
+};
 
 //////////////////////////////////////////////////
 extern "C" IGNITION_GUI_VISIBLE char *ignitionVersion()
diff --git a/src/plugins/publisher/Publisher_TEST.cc b/src/plugins/publisher/Publisher_TEST.cc
index f70b6386a..c9211cd7a 100644
--- a/src/plugins/publisher/Publisher_TEST.cc
+++ b/src/plugins/publisher/Publisher_TEST.cc
@@ -34,7 +34,10 @@
 #include "Publisher.hh"
 
 int g_argc = 1;
-char **g_argv = new char *[g_argc];
+char* g_argv[] =
+{
+    reinterpret_cast<char*>(const_cast<char*>("./Publisher_TEST")),
+};
 
 using namespace ignition;
 using namespace gui;
diff --git a/src/plugins/screenshot/Screenshot_TEST.cc b/src/plugins/screenshot/Screenshot_TEST.cc
index 31f794272..ed01fd040 100644
--- a/src/plugins/screenshot/Screenshot_TEST.cc
+++ b/src/plugins/screenshot/Screenshot_TEST.cc
@@ -40,7 +40,10 @@
 #include "Screenshot.hh"
 
 int g_argc = 1;
-char **g_argv = new char *[g_argc];
+char* g_argv[] =
+{
+    reinterpret_cast<char*>(const_cast<char*>("./Screenshot_TEST")),
+};
 
 using namespace ignition;
 using namespace gui;
diff --git a/src/plugins/topic_viewer/TopicViewer_TEST.cc b/src/plugins/topic_viewer/TopicViewer_TEST.cc
index d642830c2..3a0bb7776 100644
--- a/src/plugins/topic_viewer/TopicViewer_TEST.cc
+++ b/src/plugins/topic_viewer/TopicViewer_TEST.cc
@@ -34,7 +34,10 @@
 
 
 int g_argc = 1;
-char **g_argv = new char *[g_argc];
+char* g_argv[] =
+{
+    reinterpret_cast<char*>(const_cast<char*>("./TopicViewer_TEST")),
+};
 
 using namespace ignition;
 using namespace gui;
diff --git a/src/plugins/world_control/WorldControl_TEST.cc b/src/plugins/world_control/WorldControl_TEST.cc
index bba180a3a..88c41f294 100644
--- a/src/plugins/world_control/WorldControl_TEST.cc
+++ b/src/plugins/world_control/WorldControl_TEST.cc
@@ -28,7 +28,10 @@
 #include "WorldControl.hh"
 
 int g_argc = 1;
-char **g_argv = new char *[g_argc];
+char* g_argv[] =
+{
+    reinterpret_cast<char*>(const_cast<char*>("./WorldControl_TEST")),
+};
 
 using namespace ignition;
 using namespace gui;
diff --git a/src/plugins/world_stats/WorldStats_TEST.cc b/src/plugins/world_stats/WorldStats_TEST.cc
index 8b6680b07..a4827cb00 100644
--- a/src/plugins/world_stats/WorldStats_TEST.cc
+++ b/src/plugins/world_stats/WorldStats_TEST.cc
@@ -28,7 +28,10 @@
 #include "WorldStats.hh"
 
 int g_argc = 1;
-char **g_argv = new char *[g_argc];
+char* g_argv[] =
+{
+    reinterpret_cast<char*>(const_cast<char*>("./WorldStats_TEST")),
+};
 
 using namespace ignition;
 using namespace gui;
diff --git a/test/integration/Examples_TEST.cc b/test/integration/Examples_TEST.cc
index 9bfb40203..819a561fb 100644
--- a/test/integration/Examples_TEST.cc
+++ b/test/integration/Examples_TEST.cc
@@ -25,7 +25,10 @@
 #include "ignition/gui/Application.hh"
 
 int g_argc = 1;
-char **g_argv = new char *[g_argc];
+char* g_argv[] =
+{
+    reinterpret_cast<char*>(const_cast<char*>("./Examples_TEST")),
+};
 
 using namespace ignition;
 using namespace gui;
diff --git a/test/integration/scene3d.cc b/test/integration/scene3d.cc
index ea9dc239e..7c0b4b66f 100644
--- a/test/integration/scene3d.cc
+++ b/test/integration/scene3d.cc
@@ -34,7 +34,10 @@
 #include "ignition/gui/MainWindow.hh"
 
 int g_argc = 1;
-char **g_argv = new char *[g_argc];
+char* g_argv[] =
+{
+    reinterpret_cast<char*>(const_cast<char*>("./Scene3d_TEST")),
+};
 
 using namespace ignition;
 using namespace gui;

From b612844622cd679b4072f32516fa42bc34916e45 Mon Sep 17 00:00:00 2001
From: ahcorde <ahcorde@gmail.com>
Date: Mon, 28 Jun 2021 15:36:35 +0200
Subject: [PATCH 2/3] fixed tests

Signed-off-by: ahcorde <ahcorde@gmail.com>
---
 src/Plugin.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Plugin.cc b/src/Plugin.cc
index bba1ed9d4..b6c58d292 100644
--- a/src/Plugin.cc
+++ b/src/Plugin.cc
@@ -91,7 +91,8 @@ Plugin::Plugin() : dataPtr(new PluginPrivate)
 /////////////////////////////////////////////////
 Plugin::~Plugin()
 {
-  delete this->dataPtr->pluginItem;
+  if (this->dataPtr->pluginItem)
+    delete this->dataPtr->pluginItem;
 }
 
 /////////////////////////////////////////////////

From 1b8f1c0a65343732682bcf3272e91e777c6de47f Mon Sep 17 00:00:00 2001
From: Louise Poubel <louise@openrobotics.org>
Date: Tue, 29 Jun 2021 19:22:19 -0700
Subject: [PATCH 3/3] indentation

Signed-off-by: Louise Poubel <louise@openrobotics.org>
---
 src/Application_TEST.cc                        | 2 +-
 src/MainWindow_TEST.cc                         | 2 +-
 src/Plugin_TEST.cc                             | 2 +-
 src/ign.cc                                     | 2 +-
 src/plugins/publisher/Publisher_TEST.cc        | 2 +-
 src/plugins/screenshot/Screenshot_TEST.cc      | 2 +-
 src/plugins/topic_viewer/TopicViewer_TEST.cc   | 2 +-
 src/plugins/world_control/WorldControl_TEST.cc | 2 +-
 src/plugins/world_stats/WorldStats_TEST.cc     | 2 +-
 test/integration/Examples_TEST.cc              | 2 +-
 test/integration/scene3d.cc                    | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/Application_TEST.cc b/src/Application_TEST.cc
index 154b64137..aacb7bb5a 100644
--- a/src/Application_TEST.cc
+++ b/src/Application_TEST.cc
@@ -29,7 +29,7 @@
 int g_argc = 1;
 char* g_argv[] =
 {
-    reinterpret_cast<char*>(const_cast<char*>("./Application_TEST")),
+  reinterpret_cast<char*>(const_cast<char*>("./Application_TEST")),
 };
 
 using namespace ignition;
diff --git a/src/MainWindow_TEST.cc b/src/MainWindow_TEST.cc
index a0c0b75a8..f7b482acf 100644
--- a/src/MainWindow_TEST.cc
+++ b/src/MainWindow_TEST.cc
@@ -30,7 +30,7 @@ std::string kTestConfigFile = "/tmp/ign-gui-test.config"; // NOLINT(*)
 int g_argc = 1;
 char* g_argv[] =
 {
-    reinterpret_cast<char*>(const_cast<char*>("./MainWindow_TEST")),
+  reinterpret_cast<char*>(const_cast<char*>("./MainWindow_TEST")),
 };
 
 using namespace ignition;
diff --git a/src/Plugin_TEST.cc b/src/Plugin_TEST.cc
index 6f156673d..532171f97 100644
--- a/src/Plugin_TEST.cc
+++ b/src/Plugin_TEST.cc
@@ -28,7 +28,7 @@
 int g_argc = 1;
 char* g_argv[] =
 {
-    reinterpret_cast<char*>(const_cast<char*>("./Plugin_TEST")),
+  reinterpret_cast<char*>(const_cast<char*>("./Plugin_TEST")),
 };
 
 using namespace ignition;
diff --git a/src/ign.cc b/src/ign.cc
index 35ba80961..12ef07713 100644
--- a/src/ign.cc
+++ b/src/ign.cc
@@ -30,7 +30,7 @@
 int g_argc = 1;
 char* g_argv[] =
 {
-    reinterpret_cast<char*>(const_cast<char*>("./ignition")),
+  reinterpret_cast<char*>(const_cast<char*>("./ignition")),
 };
 
 //////////////////////////////////////////////////
diff --git a/src/plugins/publisher/Publisher_TEST.cc b/src/plugins/publisher/Publisher_TEST.cc
index c9211cd7a..a7ecde9ec 100644
--- a/src/plugins/publisher/Publisher_TEST.cc
+++ b/src/plugins/publisher/Publisher_TEST.cc
@@ -36,7 +36,7 @@
 int g_argc = 1;
 char* g_argv[] =
 {
-    reinterpret_cast<char*>(const_cast<char*>("./Publisher_TEST")),
+  reinterpret_cast<char*>(const_cast<char*>("./Publisher_TEST")),
 };
 
 using namespace ignition;
diff --git a/src/plugins/screenshot/Screenshot_TEST.cc b/src/plugins/screenshot/Screenshot_TEST.cc
index ed01fd040..4c25a66a8 100644
--- a/src/plugins/screenshot/Screenshot_TEST.cc
+++ b/src/plugins/screenshot/Screenshot_TEST.cc
@@ -42,7 +42,7 @@
 int g_argc = 1;
 char* g_argv[] =
 {
-    reinterpret_cast<char*>(const_cast<char*>("./Screenshot_TEST")),
+  reinterpret_cast<char*>(const_cast<char*>("./Screenshot_TEST")),
 };
 
 using namespace ignition;
diff --git a/src/plugins/topic_viewer/TopicViewer_TEST.cc b/src/plugins/topic_viewer/TopicViewer_TEST.cc
index 3a0bb7776..38bb4c7d9 100644
--- a/src/plugins/topic_viewer/TopicViewer_TEST.cc
+++ b/src/plugins/topic_viewer/TopicViewer_TEST.cc
@@ -36,7 +36,7 @@
 int g_argc = 1;
 char* g_argv[] =
 {
-    reinterpret_cast<char*>(const_cast<char*>("./TopicViewer_TEST")),
+  reinterpret_cast<char*>(const_cast<char*>("./TopicViewer_TEST")),
 };
 
 using namespace ignition;
diff --git a/src/plugins/world_control/WorldControl_TEST.cc b/src/plugins/world_control/WorldControl_TEST.cc
index 88c41f294..809a934d0 100644
--- a/src/plugins/world_control/WorldControl_TEST.cc
+++ b/src/plugins/world_control/WorldControl_TEST.cc
@@ -30,7 +30,7 @@
 int g_argc = 1;
 char* g_argv[] =
 {
-    reinterpret_cast<char*>(const_cast<char*>("./WorldControl_TEST")),
+  reinterpret_cast<char*>(const_cast<char*>("./WorldControl_TEST")),
 };
 
 using namespace ignition;
diff --git a/src/plugins/world_stats/WorldStats_TEST.cc b/src/plugins/world_stats/WorldStats_TEST.cc
index a4827cb00..a55a9fc87 100644
--- a/src/plugins/world_stats/WorldStats_TEST.cc
+++ b/src/plugins/world_stats/WorldStats_TEST.cc
@@ -30,7 +30,7 @@
 int g_argc = 1;
 char* g_argv[] =
 {
-    reinterpret_cast<char*>(const_cast<char*>("./WorldStats_TEST")),
+  reinterpret_cast<char*>(const_cast<char*>("./WorldStats_TEST")),
 };
 
 using namespace ignition;
diff --git a/test/integration/Examples_TEST.cc b/test/integration/Examples_TEST.cc
index 819a561fb..086623973 100644
--- a/test/integration/Examples_TEST.cc
+++ b/test/integration/Examples_TEST.cc
@@ -27,7 +27,7 @@
 int g_argc = 1;
 char* g_argv[] =
 {
-    reinterpret_cast<char*>(const_cast<char*>("./Examples_TEST")),
+  reinterpret_cast<char*>(const_cast<char*>("./Examples_TEST")),
 };
 
 using namespace ignition;
diff --git a/test/integration/scene3d.cc b/test/integration/scene3d.cc
index 7c0b4b66f..7c81b9a3a 100644
--- a/test/integration/scene3d.cc
+++ b/test/integration/scene3d.cc
@@ -36,7 +36,7 @@
 int g_argc = 1;
 char* g_argv[] =
 {
-    reinterpret_cast<char*>(const_cast<char*>("./Scene3d_TEST")),
+  reinterpret_cast<char*>(const_cast<char*>("./Scene3d_TEST")),
 };
 
 using namespace ignition;