Fixed #22 Redesign script generate.WsjcppUnitTest . Added ext to script files

Author: sea5kg

CMakeLists.txt

@@ -5,6 +5,8 @@ project(wsjcpp-core)
 include(${CMAKE_CURRENT_SOURCE_DIR}/src.wsjcpp/CMakeLists.txt)
 
 #### BEGIN_WSJCPP_APPEND
+list (APPEND WSJCPP_SOURCES "./src/some.h")
+list (APPEND WSJCPP_SOURCES "./src/some.cpp")
 #### END_WSJCPP_APPEND
 
 set(CMAKE_CXX_STANDARD 11)

scripts.wsjcpp/generate.Class renamed to scripts.wsjcpp/generate.Class.wsjcpp-script

@@ -6,35 +6,21 @@
 make_dir "./unit-tests.wsjcpp"
 make_dir "./unit-tests.wsjcpp/src"
 
-var user_class_name
-set_value user_class_name arg1
-normalize_class_name user_class_name
 var class_name
-set_value class_name "UnitTest"
-concat class_name user_class_name
-
-var base_filename
-convert_CamelCase_to_snake_case class_name base_filename
-# log_info base_filename
+set_value class_name arg1
+normalize_class_name class_name
 
 var filename_cpp
-concat filename_cpp "./unit-tests.wsjcpp/src/" base_filename ".cpp"
-
-var filename_h
-concat filename_h "./unit-tests.wsjcpp/src/" base_filename ".h"
-
-var ifndef_header
-set_value ifndef_header base_filename
-concat ifndef_header "_H"
-
-to_upper_case ifndef_header
-
-var content_header
-concat content_header "#ifndef " ifndef_header "
-#define " ifndef_header "
+set_value filename_cpp arg2
 
+var content_source
+concat content_source "
+#include <wsjcpp_core.h>
 #include <wsjcpp_unit_tests.h>
 
+// ---------------------------------------------------------------------
+// " class_name "
+
 class " class_name " : public WsjcppUnitTestBase {
     public:
         " class_name "();
@@ -43,17 +29,6 @@ class " class_name " : public WsjcppUnitTestBase {
         virtual bool doAfterTest() override;
 };
 
-#endif // " ifndef_header
-
- 
-var content_source
-concat content_source  "
-#include \"" base_filename ".h\"
-#include <wsjcpp_core.h>
-
-// ---------------------------------------------------------------------
-// " class_name "
-
 REGISTRY_WSJCPP_UNIT_TEST(" class_name ")
 
 " class_name "::" class_name "()
@@ -63,7 +38,7 @@ REGISTRY_WSJCPP_UNIT_TEST(" class_name ")
 // ---------------------------------------------------------------------
 
 bool " class_name "::doBeforeTest() {
-    // nothing
+    // do something before test
     return true;
 }
 
@@ -77,27 +52,19 @@ void " class_name "::executeTest() {
 // ---------------------------------------------------------------------
 
 bool " class_name "::doAfterTest() {
-    // nothing
+    // do somethig after test
     return true;
 }
 
 "
 
-var file_source
-concat file_source "src/" filename_cpp
-
-write_file filename_h content_header
 write_file filename_cpp content_source
 
 log_info "
 ======
 Generated class:
     - " class_name "
 Generated files:
-    - " filename_h "
     - " filename_cpp "
 ======
 "
-
-wsjcpp_yml_unit_test_add user_class_name filename_h
-wsjcpp_yml_unit_test_add user_class_name filename_cpp

scripts.wsjcpp/generate.WsjcppUnitTest renamed to scripts.wsjcpp/generate.WsjcppUnitTest.wsjcpp-script

@@ -33,11 +33,11 @@ distribution:
   - source-file: "src/wsjcpp_unit_tests_main.cpp"
     target-file: "wsjcpp_unit_tests_main.cpp"
     type: "unit-tests"
-  - source-file: "scripts.wsjcpp/generate.WsjcppUnitTest"
-    target-file: "generate.WsjcppUnitTest"
+  - source-file: "scripts.wsjcpp/generate.WsjcppUnitTest.wsjcpp-script"
+    target-file: "generate.WsjcppUnitTest.wsjcpp-script"
     type: "safe-scripting-generate"
-  - source-file: "scripts.wsjcpp/generate.Class"
-    target-file: "generate.Class"
+  - source-file: "scripts.wsjcpp/generate.Class.wsjcpp-script"
+    target-file: "generate.Class.wsjcpp-script"
     type: "safe-scripting-generate"
 
 unit-tests: