Redefining Primitive kind property as template class

Author: andreagilardoni

extras/test/CMakeLists.txt

@@ -95,6 +95,7 @@ set(TEST_UTIL_SRCS
 
 set(TEST_DUT_SRCS
   ../../src/property/Property.cpp
+  ../../src/property/types/PropertyPrimitive.cpp
   ../../src/property/PropertyContainer.cpp
   ../../src/cbor/CBORDecoder.cpp
   ../../src/cbor/CBOREncoder.cpp

extras/test/src/test_CloudFloat.cpp

@@ -10,7 +10,7 @@
 
 #include <CBORDecoder.h>
 
-#include <property/types/CloudFloat.h>
+#include <property/PropertyContainer.h>
 
 /**************************************************************************************
   TEST CODE

extras/test/src/test_addPropertyReal.cpp

@@ -10,11 +10,6 @@
 
 #include <PropertyContainer.h>
 
-#include <types/CloudInt.h>
-#include <types/CloudBool.h>
-#include <types/CloudFloat.h>
-#include <types/CloudString.h>
-
 /**************************************************************************************
    TEST CODE
  **************************************************************************************/

extras/test/src/test_decode.cpp

@@ -19,13 +19,7 @@
 #include "types/CloudWrapperInt.h"
 #include "types/CloudWrapperString.h"
 #include "types/automation/CloudColoredLight.h"
-#include "types/automation/CloudContactSensor.h"
 #include "types/automation/CloudDimmedLight.h"
-#include "types/automation/CloudLight.h"
-#include "types/automation/CloudMotionSensor.h"
-#include "types/automation/CloudSmartPlug.h"
-#include "types/automation/CloudSwitch.h"
-#include "types/automation/CloudTemperatureSensor.h"
 #include "types/automation/CloudTelevision.h"
 
 using namespace Catch;

src/property/PropertyContainer.h

@@ -30,24 +30,16 @@
 #undef min
 #include <list>
 
-#include "types/CloudBool.h"
-#include "types/CloudFloat.h"
-#include "types/CloudInt.h"
-#include "types/CloudUnsignedInt.h"
+#include "types/PropertyPrimitive.h"
+
 #include "types/CloudString.h"
 #include "types/CloudLocation.h"
 #include "types/CloudSchedule.h"
 #include "types/CloudColor.h"
 #include "types/CloudWrapperBase.h"
 
 #include "types/automation/CloudColoredLight.h"
-#include "types/automation/CloudContactSensor.h"
 #include "types/automation/CloudDimmedLight.h"
-#include "types/automation/CloudLight.h"
-#include "types/automation/CloudMotionSensor.h"
-#include "types/automation/CloudSmartPlug.h"
-#include "types/automation/CloudSwitch.h"
-#include "types/automation/CloudTemperatureSensor.h"
 #include "types/automation/CloudTelevision.h"
 
 /******************************************************************************
@@ -62,6 +54,11 @@ extern "C" unsigned long getTime();
 
 typedef std::list<Property *> PropertyContainer;
 
+typedef PropertyPrimitive<bool>           CloudBool;
+typedef PropertyPrimitive<float>          CloudFloat;
+typedef PropertyPrimitive<int>            CloudInt;
+typedef PropertyPrimitive<unsigned int>   CloudUnsignedInt;
+
 typedef CloudFloat CloudEnergy;
 typedef CloudFloat CloudForce;
 typedef CloudFloat CloudTemperature;
@@ -93,6 +90,13 @@ typedef CloudInt   CloudInformationContent;
 typedef CloudFloat CloudPercentage;
 typedef CloudFloat CloudRelativeHumidity;
 
+typedef CloudBool  CloudContactSensor;
+typedef CloudBool  CloudLight;
+typedef CloudBool  CloudMotionSensor;
+typedef CloudBool  CloudSmartPlug;
+typedef CloudBool  CloudSwitch;
+typedef CloudFloat CloudTemperatureSensor;
+
 /******************************************************************************
    FUNCTION DECLARATION
  ******************************************************************************/