[cleanup]revise file location, name and so on

Change-Id: Ibb07ff6f809495437edf3b2658cbe2d27859018b

15 files changed, 219 insertions, 280 deletions

diff --git a/AUTHORS b/AUTHORS
deleted file mode 100644
index 058627b..0000000
--- a/AUTHORS
+++ /dev/null
@@ -1,3 +0,0 @@
-Hakjoo Ko <hakjoo.ko@samsung.com>

-Hyungdeuk Kim <hd3.kim@samsung.com>

-

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 114179a..68be338 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,7 @@ SET(INCLUDEDIR "\${prefix}/include/db-util")
 SET(VERSION_MAJOR 0)
 SET(VERSION  "${VERSION_MAJOR}.1.0")
 
-SET(SRCS util_func.c collation.c)
+SET(SRCS src/util-func.c src/collation.c)
 
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
 
@@ -51,5 +51,5 @@ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/util-func.h DESTINATION includ
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/collation.h DESTINATION include/db-util)
 
 IF( DEFINED GCOV )
-ADD_SUBDIRECTORY(unittest)
+ADD_SUBDIRECTORY(tests)
 ENDIF()
diff --git a/LICENSE b/LICENSE.APLv2
index 9c13a9b..247c97d 100644
--- a/LICENSE
+++ b/LICENSE.APLv2
@@ -1,204 +1,203 @@
-Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.

-

-                                 Apache License

-                           Version 2.0, January 2004

-                        http://www.apache.org/licenses/

-

-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

-

-   1. Definitions.

-

-      "License" shall mean the terms and conditions for use, reproduction,

-      and distribution as defined by Sections 1 through 9 of this document.

-

-      "Licensor" shall mean the copyright owner or entity authorized by

-      the copyright owner that is granting the License.

-

-      "Legal Entity" shall mean the union of the acting entity and all

-      other entities that control, are controlled by, or are under common

-      control with that entity. For the purposes of this definition,

-      "control" means (i) the power, direct or indirect, to cause the

-      direction or management of such entity, whether by contract or

-      otherwise, or (ii) ownership of fifty percent (50%) or more of the

-      outstanding shares, or (iii) beneficial ownership of such entity.

-

-      "You" (or "Your") shall mean an individual or Legal Entity

-      exercising permissions granted by this License.

-

-      "Source" form shall mean the preferred form for making modifications,

-      including but not limited to software source code, documentation

-      source, and configuration files.

-

-      "Object" form shall mean any form resulting from mechanical

-      transformation or translation of a Source form, including but

-      not limited to compiled object code, generated documentation,

-      and conversions to other media types.

-

-      "Work" shall mean the work of authorship, whether in Source or

-      Object form, made available under the License, as indicated by a

-      copyright notice that is included in or attached to the work

-      (an example is provided in the Appendix below).

-

-      "Derivative Works" shall mean any work, whether in Source or Object

-      form, that is based on (or derived from) the Work and for which the

-      editorial revisions, annotations, elaborations, or other modifications

-      represent, as a whole, an original work of authorship. For the purposes

-      of this License, Derivative Works shall not include works that remain

-      separable from, or merely link (or bind by name) to the interfaces of,

-      the Work and Derivative Works thereof.

-

-      "Contribution" shall mean any work of authorship, including

-      the original version of the Work and any modifications or additions

-      to that Work or Derivative Works thereof, that is intentionally

-      submitted to Licensor for inclusion in the Work by the copyright owner

-      or by an individual or Legal Entity authorized to submit on behalf of

-      the copyright owner. For the purposes of this definition, "submitted"

-      means any form of electronic, verbal, or written communication sent

-      to the Licensor or its representatives, including but not limited to

-      communication on electronic mailing lists, source code control systems,

-      and issue tracking systems that are managed by, or on behalf of, the

-      Licensor for the purpose of discussing and improving the Work, but

-      excluding communication that is conspicuously marked or otherwise

-      designated in writing by the copyright owner as "Not a Contribution."

-

-      "Contributor" shall mean Licensor and any individual or Legal Entity

-      on behalf of whom a Contribution has been received by Licensor and

-      subsequently incorporated within the Work.

-

-   2. Grant of Copyright License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      copyright license to reproduce, prepare Derivative Works of,

-      publicly display, publicly perform, sublicense, and distribute the

-      Work and such Derivative Works in Source or Object form.

-

-   3. Grant of Patent License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      (except as stated in this section) patent license to make, have made,

-      use, offer to sell, sell, import, and otherwise transfer the Work,

-      where such license applies only to those patent claims licensable

-      by such Contributor that are necessarily infringed by their

-      Contribution(s) alone or by combination of their Contribution(s)

-      with the Work to which such Contribution(s) was submitted. If You

-      institute patent litigation against any entity (including a

-      cross-claim or counterclaim in a lawsuit) alleging that the Work

-      or a Contribution incorporated within the Work constitutes direct

-      or contributory patent infringement, then any patent licenses

-      granted to You under this License for that Work shall terminate

-      as of the date such litigation is filed.

-

-   4. Redistribution. You may reproduce and distribute copies of the

-      Work or Derivative Works thereof in any medium, with or without

-      modifications, and in Source or Object form, provided that You

-      meet the following conditions:

-

-      (a) You must give any other recipients of the Work or

-          Derivative Works a copy of this License; and

-

-      (b) You must cause any modified files to carry prominent notices

-          stating that You changed the files; and

-

-      (c) You must retain, in the Source form of any Derivative Works

-          that You distribute, all copyright, patent, trademark, and

-          attribution notices from the Source form of the Work,

-          excluding those notices that do not pertain to any part of

-          the Derivative Works; and

-

-      (d) If the Work includes a "NOTICE" text file as part of its

-          distribution, then any Derivative Works that You distribute must

-          include a readable copy of the attribution notices contained

-          within such NOTICE file, excluding those notices that do not

-          pertain to any part of the Derivative Works, in at least one

-          of the following places: within a NOTICE text file distributed

-          as part of the Derivative Works; within the Source form or

-          documentation, if provided along with the Derivative Works; or,

-          within a display generated by the Derivative Works, if and

-          wherever such third-party notices normally appear. The contents

-          of the NOTICE file are for informational purposes only and

-          do not modify the License. You may add Your own attribution

-          notices within Derivative Works that You distribute, alongside

-          or as an addendum to the NOTICE text from the Work, provided

-          that such additional attribution notices cannot be construed

-          as modifying the License.

-

-      You may add Your own copyright statement to Your modifications and

-      may provide additional or different license terms and conditions

-      for use, reproduction, or distribution of Your modifications, or

-      for any such Derivative Works as a whole, provided Your use,

-      reproduction, and distribution of the Work otherwise complies with

-      the conditions stated in this License.

-

-   5. Submission of Contributions. Unless You explicitly state otherwise,

-      any Contribution intentionally submitted for inclusion in the Work

-      by You to the Licensor shall be under the terms and conditions of

-      this License, without any additional terms or conditions.

-      Notwithstanding the above, nothing herein shall supersede or modify

-      the terms of any separate license agreement you may have executed

-      with Licensor regarding such Contributions.

-

-   6. Trademarks. This License does not grant permission to use the trade

-      names, trademarks, service marks, or product names of the Licensor,

-      except as required for reasonable and customary use in describing the

-      origin of the Work and reproducing the content of the NOTICE file.

-

-   7. Disclaimer of Warranty. Unless required by applicable law or

-      agreed to in writing, Licensor provides the Work (and each

-      Contributor provides its Contributions) on an "AS IS" BASIS,

-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or

-      implied, including, without limitation, any warranties or conditions

-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A

-      PARTICULAR PURPOSE. You are solely responsible for determining the

-      appropriateness of using or redistributing the Work and assume any

-      risks associated with Your exercise of permissions under this License.

-

-   8. Limitation of Liability. In no event and under no legal theory,

-      whether in tort (including negligence), contract, or otherwise,

-      unless required by applicable law (such as deliberate and grossly

-      negligent acts) or agreed to in writing, shall any Contributor be

-      liable to You for damages, including any direct, indirect, special,

-      incidental, or consequential damages of any character arising as a

-      result of this License or out of the use or inability to use the

-      Work (including but not limited to damages for loss of goodwill,

-      work stoppage, computer failure or malfunction, or any and all

-      other commercial damages or losses), even if such Contributor

-      has been advised of the possibility of such damages.

-

-   9. Accepting Warranty or Additional Liability. While redistributing

-      the Work or Derivative Works thereof, You may choose to offer,

-      and charge a fee for, acceptance of support, warranty, indemnity,

-      or other liability obligations and/or rights consistent with this

-      License. However, in accepting such obligations, You may act only

-      on Your own behalf and on Your sole responsibility, not on behalf

-      of any other Contributor, and only if You agree to indemnify,

-      defend, and hold each Contributor harmless for any liability

-      incurred by, or claims asserted against, such Contributor by reason

-      of your accepting any such warranty or additional liability.

-

-   END OF TERMS AND CONDITIONS

-

-   APPENDIX: How to apply the Apache License to your work.

-

-      To apply the Apache License to your work, attach the following

-      boilerplate notice, with the fields enclosed by brackets "[]"

-      replaced with your own identifying information. (Don't include

-      the brackets!)  The text should be enclosed in the appropriate

-      comment syntax for the file format. We also recommend that a

-      file or class name and description of purpose be included on the

-      same "printed page" as the copyright notice for easier

-      identification within third-party archives.

-

-   Copyright [yyyy] [name of copyright owner]

-

-   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.

-

+Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.
diff --git a/packaging/libslp-db-util-devel.manifest b/packaging/libslp-db-util-devel.manifest
deleted file mode 100644
index c00c25b..0000000
--- a/packaging/libslp-db-util-devel.manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-<manifest>
-        <request>
-                <domain name="_" />
-        </request>
-</manifest>
diff --git a/packaging/libslp-db-util.changes b/packaging/libslp-db-util.changes
deleted file mode 100644
index 6b431c6..0000000
--- a/packaging/libslp-db-util.changes
+++ /dev/null
@@ -1,3 +0,0 @@
-* Thu Jun 27 2013 Anas Nashif <anas.nashif@intel.com> accepted/tizen/20130520.100924@61e2996
-- cleanup and remove obsolete files
-
diff --git a/packaging/libslp-db-util.spec b/packaging/libslp-db-util.spec
index 1f2c5ae..27d34ca 100755..100644
--- a/packaging/libslp-db-util.spec
+++ b/packaging/libslp-db-util.spec
@@ -6,7 +6,6 @@ Summary:        DB Utility
 Group:          Application Framework/Database
 Source0:        %{name}-%{version}.tar.gz
 Source1001:	%{name}.manifest
-Source1002:	%{name}-devel.manifest
 BuildRequires:  cmake
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(glib-2.0)
@@ -38,7 +37,7 @@ libslp-db-util gcov objects
 
 %prep
 %setup -q
-cp %{SOURCE1001} %{SOURCE1002} .
+cp %{SOURCE1001} ./%{name}.manifest
 
 %build
 
@@ -74,7 +73,7 @@ install -m 0644 gcov-obj/* %{buildroot}%{_datadir}/gcov/obj
 
 %check
 %if 0%{?gcov:1}
-pushd unittest
+pushd tests
 ./run_coverage.sh
 popd
 %endif
@@ -85,13 +84,12 @@ popd
 
 %files
 %manifest %{name}.manifest
-%license LICENSE
+%license LICENSE.APLv2
 %defattr(-,root,root,-)
 %{_libdir}/libSLP-db-util.so.0
 %{_libdir}/libSLP-db-util.so.0.1.0
 
 %files devel
-%manifest %{name}-devel.manifest
 %defattr(-,root,root,-)
 %dir %{_includedir}/db-util
 %{_includedir}/db-util/*.h
@@ -101,7 +99,6 @@ popd
 
 %if 0%{?gcov:1}
 %files gcov
-%manifest %{name}-devel.manifest
 %defattr(-,root,root,-)
 %{_datadir}/gcov/obj/*
 %endif
diff --git a/collation.c b/src/collation.c
index e1e966b..e3358d9 100644
--- a/collation.c
+++ b/src/collation.c
@@ -559,4 +559,3 @@ static char *strtoutf8(const UChar * unichars, int len)
 }
 
 #endif
-
diff --git a/include/db-util-debug.h b/src/db-util-debug.h
index 24cf82e..49d61a4 100644
--- a/include/db-util-debug.h
+++ b/src/db-util-debug.h
@@ -67,4 +67,3 @@
 
 #endif
 #endif /* __DB_UTIL_DEBUG_H_ */
-
diff --git a/util_func.c b/src/util-func.c
index ac0dcff..09ae820 100644
--- a/util_func.c
+++ b/src/util-func.c
@@ -154,5 +154,3 @@ int db_util_close(sqlite3 *pDB)
 
 	return DB_UTIL_OK;
 }
-
-
diff --git a/unittest/CMakeLists.txt b/tests/CMakeLists.txt
index 609a0a0..592da0d 100644
--- a/unittest/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -19,8 +19,8 @@ SET_TARGET_PROPERTIES(${VCONF_MOCK} PROPERTIES
 )
 TARGET_LINK_LIBRARIES(${VCONF_MOCK} ${gtest_pkgs_LIBRARIES} -ldl)
 #=======================================================================================#
-SET(DB-UTIL_GTEST "db-util_gtest")
-SET(DB-UTIL_GTEST_SRCS db-util_gtest.cpp)
+SET(DB-UTIL_GTEST "db-util-gtest")
+SET(DB-UTIL_GTEST_SRCS db-util-gtest.cpp)
 ADD_EXECUTABLE(${DB-UTIL_GTEST} ${DB-UTIL_GTEST_SRCS})
 TARGET_LINK_LIBRARIES(${DB-UTIL_GTEST} ${gtest_pkgs_LIBRARIES} pthread gtest SLP-db-util )
 #=======================================================================================#
diff --git a/unittest/db-util_gtest.cpp b/tests/db-util-gtest.cpp
index 2eadb35..7000986 100644
--- a/unittest/db-util_gtest.cpp
+++ b/tests/db-util-gtest.cpp
@@ -172,7 +172,7 @@ int run_query(sqlite3 *db, char* col_name) {
 TEST_F(DbUtil, db_util_create_collation_p1) {
 	int rc;
 
-	rc = system("./test_collation_db.sh");
+	rc = system("./test-collation-db.sh");
 
 	rc = db_util_open(pszFilePath, &db, nOption);
 	ASSERT_EQ ( DB_UTIL_OK , rc );
@@ -193,7 +193,7 @@ TEST_F(DbUtil, db_util_create_collation_p1) {
 TEST_F(DbUtil, db_util_create_collation_p2) {
 	int rc;
 
-	rc = system("./test_collation_db.sh");
+	rc = system("./test-collation-db.sh");
 
 	rc = db_util_open(pszFilePath, &db, nOption);
 	ASSERT_EQ ( DB_UTIL_OK , rc );
@@ -214,7 +214,7 @@ TEST_F(DbUtil, db_util_create_collation_p2) {
 TEST_F(DbUtil, db_util_create_collation_p3) {
 	int rc;
 
-	rc = system("./test_collation_db.sh");
+	rc = system("./test-collation-db.sh");
 
 	rc = db_util_open(pszFilePath, &db, nOption);
 	ASSERT_EQ ( DB_UTIL_OK , rc );
@@ -235,7 +235,7 @@ TEST_F(DbUtil, db_util_create_collation_p3) {
 TEST_F(DbUtil, db_util_create_collation_p4) {
 	int rc;
 
-	rc = system("./test_collation_db.sh");
+	rc = system("./test-collation-db.sh");
 
 	rc = db_util_open(pszFilePath, &db, nOption);
 	ASSERT_EQ ( DB_UTIL_OK , rc );
@@ -256,7 +256,7 @@ TEST_F(DbUtil, db_util_create_collation_p4) {
 TEST_F(DbUtil, db_util_create_collation_p5) {
 	int rc;
 
-	rc = system("./test_collation_db.sh");
+	rc = system("./test-collation-db.sh");
 
 	rc = db_util_open(pszFilePath, &db, nOption);
 	ASSERT_EQ ( DB_UTIL_OK , rc );
@@ -277,7 +277,7 @@ TEST_F(DbUtil, db_util_create_collation_p5) {
 TEST_F(DbUtil, db_util_create_collation_p6) {
 	int rc;
 
-	rc = system("./test_collation_db.sh");
+	rc = system("./test-collation-db.sh");
 
 	rc = db_util_open(pszFilePath, &db, nOption);
 	ASSERT_EQ ( DB_UTIL_OK , rc );
@@ -298,7 +298,7 @@ TEST_F(DbUtil, db_util_create_collation_p6) {
 TEST_F(DbUtil, db_util_create_collation_p7) {
 	int rc;
 
-	rc = system("./test_collation_db.sh");
+	rc = system("./test-collation-db.sh");
 
 	rc = db_util_open(pszFilePath, &db, nOption);
 	ASSERT_EQ ( DB_UTIL_OK , rc );
@@ -319,7 +319,7 @@ TEST_F(DbUtil, db_util_create_collation_p7) {
 TEST_F(DbUtil, db_util_create_collation_p8) {
 	int rc;
 
-	rc = system("./test_collation_db.sh");
+	rc = system("./test-collation-db.sh");
 
 	rc = db_util_open(pszFilePath, &db, nOption);
 	ASSERT_EQ ( DB_UTIL_OK , rc );
diff --git a/unittest/run_coverage.sh b/tests/run_coverage.sh
index 700484e..f93918f 100755
--- a/unittest/run_coverage.sh
+++ b/tests/run_coverage.sh
@@ -9,7 +9,7 @@ popd
 # /usr/bin/buxton2ctl -i -d create-string "system"  "db/menu_widget/language"   "en_US.UTF-8"  "http://tizen.org/privilege/internal/default/public" "http://tizen.org/privilege/systemsettings.admin"
 # fi
 
-unitTestFile=db-util_gtest
+unitTestFile=db-util-gtest
 if [ ! -x  "./$unitTestFile" ]
 then
     echo "$unitTestFile file does not exist!"
@@ -36,4 +36,3 @@ pushd $CMakeDir
         echo "lcov does not exist!"
     fi
 popd
-
diff --git a/unittest/test_collation_db.sh b/tests/test-collation-db.sh
index f75dfab..d549f4d 100755
--- a/unittest/test_collation_db.sh
+++ b/tests/test-collation-db.sh
@@ -27,4 +27,3 @@ INSERT INTO ${tableName} ( key, value) values ( "test_03", "테스트 3");
 INSERT INTO ${tableName} ( key, value) values ( "test_06", "테스트 03");
 COMMIT TRANSACTION;
 EOF
-
diff --git a/unittest/vconf.c b/tests/vconf.c
index c005f49..fbcd1ef 100644
--- a/unittest/vconf.c
+++ b/tests/vconf.c
@@ -530,5 +530,3 @@ EXPORT int vconf_get_ext_errno(void){
 #ifdef __cplusplus
 }
 #endif
-
-
diff --git a/unittest/vconf.sym b/unittest/vconf.sym
deleted file mode 100644
index 745cacf..0000000
--- a/unittest/vconf.sym
+++ /dev/null
@@ -1,38 +0,0 @@
-VCONF_BUXTON_1.0 {
-	global:
-		vconf_keynode_get_name;
-		vconf_keynode_get_type;
-		vconf_keynode_get_int;
-		vconf_keynode_get_dbl;
-		vconf_keynode_get_bool;
-		vconf_keynode_get_str;
-		vconf_notify_key_changed;
-		vconf_ignore_key_changed;
-		vconf_set_int;
-		vconf_set_bool;
-		vconf_set_str;
-		vconf_set_dbl;
-		vconf_get_int;
-		vconf_get_bool;
-		vconf_get_str;
-		vconf_get_dbl;
-		vconf_get_ext_errno;
-		vconf_keylist_new;
-		vconf_keylist_free;
-		vconf_keylist_add_int;
-		vconf_keylist_add_bool;
-		vconf_keylist_add_dbl;
-		vconf_keylist_add_str;
-		vconf_keylist_add_null;
-		vconf_keylist_del;
-		vconf_keylist_nextnode;
-		vconf_keylist_rewind;
-		vconf_get;
-		vconf_set;
-		vconf_unset;
-		vconf_unset_recursive;
-		vconf_sync_key;
-		vconf_keylist_lookup;
-	local:
-		*;
-};