Added tests of comparison operators

include/ArduinoJson/JsonValue.hpp

@@ -78,6 +78,11 @@ class JsonValue {
     return static_cast<T>(*this);
   }
 
+  template <typename T>
+  bool is() const {
+    return false;
+  }
+
   static JsonValue &invalid() { return _invalid; }
 
   bool success() { return _type != Internals::JSON_INVALID; }
@@ -93,6 +98,16 @@ class JsonValue {
   static JsonValue _invalid;
 };
 
+template <>
+inline bool JsonValue::is<long>() const {
+  return _type == Internals::JSON_LONG;
+}
+
+template <>
+inline bool JsonValue::is<double>() const {
+  return _type >= Internals::JSON_DOUBLE_0_DECIMALS;
+}
+
 template <typename T>
 inline bool operator==(const JsonValue &left, T right) {
   return left.as<T>() == right;
@@ -102,4 +117,54 @@ template <typename T>
 inline bool operator==(T left, const JsonValue &right) {
   return left == right.as<T>();
 }
+
+template <typename T>
+inline bool operator!=(const JsonValue &left, T right) {
+  return left.as<T>() != right;
+}
+
+template <typename T>
+inline bool operator!=(T left, const JsonValue &right) {
+  return left != right.as<T>();
+}
+
+template <typename T>
+inline bool operator<=(const JsonValue &left, T right) {
+  return left.as<T>() <= right;
+}
+
+template <typename T>
+inline bool operator<=(T left, const JsonValue &right) {
+  return left <= right.as<T>();
+}
+
+template <typename T>
+inline bool operator>=(const JsonValue &left, T right) {
+  return left.as<T>() >= right;
+}
+
+template <typename T>
+inline bool operator>=(T left, const JsonValue &right) {
+  return left >= right.as<T>();
+}
+
+template <typename T>
+inline bool operator<(const JsonValue &left, T right) {
+  return left.as<T>() < right;
+}
+
+template <typename T>
+inline bool operator<(T left, const JsonValue &right) {
+  return left < right.as<T>();
+}
+
+template <typename T>
+inline bool operator>(const JsonValue &left, T right) {
+  return left.as<T>() > right;
+}
+
+template <typename T>
+inline bool operator>(T left, const JsonValue &right) {
+  return left > right.as<T>();
+}
 }

test/JsonValue_Comparison_Tests.cpp

@@ -0,0 +1,96 @@
+// Copyright Benoit Blanchon 2014
+// MIT License
+//
+// Arduino JSON library
+// https://github.com/bblanchon/ArduinoJson
+
+#include <gtest/gtest.h>
+#include <ArduinoJson/JsonValue.hpp>
+#include "Printers.hpp"
+
+using namespace ArduinoJson;
+
+class JsonValue_Comparison_Tests : public ::testing::Test {
+ protected:
+  template <typename T>
+  void testValue(T low, T mid, T high) {
+    setValueTo(mid);
+    mustBeEqualTo(mid);
+    mustBeGreaterThan(low);
+    mustBeLessThan(high);
+  }
+
+ private:
+  template <typename T>
+  void setValueTo(T expected) {
+    jsonValue = expected;
+  }
+
+  template <typename T>
+  void mustBeEqualTo(T expected) {
+    EXPECT_EQ(expected, jsonValue);  // operator==
+    EXPECT_EQ(jsonValue, expected);  // operator==
+    EXPECT_LE(expected, jsonValue);  // operator<=
+    EXPECT_LE(jsonValue, expected);  // operator<=
+    EXPECT_GE(expected, jsonValue);  // operator>=
+    EXPECT_GE(jsonValue, expected);  // operator>=
+  }
+
+  template <typename T>
+  void mustBeGreaterThan(T expected) {
+    EXPECT_GT(jsonValue, expected);  // operator>
+    EXPECT_LT(expected, jsonValue);  // operator<
+    EXPECT_NE(jsonValue, expected);  // operator!=
+    EXPECT_NE(expected, jsonValue);  // operator!=
+  }
+
+  template <typename T>
+  void mustBeLessThan(T expected) {
+    EXPECT_LT(jsonValue, expected);  // operator<
+    EXPECT_GT(expected, jsonValue);  // operator<
+    EXPECT_NE(jsonValue, expected);  // operator!=
+    EXPECT_NE(expected, jsonValue);  // operator!=
+  }
+
+  JsonValue jsonValue;
+};
+
+TEST_F(JsonValue_Comparison_Tests, Double) {
+  testValue<double>(123.44, 123.45, 123.46);
+}
+
+TEST_F(JsonValue_Comparison_Tests, Float) {
+  testValue<float>(123.44f, 123.45f, 123.46f);
+}
+
+TEST_F(JsonValue_Comparison_Tests, SChar) {
+  testValue<signed char>(122, 123, 124);
+}
+
+TEST_F(JsonValue_Comparison_Tests, SInt) {
+  testValue<signed int>(122, 123, 124);
+}
+
+TEST_F(JsonValue_Comparison_Tests, SLong) {
+  testValue<signed long>(122L, 123L, 124L);
+}
+
+TEST_F(JsonValue_Comparison_Tests, SShort) {
+  testValue<signed short>(122, 123, 124);
+}
+
+TEST_F(JsonValue_Comparison_Tests, UChar) {
+  testValue<unsigned char>(122, 123, 124);
+}
+
+TEST_F(JsonValue_Comparison_Tests, UInt) {
+  testValue<unsigned int>(122, 123, 124);
+}
+
+TEST_F(JsonValue_Comparison_Tests, ULong) {
+  testValue<unsigned long>(122L, 123L, 124L);
+}
+
+TEST_F(JsonValue_Comparison_Tests, UShort) {
+  testValue<unsigned short>(122, 123, 124);
+}

test/Printers.cpp

@@ -7,7 +7,12 @@
 #include "Printers.hpp"
 
 std::ostream& ArduinoJson::operator<<(std::ostream& os,
-                                      const ArduinoJson::JsonValue&) {
+                                      const ArduinoJson::JsonValue& v) {
+  if (v.is<long>())
+    os << v.as<long>();
+  else if (v.is<double>())
+    os << v.as<double>();
+  else
     os << "JsonValue";  // TODO
   return os;
 }