Reslove conflict

Author: frangte

.gitignore

@@ -10,6 +10,8 @@
 /Testing
 /Makefile
 /native_test
+/native_test_c
+/native_test_cpp
 /native.cbp
 /native
 /libnative.a
@@ -20,7 +22,4 @@
 /test.txt
 /logging
 /json
-<<<<<<< HEAD
 /native.iml
-=======
->>>>>>> 6fe558dd88a596443eee2ebb492aaf90de2d7c9d

CMakeLists.txt

@@ -94,12 +94,17 @@ endif ()
 # Dynamic linked library for OSX
 set(DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH})
 
+# Only header files
+file(GLOB_RECURSE HEADERS
+        ./*.h
+        library.hpp
+)
+
 # Include all C/C++ and Unix Assembly files
-file(GLOB_RECURSE SOURCES
+file(GLOB_RECURSE SOURCES_C
         common/*
         crypto/*
         datetime/*
-        java/*
         math/*
         network/*
         server/*
@@ -111,17 +116,11 @@ file(GLOB_RECURSE SOURCES
         validator/*
 )
 
-file(GLOB_RECURSE HEADERS
-        ./*.h
-        library.hpp
-)
-
-# Include all unit test cases
-file(GLOB_RECURSE TESTS
+# Include all C unit test cases
+file(GLOB_RECURSE TESTS_C
         common/*_test.c
         crypto/*_test.c
         datetime/*_test.c
-        java/**/*Test.cpp
         math/*_test.c
         network/*_test.c
         server/*_test.c
@@ -134,16 +133,32 @@ file(GLOB_RECURSE TESTS
 )
 
 # Remove all test files within c files
-foreach (test ${TESTS})
-    list(REMOVE_ITEM SOURCES ${test})
+foreach (test_c_file ${TESTS_C})
+    list(REMOVE_ITEM SOURCES_C ${test_c_file})
+endforeach ()
+
+# Only C++ unit test files
+file(GLOB_RECURSE SOURCES_CPP
+        java/**/*.cpp
+)
+
+# Only C++ unit test files
+file(GLOB_RECURSE TESTS_CPP
+        java/**/*Test.cpp
+)
+
+# Remove all test files within cpp files
+foreach (test_cpp_file ${TESTS_CPP})
+    list(REMOVE_ITEM SOURCES_CPP ${test_cpp_file})
 endforeach ()
 
 # Create test binary for testing
-add_executable(${PROJECT_NAME}_test ${TESTS} ${SOURCES} misc/unit-test.c)
+add_executable(${PROJECT_NAME}_test_c ${TESTS_C} ${SOURCES_C}  misc/unit-test.c)
+add_executable(${PROJECT_NAME}_test ${TESTS_C} ${SOURCES_C} ${TESTS_CPP} ${SOURCES_CPP} misc/unit-test.c)
 
 # Create native library for static linking
-add_library(${PROJECT_NAME}_static ${SOURCES})
-add_library(${PROJECT_NAME} SHARED ${SOURCES} java/lang/Character/Character_Test.cpp)
+add_library(${PROJECT_NAME}_static ${SOURCES_C} ${SOURCES_CPP})
+add_library(${PROJECT_NAME} SHARED ${SOURCES_C} ${SOURCES_CPP})
 
 # Add make test
 add_custom_target(
@@ -159,8 +174,26 @@ add_custom_target(
 
 # Check memory leak
 add_custom_target(
-    leak
-    COMMAND valgrind --error-exitcode=42 --leak-check=full ./native_test
+        leak
+        COMMAND valgrind --track-origins=yes --error-exitcode=2 --show-leak-kinds=all --leak-check=full ./native_test
+)
+
+# Check memory leak
+add_custom_target(
+        leak-debug
+        COMMAND valgrind --gen-suppressions=yes --track-origins=yes --error-exitcode=2 --show-leak-kinds=all --leak-check=full ./native_test
+)
+
+# Check memory leak
+add_custom_target(
+    leak-c
+    COMMAND valgrind --track-origins=yes --error-exitcode=2 --show-leak-kinds=all --leak-check=full ./native_test_c
+)
+
+# Check memory leak
+add_custom_target(
+        leak-c-debug
+        COMMAND valgrind --gen-suppressions=yes --track-origins=yes --error-exitcode=2 --show-leak-kinds=all --leak-check=full ./native_test_c
 )
 
 # Add make installation - install to Unix system
@@ -173,11 +206,13 @@ install(FILES ${HEADERS} DESTINATION include/native)
 # Link library for OSX and other platform
 # Darwin platform no need to link realtime library (-lrt)
 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-    target_link_libraries(${PROJECT_NAME} ${CMAKE_THREAD_LIBS_INIT} ${ZLIB_LIBRARIES} ${OPENSSL_LIBRARIES} -lcrypto)
-    target_link_libraries(${PROJECT_NAME}_static ${CMAKE_THREAD_LIBS_INIT} ${ZLIB_LIBRARIES} ${OPENSSL_LIBRARIES} -lcrypto)
-    target_link_libraries(${PROJECT_NAME}_test ${CMAKE_THREAD_LIBS_INIT} ${ZLIB_LIBRARIES} ${OPENSSL_LIBRARIES} -lcrypto)
+    target_link_libraries(${PROJECT_NAME} ${CMAKE_THREAD_LIBS_INIT} ${ZLIB_LIBRARIES} ${OPENSSL_LIBRARIES} -lcrypto -lm)
+    target_link_libraries(${PROJECT_NAME}_static ${CMAKE_THREAD_LIBS_INIT} ${ZLIB_LIBRARIES} ${OPENSSL_LIBRARIES} -lcrypto -lm)
+    target_link_libraries(${PROJECT_NAME}_test ${CMAKE_THREAD_LIBS_INIT} ${ZLIB_LIBRARIES} ${OPENSSL_LIBRARIES} -lcrypto -lm)
+    target_link_libraries(${PROJECT_NAME}_test_c ${CMAKE_THREAD_LIBS_INIT} ${ZLIB_LIBRARIES} ${OPENSSL_LIBRARIES} -lcrypto -lm)
 else ()
-    target_link_libraries(${PROJECT_NAME} ${CMAKE_THREAD_LIBS_INIT} ${ZLIB_LIBRARIES} ${OPENSSL_LIBRARIES} -lcrypto -lrt)
-    target_link_libraries(${PROJECT_NAME}_static ${CMAKE_THREAD_LIBS_INIT} ${ZLIB_LIBRARIES} ${OPENSSL_LIBRARIES} -lcrypto -lrt)
-    target_link_libraries(${PROJECT_NAME}_test ${CMAKE_THREAD_LIBS_INIT} ${ZLIB_LIBRARIES} ${OPENSSL_LIBRARIES} -lcrypto -lrt)
+    target_link_libraries(${PROJECT_NAME} ${CMAKE_THREAD_LIBS_INIT} ${ZLIB_LIBRARIES} ${OPENSSL_LIBRARIES} -lcrypto -lm -lrt)
+    target_link_libraries(${PROJECT_NAME}_static ${CMAKE_THREAD_LIBS_INIT} ${ZLIB_LIBRARIES} ${OPENSSL_LIBRARIES} -lcrypto -lm -lrt)
+    target_link_libraries(${PROJECT_NAME}_test ${CMAKE_THREAD_LIBS_INIT} ${ZLIB_LIBRARIES} ${OPENSSL_LIBRARIES} -lcrypto -lm -lrt)
+    target_link_libraries(${PROJECT_NAME}_test_c ${CMAKE_THREAD_LIBS_INIT} ${ZLIB_LIBRARIES} ${OPENSSL_LIBRARIES} -lcrypto -lm -lrt)
 endif ()

README.md

@@ -1,6 +1,6 @@
 # Native Library
 
-[![Build Status](https://travis-ci.com/foodtiny/native.svg?token=p64HTBqDyw43Lh5iDLxP&branch=master)](https://travis-ci.com/foodtiny/native)
+[![Build Status](https://travis-ci.org/foodtiny/native.svg?branch=master)](https://travis-ci.org/foodtiny/native)
  [![Support Platform](https://img.shields.io/badge/platform-linux%20%7C%20osx-blue.svg)]()  [![License](https://img.shields.io/badge/license-apache-yellowgreen.svg)]()
 
 **Native Library** provides low-level optimization and productivity for C/C++ application.
@@ -89,14 +89,15 @@ $ ./native
 #### Mock Server
 To test third parties we need to setup a server to mock http request from them.
 By running `make server`, it will serve in http://localhost:9999. You will see `Hi guys!` in there.
+Please keep this terminal running during your development.
 ```bash
 $ make server
 ```
 
 #### Memory Leak
 Valgrind helps us in checking memory leak, you've just need to run
 ```
-$ make leak
+$ cmake . && make native_test && make leak
 ```
 It will tell you issues relate to memory.
 
@@ -122,7 +123,7 @@ TEST(YourTestSuite, YourTestCase) {
 - At least one contributor in this project reviews your commits (except you) before merging
 - Best practices guidelines in [CONTRIBUTION.md](https://github.com/foodtiny/native/tree/master/CONTRIBUTION.md)
 
-# Copyright & license
+### Copyright & license
 Copyright © 2014-2016 Food Tiny. All rights reserved, except as follows. Code is released under the Apache 2.0 license.
 You may obtain a duplicate copy of the same license, titled CC-BY-SA-4.0, at http://creativecommons.org/licenses/by/4.0/.
 Terms and conditions set forth in the file [LICENSE.docs](https://github.com/foodtiny/native/tree/master/LICENSE.docs).
@@ -131,22 +132,50 @@ Terms and conditions set forth in the file [LICENSE.docs](https://github.com/foo
 #### Differences
 This library provides Java classes in C++ so its syntax is friendly for
 both programming languges but we still have some issues :
+
+- Namespace - Package
+```java
+// Java
+System.out.println("Java");
+```
+```cpp
+// C++
+System::out::println("C++");
+```
 - Array
+```java
+// Java
+byte[] byes = {};
+```
+```cpp
+// C++
+Array<byte> bytes = {};
+```
 - Interface
+```
+Comming soon
+```
 - Runtime
+```
+Comming soon
+```
 - Garbage Collection
+```
+Comming soon
+```
 
 #### Data Types
 All data types are implemented and ready to use in C++ Application
-- [x] char - Java & C++
-- [x] byte - Java & C++ (equivalent with `unsigned char`)
-- [x] string - C++ (equivalent with `char*`)
-- [x] short - Java & C++
-- [x] int - Java & C++
-- [x] long - Java & C++
-- [x] float - Java & C++
-- [x] double - Java & C++
-- [x] boolean - Java & C++ (equivalent with `bool`)
+- [x] char - Java.Lang.Character
+- [x] byte - Java.Lang.Byte (equivalent with `unsigned char`)
+- [x] string - Java.Lang.String (equivalent with `char*`, Java does not have data type `string`)
+- [x] short - Java.Lang.Short
+- [x] int - Java.Lang.Integer
+- [x] long - Java.Lang.Long
+- [x] float - Java.Lang.Float
+- [x] double - Java.Lang.Double
+- [x] boolean - Java.Lang.Boolean (equivalent with `bool`)
+- [ ] enum - Java.Lang.Enum
 
 #### Java Standard Packages
 All Java packages are in transformation so we can have a general look about road map

common/append_test.c

@@ -53,8 +53,10 @@ TEST (Common, AppendPointerChar) {
 	ASSERT_STR("lazy", result[ 7 ]);
 	ASSERT_STR("dog", result[ 8 ]);
 	append = "";
+	free(result);
 	result = append_pointer_char(target, append);
 	ASSERT_EQUAL(9, length_pointer_pointer_char(result));
+	free(result);
 }
 
 

common/join_test.c

@@ -41,7 +41,9 @@ TEST (Common, JoinPointerPointerChar) {
 		'\0'
 	};
 	char *expect = "Thequickbrownfoxjumpsoverthelazydog";
-	ASSERT_STR(expect, join_pointer_pointer_char(target));
+	char *result = join_pointer_pointer_char(target);
+	ASSERT_STR(expect, result);
+	free(result);
 }
 
 TEST (Common, JoinDelimiterPointerPointerChar) {
@@ -60,5 +62,7 @@ TEST (Common, JoinDelimiterPointerPointerChar) {
 
 	char *delimiter = "|";
 	char *expect = "The|quick|brown|fox|jumps|over|the|lazy|dog";
-	ASSERT_STR(expect, join_delimiter_pointer_pointer_char(target, delimiter));
+	char *result = join_delimiter_pointer_pointer_char(target, delimiter);
+	ASSERT_STR(expect, result);
+	free(result);
 }

common/length.c

@@ -27,6 +27,7 @@
 #include "../string.h"
 #include "../common.h"
 #include "../type.h"
+#include <stdlib.h>
 
 #define P_LEN(TYPE); \
 inline int length_pointer_##TYPE(TYPE *target) {\
@@ -49,7 +50,9 @@ inline int length_pointer_pointer_##TYPE(TYPE **target) {\
 #define NUM_LEN(TYPE); \
 inline int length_##TYPE(TYPE target) {\
         char *result = string_from_##TYPE(target);\
-        return length_pointer_char(result);\
+        int len = length_pointer_char(result); \
+        free(result); \
+        return len; \
 }
 
 #ifdef __APPLE__
@@ -59,5 +62,5 @@ P_P_LEN(char);
 NUM_LEN(short);
 NUM_LEN(int);
 NUM_LEN(long);
-NUM_LEN(double)
-;NUM_LEN(float);
+NUM_LEN(double);
+NUM_LEN(float);

common/length_test.c

@@ -31,6 +31,8 @@ TEST (Common, LengthPointerChar) {
 	char *data = "Hello world";
 	ASSERT_EQUAL(11, length_pointer_char(data));
 
+	ASSERT_EQUAL(11, length_pointer_char("Hello world"));
+	
 	data = "";
 	ASSERT_EQUAL(0, length_pointer_char(data));
 
@@ -39,6 +41,11 @@ TEST (Common, LengthPointerChar) {
 
 	data = NULL;
 	ASSERT_EQUAL(0, length_pointer_char(data));
+
+	//  Please use calloc instead of malloc because it is dangerous
+	//  data = malloc(10);
+	//  ASSERT_EQUAL(0, length_pointer_char(data));
+	//  free(data);
 }
 
 TEST (Common, LengthPointerPointerChar) {