RIC-641 Fixing client/server model definitions and adding client and server API
Signed-off-by: sandeepindia <kumar.sandeep3@hcl.com>
Change-Id: Ic177b9b7c417f1ccc184ae0e945b7748582604fe
diff --git a/test/Makefile b/test/Makefile
index 7be7eee..ed36205 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -2,7 +2,7 @@
coverage_opts = -ftest-coverage -fprofile-arcs
binaries = unit_test jhash_test config_test metrics_test
-include = -I ../src/xapp -I ../src/alarm -I ../src/messaging -I ../src/config -I ../ext/jsmn -I ../src/json -I ../src/metrics
+include = -I ../src/xapp -I ../src/alarm -I ../src/messaging -I ../src/config -I ../ext/jsmn -I ../src/json -I ../src/metrics -I ../src/model -I ../src/rest-client -I ../src/rest-server
tests:: $(binaries)
@@ -14,7 +14,7 @@
# emulate (and don't need to)
#
unit_test:: unit_test.cpp rmr_em.o
- g++ -g $(coverage_opts) $(include) unit_test.cpp -o unit_test -L../.build -lricxfcpp rmr_em.o -lrmr_si -lpthread
+ g++ -g $(coverage_opts) $(include) unit_test.cpp -o unit_test -L../.build -lricxfcpp rmr_em.o -lrmr_si -lpthread -lm -lboost_system -lcrypto -lssl -lcpprest -lpistache -lnlohmann_json_schema_validator
# build a special jwrapper object with coverage settings
jwrapper_test.o:: ../src/json/jwrapper.c ../src/json/jwrapper.h
@@ -22,13 +22,13 @@
jhash_test:: jwrapper_test.o jhash_test.cpp
# do NOT link the xapp lib; we include all modules in the test programme
- g++ -g $(coverage_opts) -I ../src/json -I ../ext/jsmn jhash_test.cpp -o jhash_test jwrapper_test.o -lrmr_si -lpthread
+ g++ -g $(coverage_opts) -I ../src/json -I ../ext/jsmn jhash_test.cpp -o jhash_test jwrapper_test.o -lrmr_si -lpthread -lm -lboost_system -lcrypto -lssl -lcpprest -lpistache -lnlohmann_json_schema_validator
metrics_test:: metrics_test.cpp rmr_em.o
- g++ -g $(coverage_opts) $(include) metrics_test.cpp -o metrics_test -L../.build -lricxfcpp rmr_em.o -l rmr_si -lpthread
+ g++ -g $(coverage_opts) $(include) metrics_test.cpp -o metrics_test -L../.build -lricxfcpp rmr_em.o -l rmr_si -lpthread -lm -lboost_system -lcrypto -lssl -lcpprest -lpistache -lnlohmann_json_schema_validator
config_test:: config_test.cpp jwrapper_test.o
- g++ -g $(coverage_opts) $(include) config_test.cpp -o config_test jwrapper_test.o -lricxfcpp -lrmr_si -lpthread
+ g++ -g $(coverage_opts) $(include) config_test.cpp -o config_test jwrapper_test.o -lricxfcpp -lrmr_si -lpthread -lm -lboost_system -lcrypto -lssl -lcpprest -lpistache -lnlohmann_json_schema_validator
# prune gcov files generated by system include files
clean::
@@ -38,3 +38,4 @@
nuke::
rm -f *.a *.o *.gcov *.gcda *.gcno core a.out $(binaries)
+