Renamed bundle.h to ex_bundle.h

Change-Id: I03fa437dddbb718891bf5b1b733a2bbe72d744d5
Signed-off-by: mk5004.lee <mk5004.lee@samsung.com>

diff --git a/notification-ex/abstract_action.h b/notification-ex/abstract_action.h
index a5431b13f44a9b2b92ae8b13b6c0b698b9f43f24..347c6596a54af5459f61cf1b28a258d2a4188a09 100644 (file)
--- a/notification-ex/abstract_action.h
+++ b/notification-ex/abstract_action.h
@@ -22,7 +22,7 @@
 #include <memory>
 #include <string>
 
-#include "notification-ex/bundle.h"
+#include "notification-ex/ex_bundle.h"
 
 #ifndef EXPORT_API
 #define EXPORT_API __attribute__((visibility("default")))

diff --git a/notification-ex/abstract_item.h b/notification-ex/abstract_item.h
index 9069ee07ee25ed8569fa53a3d23d812b67d72b2b..291916370cf924f79911437f9c698e67143da68a 100644 (file)
--- a/notification-ex/abstract_item.h
+++ b/notification-ex/abstract_item.h
@@ -23,7 +23,7 @@
 #include <string>
 
 #include "notification-ex/abstract_action.h"
-#include "notification-ex/bundle.h"
+#include "notification-ex/ex_bundle.h"
 
 #ifndef EXPORT_API
 #define EXPORT_API __attribute__((visibility("default")))

diff --git a/notification-ex/action.cc b/notification-ex/action.cc
index f5f337f6437ea7190b12721941cbece3e5c3db42..4866dd30fb10641584a5b0a587d65008c3b0b08b 100644 (file)
--- a/notification-ex/action.cc
+++ b/notification-ex/action.cc
@@ -18,7 +18,7 @@
 #include <memory>
 
 #include "notification-ex/action.h"
-#include "notification-ex/bundle.h"
+#include "notification-ex/ex_bundle.h"
 #include "notification-ex/exception.h"
 
 #ifdef LOG_TAG

diff --git a/notification-ex/action.h b/notification-ex/action.h
index 247e3230002fdb17368357b1767ddce801746536..f6abb2e51d90751365cadcf883c0f1c6630ec0de 100644 (file)
--- a/notification-ex/action.h
+++ b/notification-ex/action.h
@@ -23,7 +23,7 @@
 #include <string>
 
 #include "notification-ex/abstract_action.h"
-#include "notification-ex/bundle.h"
+#include "notification-ex/ex_bundle.h"
 
 namespace notification {
 namespace item {

diff --git a/notification-ex/bundle.cc b/notification-ex/bundle.cc
index 04d9a6e20049aee2ec59e19afb88c9aa3f1e3460..a0b9b3527cc047a39c4978feb8d66819abf951c7 100644 (file)
--- a/notification-ex/bundle.cc
+++ b/notification-ex/bundle.cc
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "notification-ex/bundle.h"
+#include "notification-ex/ex_bundle.h"
 #include "notification-ex/exception.h"
 
 #ifdef LOG_TAG

diff --git a/notification-ex/bundle.h b/notification-ex/bundle.h
deleted file mode 100644 (file)
index 894f8b3..0000000
--- a/notification-ex/bundle.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2019 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef NOTIFICATION_EX_BUNDLE_H_
-#define NOTIFICATION_EX_BUNDLE_H_
-
-#include <bundle.h>
-
-#include <string>
-
-#ifndef EXPORT_API
-#define EXPORT_API __attribute__((visibility("default")))
-#endif
-
-namespace notification {
-namespace item {
-
-class EXPORT_API Bundle {
- public:
-  Bundle();
-  explicit Bundle(std::string raw);
-  explicit Bundle(bundle* raw);
-  ~Bundle();
-
-  Bundle(const Bundle&);
-  Bundle& operator=(const Bundle&);
-
-  Bundle(Bundle && other);
-  Bundle& operator=(Bundle && other);
-
-  const bundle* GetConstRaw() const;
-  bundle* GetRaw();
-  const char* ToString();
-
- private:
-  bundle* raw_ = NULL;
-  char* str_raw_ = NULL;
-};
-
-}  // namespace item
-}  // namespace notification
-
-#endif  // NOTIFICATION_EX_BUNDLE_H_

diff --git a/notification-ex/dbus_sender.h b/notification-ex/dbus_sender.h
index 5fd1beddaad740119ed390527921c3484e6060ba..b8063be041adb210a1c5dab233ae0ca3457505c1 100644 (file)
--- a/notification-ex/dbus_sender.h
+++ b/notification-ex/dbus_sender.h
@@ -17,7 +17,7 @@
 #ifndef NOTIFICATION_EX_DBUS_SENDER_H_
 #define NOTIFICATION_EX_DBUS_SENDER_H_
 
-#include "notification-ex/bundle.h"
+#include "notification-ex/ex_bundle.h"
 
 #ifndef EXPORT_API
 #define EXPORT_API __attribute__((visibility("default")))

diff --git a/notification-ex/ex_bundle.h b/notification-ex/ex_bundle.h
new file mode 100644 (file)
index 0000000..894f8b3
--- /dev/null
+++ b/notification-ex/ex_bundle.h
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2019 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef NOTIFICATION_EX_BUNDLE_H_
+#define NOTIFICATION_EX_BUNDLE_H_
+
+#include <bundle.h>
+
+#include <string>
+
+#ifndef EXPORT_API
+#define EXPORT_API __attribute__((visibility("default")))
+#endif
+
+namespace notification {
+namespace item {
+
+class EXPORT_API Bundle {
+ public:
+  Bundle();
+  explicit Bundle(std::string raw);
+  explicit Bundle(bundle* raw);
+  ~Bundle();
+
+  Bundle(const Bundle&);
+  Bundle& operator=(const Bundle&);
+
+  Bundle(Bundle && other);
+  Bundle& operator=(Bundle && other);
+
+  const bundle* GetConstRaw() const;
+  bundle* GetRaw();
+  const char* ToString();
+
+ private:
+  bundle* raw_ = NULL;
+  char* str_raw_ = NULL;
+};
+
+}  // namespace item
+}  // namespace notification
+
+#endif  // NOTIFICATION_EX_BUNDLE_H_

diff --git a/notification-ex/item.h b/notification-ex/item.h
index b6993368377424ada40011ff1cd7a159d97c0df3..adab14854ad3f94de0bc66bc84f0c4353a78c8ef 100644 (file)
--- a/notification-ex/item.h
+++ b/notification-ex/item.h
@@ -24,7 +24,7 @@
 #include <list>
 
 #include "notification-ex/abstract_item.h"
-#include "notification-ex/bundle.h"
+#include "notification-ex/ex_bundle.h"
 
 #ifndef EXPORT_API
 #define EXPORT_API __attribute__((visibility("default")))

diff --git a/notification-ex/mock_sender.h b/notification-ex/mock_sender.h
index c4dea8822b278953c162ce9fd89650bc84b773b6..769c735deb4c6ce980aa3b59fc7671a16a395af7 100644 (file)
--- a/notification-ex/mock_sender.h
+++ b/notification-ex/mock_sender.h
@@ -17,7 +17,7 @@
 #ifndef NOTIFICATION_EX_MOCK_SENDER_H_
 #define NOTIFICATION_EX_MOCK_SENDER_H_
 
-#include "notification-ex/bundle.h"
+#include "notification-ex/ex_bundle.h"
 
 #ifndef EXPORT_API
 #define EXPORT_API __attribute__((visibility("default")))

diff --git a/notification-ex/observer_interface.h b/notification-ex/observer_interface.h
index 9c1e5d25b2c34d476eb3dd650f798417811acf33..7ea61f62705a7b704327ac2bf9ba97ef5270fe10 100644 (file)
--- a/notification-ex/observer_interface.h
+++ b/notification-ex/observer_interface.h
@@ -17,7 +17,7 @@
 #ifndef NOTIFICATION_EX_OBSERVER_INTERFACE_H_
 #define NOTIFICATION_EX_OBSERVER_INTERFACE_H_
 
-#include "notification-ex/bundle.h"
+#include "notification-ex/ex_bundle.h"
 #include "notification-ex/event_info.h"
 
 #ifndef EXPORT_API
@@ -35,4 +35,4 @@ class EXPORT_API IEventObserver {
 
 }  // namespace notification
 
-#endif
\ No newline at end of file
+#endif

diff --git a/unittest/CMakeLists.txt b/unittest/CMakeLists.txt
index 6fdede0c1953265613c2df747b9355c0d854730a..37b60148f87ffb7784bab88f6eb88916a1a8ae69 100644 (file)
--- a/unittest/CMakeLists.txt
+++ b/unittest/CMakeLists.txt
@@ -29,6 +29,7 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${notification-ex_unittests_LDFLAGS}
     ${pkgs_LDFLAGS}
     ${pkgs_LIBRARIES}
     gmock
+    notification-ex
 )
 
 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin/)

diff --git a/unittest/src/test_bundle.cc b/unittest/src/test_bundle.cc
new file mode 100644 (file)
index 0000000..eea029c
--- /dev/null
+++ b/unittest/src/test_bundle.cc
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2019 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <string>
+
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
+
+#include "notification-ex/ex_bundle.h"
+
+class BUNDLE : public ::testing::Test {
+ public:
+  virtual void SetUp() {
+  }
+  virtual void TearDown() {
+  }
+};