feedc0de/ArduinoJson
1
0
Fork 0
forked from bblanchon/ArduinoJson
Code Pull Requests Activity

Renamed JsonValue to JsonVariant

Browse Source
This commit is contained in:
Benoit Blanchon
2014-11-04 09:51:25 +01:00
parent 699292b058
commit 09f6d059a7
31 changed files with 175 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/Issue10.cpp
View File

@ -7,7 +7,7 @@
#include <gtest/gtest.h>
#include <ArduinoJson/JsonArray.hpp>
#include <ArduinoJson/JsonObject.hpp>
#include <ArduinoJson/JsonValue.hpp>
#include <ArduinoJson/JsonVariant.hpp>
#include <ArduinoJson/StaticJsonBuffer.hpp>
using namespace ArduinoJson;

2
test/JsonArray_Container_Tests.cpp
View File

@ -6,7 +6,7 @@
#include <gtest/gtest.h>
#include <ArduinoJson/StaticJsonBuffer.hpp>
#include <ArduinoJson/JsonValue.hpp>
#include <ArduinoJson/JsonVariant.hpp>
#include <ArduinoJson/JsonArray.hpp>
#include <ArduinoJson/JsonObject.hpp>

2
test/JsonArray_PrettyPrintTo_Tests.cpp
View File

@ -7,7 +7,7 @@
#include <gtest/gtest.h>
#include <ArduinoJson/JsonArray.hpp>
#include <ArduinoJson/JsonObject.hpp>
#include <ArduinoJson/JsonValue.hpp>
#include <ArduinoJson/JsonVariant.hpp>
#include <ArduinoJson/StaticJsonBuffer.hpp>
using namespace ArduinoJson;

2
test/JsonObject_Container_Tests.cpp
View File

@ -7,7 +7,7 @@
#include <gtest/gtest.h>
#include <ArduinoJson/JsonArray.hpp>
#include <ArduinoJson/JsonObject.hpp>
#include <ArduinoJson/JsonValue.hpp>
#include <ArduinoJson/JsonVariant.hpp>
#include <ArduinoJson/StaticJsonBuffer.hpp>
using namespace ArduinoJson;

2
test/JsonObject_PrettyPrintTo_Tests.cpp
View File

@ -7,7 +7,7 @@
#include <gtest/gtest.h>
#include <ArduinoJson/JsonArray.hpp>
#include <ArduinoJson/JsonObject.hpp>
#include <ArduinoJson/JsonValue.hpp>
#include <ArduinoJson/JsonVariant.hpp>
#include <ArduinoJson/StaticJsonBuffer.hpp>
using namespace ArduinoJson;

4
test/JsonObject_PrintTo_Tests.cpp
View File

@ -7,10 +7,10 @@
#include <gtest/gtest.h>
#include <ArduinoJson/JsonArray.hpp>
#include <ArduinoJson/JsonObject.hpp>
#include <ArduinoJson/JsonValue.hpp>
#include <ArduinoJson/JsonVariant.hpp>
#include <ArduinoJson/StaticJsonBuffer.hpp>
using namespace ArduinoJson;
using namespace ArduinoJson;
using namespace ArduinoJson::Internals;
class JsonObject_PrintTo_Tests : public testing::Test {

2
test/JsonParser_Array_Tests.cpp
View File

@ -6,7 +6,7 @@
#include <gtest/gtest.h>
#include <ArduinoJson/JsonArray.hpp>
#include <ArduinoJson/JsonValue.hpp>
#include <ArduinoJson/JsonVariant.hpp>
#include <ArduinoJson/StaticJsonBuffer.hpp>
using namespace ArduinoJson;

2
test/JsonParser_Object_Tests.cpp
View File

@ -7,7 +7,7 @@
#include <gtest/gtest.h>
#include <ArduinoJson/StaticJsonBuffer.hpp>
#include <ArduinoJson/JsonObject.hpp>
#include <ArduinoJson/JsonValue.hpp>
#include <ArduinoJson/JsonVariant.hpp>
using namespace ArduinoJson;

52
test/JsonValue_Storage_Tests.cpp
View File

@ -1,52 +0,0 @@
// Copyright Benoit Blanchon 2014
// MIT License
//
// Arduino JSON library
// https://github.com/bblanchon/ArduinoJson
#include <gtest/gtest.h>
#include <ArduinoJson/StaticJsonBuffer.hpp>
#include <ArduinoJson/JsonArray.hpp>
#include <ArduinoJson/JsonObject.hpp>
#include <ArduinoJson/JsonValue.hpp>
using namespace ArduinoJson;
class JsonValue_Storage_Tests : public ::testing::Test {
protected:
template <typename T>
void testValue(T expected) {
jsonValue.set(expected);
EXPECT_EQ(expected, jsonValue.as<T>());
}
template <typename T>
void testReference(T &expected) {
jsonValue.set(expected);
EXPECT_EQ(expected, jsonValue.as<T &>());
}
JsonValue jsonValue;
};
TEST_F(JsonValue_Storage_Tests, Double) { testValue<double>(123.45); }
TEST_F(JsonValue_Storage_Tests, False) { testValue<bool>(false); }
TEST_F(JsonValue_Storage_Tests, Float) { testValue<float>(123.45f); }
TEST_F(JsonValue_Storage_Tests, Null) { testValue<const char *>(NULL); }
TEST_F(JsonValue_Storage_Tests, SChar) { testValue<signed char>(123); }
TEST_F(JsonValue_Storage_Tests, SInt) { testValue<signed int>(123); }
TEST_F(JsonValue_Storage_Tests, SLong) { testValue<signed long>(123L); }
TEST_F(JsonValue_Storage_Tests, SShort) { testValue<signed short>(123); }
TEST_F(JsonValue_Storage_Tests, String) { testValue<const char *>("hello"); }
TEST_F(JsonValue_Storage_Tests, True) { testValue<bool>(true); }
TEST_F(JsonValue_Storage_Tests, UChar) { testValue<unsigned char>(123); }
TEST_F(JsonValue_Storage_Tests, UInt) { testValue<unsigned int>(123U); }
TEST_F(JsonValue_Storage_Tests, ULong) { testValue<unsigned long>(123UL); }
TEST_F(JsonValue_Storage_Tests, UShort) { testValue<unsigned short>(123); }
TEST_F(JsonValue_Storage_Tests, CanStoreObject) {
StaticJsonBuffer<200> json;
JsonObject &object = json.createObject();
testReference(object);
}

26
test/JsonValue_Comparison_Tests.cpp → test/JsonVariant_Comparison_Tests.cpp
View File

@ -5,12 +5,12 @@
// https://github.com/bblanchon/ArduinoJson
#include <gtest/gtest.h>
#include <ArduinoJson/JsonValue.hpp>
#include <ArduinoJson/JsonVariant.hpp>
#include "Printers.hpp"
using namespace ArduinoJson;
class JsonValue_Comparison_Tests : public ::testing::Test {
class JsonVariant_Comparison_Tests : public ::testing::Test {
protected:
template <typename T>
void testValue(T low, T mid, T high) {
@ -52,45 +52,45 @@ class JsonValue_Comparison_Tests : public ::testing::Test {
EXPECT_NE(expected, jsonValue); // operator!=
}
JsonValue jsonValue;
JsonVariant jsonValue;
};
TEST_F(JsonValue_Comparison_Tests, Double) {
TEST_F(JsonVariant_Comparison_Tests, Double) {
testValue<double>(123.44, 123.45, 123.46);
}
TEST_F(JsonValue_Comparison_Tests, Float) {
TEST_F(JsonVariant_Comparison_Tests, Float) {
testValue<float>(123.44f, 123.45f, 123.46f);
}
TEST_F(JsonValue_Comparison_Tests, SChar) {
TEST_F(JsonVariant_Comparison_Tests, SChar) {
testValue<signed char>(122, 123, 124);
}
TEST_F(JsonValue_Comparison_Tests, SInt) {
TEST_F(JsonVariant_Comparison_Tests, SInt) {
testValue<signed int>(122, 123, 124);
}
TEST_F(JsonValue_Comparison_Tests, SLong) {
TEST_F(JsonVariant_Comparison_Tests, SLong) {
testValue<signed long>(122L, 123L, 124L);
}
TEST_F(JsonValue_Comparison_Tests, SShort) {
TEST_F(JsonVariant_Comparison_Tests, SShort) {
testValue<signed short>(122, 123, 124);
}
TEST_F(JsonValue_Comparison_Tests, UChar) {
TEST_F(JsonVariant_Comparison_Tests, UChar) {
testValue<unsigned char>(122, 123, 124);
}
TEST_F(JsonValue_Comparison_Tests, UInt) {
TEST_F(JsonVariant_Comparison_Tests, UInt) {
testValue<unsigned int>(122, 123, 124);
}
TEST_F(JsonValue_Comparison_Tests, ULong) {
TEST_F(JsonVariant_Comparison_Tests, ULong) {
testValue<unsigned long>(122L, 123L, 124L);
}
TEST_F(JsonValue_Comparison_Tests, UShort) {
TEST_F(JsonVariant_Comparison_Tests, UShort) {
testValue<unsigned short>(122, 123, 124);
}

20
test/JsonValue_Copy_Tests.cpp → test/JsonVariant_Copy_Tests.cpp
View File

@ -8,18 +8,18 @@
#include <ArduinoJson/StaticJsonBuffer.hpp>
#include <ArduinoJson/JsonArray.hpp>
#include <ArduinoJson/JsonObject.hpp>
#include <ArduinoJson/JsonValue.hpp>
#include <ArduinoJson/JsonVariant.hpp>
using namespace ArduinoJson;
class JsonValue_Copy_Tests : public ::testing::Test {
class JsonVariant_Copy_Tests : public ::testing::Test {
protected:
StaticJsonBuffer<200> json;
JsonValue jsonValue1;
JsonValue jsonValue2;
JsonVariant jsonValue1;
JsonVariant jsonValue2;
};
TEST_F(JsonValue_Copy_Tests, IntegersAreCopiedByValue) {
TEST_F(JsonVariant_Copy_Tests, IntegersAreCopiedByValue) {
jsonValue1 = 123;
jsonValue2 = jsonValue1;
jsonValue1 = 456;
@ -27,7 +27,7 @@ TEST_F(JsonValue_Copy_Tests, IntegersAreCopiedByValue) {
EXPECT_EQ(123, jsonValue2.as<int>());
}
TEST_F(JsonValue_Copy_Tests, DoublesAreCopiedByValue) {
TEST_F(JsonVariant_Copy_Tests, DoublesAreCopiedByValue) {
jsonValue1 = 123.45;
jsonValue2 = jsonValue1;
jsonValue1 = 456.78;
@ -35,7 +35,7 @@ TEST_F(JsonValue_Copy_Tests, DoublesAreCopiedByValue) {
EXPECT_EQ(123.45, jsonValue2.as<double>());
}
TEST_F(JsonValue_Copy_Tests, BooleansAreCopiedByValue) {
TEST_F(JsonVariant_Copy_Tests, BooleansAreCopiedByValue) {
jsonValue1 = true;
jsonValue2 = jsonValue1;
jsonValue1 = false;
@ -43,7 +43,7 @@ TEST_F(JsonValue_Copy_Tests, BooleansAreCopiedByValue) {
EXPECT_TRUE(jsonValue2.as<bool>());
}
TEST_F(JsonValue_Copy_Tests, StringsAreCopiedByValue) {
TEST_F(JsonVariant_Copy_Tests, StringsAreCopiedByValue) {
jsonValue1 = "hello";
jsonValue2 = jsonValue1;
jsonValue1 = "world";
@ -51,7 +51,7 @@ TEST_F(JsonValue_Copy_Tests, StringsAreCopiedByValue) {
EXPECT_STREQ("hello", jsonValue2.as<const char *>());
}
TEST_F(JsonValue_Copy_Tests, ObjectsAreCopiedByReference) {
TEST_F(JsonVariant_Copy_Tests, ObjectsAreCopiedByReference) {
JsonObject &object = json.createObject();
jsonValue1 = object;
@ -61,7 +61,7 @@ TEST_F(JsonValue_Copy_Tests, ObjectsAreCopiedByReference) {
EXPECT_EQ(1, jsonValue1.asObject().size());
}
TEST_F(JsonValue_Copy_Tests, ArraysAreCopiedByReference) {
TEST_F(JsonVariant_Copy_Tests, ArraysAreCopiedByReference) {
JsonArray &array = json.createArray();
jsonValue1 = array;

52
test/JsonVariant_Storage_Tests.cpp Normal file
View File

@ -0,0 +1,52 @@
// Copyright Benoit Blanchon 2014
// MIT License
//
// Arduino JSON library
// https://github.com/bblanchon/ArduinoJson
#include <gtest/gtest.h>
#include <ArduinoJson/StaticJsonBuffer.hpp>
#include <ArduinoJson/JsonArray.hpp>
#include <ArduinoJson/JsonObject.hpp>
#include <ArduinoJson/JsonVariant.hpp>
using namespace ArduinoJson;
class JsonVariant_Storage_Tests : public ::testing::Test {
protected:
template <typename T>
void testValue(T expected) {
jsonValue.set(expected);
EXPECT_EQ(expected, jsonValue.as<T>());
}
template <typename T>
void testReference(T &expected) {
jsonValue.set(expected);
EXPECT_EQ(expected, jsonValue.as<T &>());
}
JsonVariant jsonValue;
};
TEST_F(JsonVariant_Storage_Tests, Double) { testValue<double>(123.45); }
TEST_F(JsonVariant_Storage_Tests, False) { testValue<bool>(false); }
TEST_F(JsonVariant_Storage_Tests, Float) { testValue<float>(123.45f); }
TEST_F(JsonVariant_Storage_Tests, Null) { testValue<const char *>(NULL); }
TEST_F(JsonVariant_Storage_Tests, SChar) { testValue<signed char>(123); }
TEST_F(JsonVariant_Storage_Tests, SInt) { testValue<signed int>(123); }
TEST_F(JsonVariant_Storage_Tests, SLong) { testValue<signed long>(123L); }
TEST_F(JsonVariant_Storage_Tests, SShort) { testValue<signed short>(123); }
TEST_F(JsonVariant_Storage_Tests, String) { testValue<const char *>("hello"); }
TEST_F(JsonVariant_Storage_Tests, True) { testValue<bool>(true); }
TEST_F(JsonVariant_Storage_Tests, UChar) { testValue<unsigned char>(123); }
TEST_F(JsonVariant_Storage_Tests, UInt) { testValue<unsigned int>(123U); }
TEST_F(JsonVariant_Storage_Tests, ULong) { testValue<unsigned long>(123UL); }
TEST_F(JsonVariant_Storage_Tests, UShort) { testValue<unsigned short>(123); }
TEST_F(JsonVariant_Storage_Tests, CanStoreObject) {
StaticJsonBuffer<200> json;
JsonObject &object = json.createObject();
testReference(object);
}

4
test/Printers.cpp
View File

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

4
test/Printers.hpp
View File

@ -6,9 +6,9 @@
#pragma once
#include <ArduinoJson/JsonValue.hpp>
#include <ArduinoJson/JsonVariant.hpp>
#include <ostream>
namespace ArduinoJson {
std::ostream& operator<<(std::ostream& os, const ArduinoJson::JsonValue& v);
std::ostream& operator<<(std::ostream& os, const ArduinoJson::JsonVariant& v);
}

2
test/StaticJsonBufferTests.cpp
View File

@ -6,7 +6,7 @@
#include <gtest/gtest.h>
#include <ArduinoJson/JsonObject.hpp>
#include <ArduinoJson/JsonValue.hpp>
#include <ArduinoJson/JsonVariant.hpp>
#include <ArduinoJson/StaticJsonBuffer.hpp>
using namespace ArduinoJson;