Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-01 02:41:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add unit tests for StringValue and Value.

Browse Source 
Add unit test framework to CMakeLists.txt.
Fix a couple of bugs found by unit tests.

Change-Id: I2092a7f0570fae0f19f9e083c4837ccefcc4ca1a
This commit is contained in:
Peter Johnson
2015-07-03 13:29:31 -07:00
parent b66fb68f29
commit 5a0fccc9cf
8 changed files with 479 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/Value.cpp
View File

@@ -40,24 +40,6 @@ void Value::SetBooleanArray(llvm::ArrayRef<int> value) {
std::copy(value.begin(), value.end(), data.arr_boolean.arr);
}
void Value::SetBooleanArray(llvm::ArrayRef<bool> value) {
// handle type change
if (NT_Value::type != NT_BOOLEAN_ARRAY) {
NT_DisposeValue(this);
data.arr_boolean.arr = nullptr;
data.arr_boolean.size = 0; // set to zero so size change is hit below
NT_Value::type = NT_BOOLEAN_ARRAY;
}
// handle size change
if (data.arr_boolean.size != value.size()) {
std::free(data.arr_boolean.arr);
data.arr_boolean.arr =
static_cast<int*>(std::malloc(value.size()*sizeof(int)));
data.arr_boolean.size = value.size();
}
std::copy(value.begin(), value.end(), data.arr_boolean.arr);
}
void Value::SetDoubleArray(llvm::ArrayRef<double> value) {
// handle type change
if (NT_Value::type != NT_DOUBLE_ARRAY) {
@@ -89,6 +71,11 @@ void Value::SetStringArray(std::vector<StringValue>& value) {
std::free(data.arr_string.arr);
data.arr_string.arr =
static_cast<NT_String*>(std::malloc(value.size()*sizeof(NT_String)));
// need to initialize array to avoid invalid frees in std::move below.
for (size_t i=0; i<value.size(); ++i) {
data.arr_string.arr[i].str = nullptr;
data.arr_string.arr[i].len = 0;
}
data.arr_string.size = value.size();
}
std::move(value.begin(), value.end(),

16
src/Value.h
View File

@@ -18,13 +18,16 @@
namespace ntimpl {
class StringValueTest;
class Storage;
class Value;
class ValueTest;
/*
* C++ wrapper class around NT_String.
*/
class StringValue : private NT_String {
friend class StringValueTest;
friend class Value;
public:
StringValue() { NT_InitString(this); }
@@ -59,6 +62,7 @@ class StringValue : private NT_String {
* C++ wrapper class around NT_Value.
*/
class Value : private NT_Value {
friend class ValueTest;
friend class Storage;
public:
Value() { NT_InitValue(this); }
@@ -86,8 +90,6 @@ class Value : private NT_Value {
assert(NT_Value::type == NT_RAW);
return static_cast<const StringValue&>(data.v_raw);
}
// Ideally this would return llvm::ArrayRef<bool> but the C headers must
// use "int" and casting may be very unsafe.
llvm::ArrayRef<int> GetBooleanArray() const {
assert(NT_Value::type == NT_BOOLEAN_ARRAY);
return llvm::ArrayRef<int>(data.arr_boolean.arr, data.arr_boolean.size);
@@ -97,7 +99,7 @@ class Value : private NT_Value {
return llvm::ArrayRef<double>(data.arr_double.arr, data.arr_double.size);
}
llvm::ArrayRef<StringValue> GetStringArray() const {
assert(NT_Value::type == NT_BOOLEAN_ARRAY);
assert(NT_Value::type == NT_STRING_ARRAY);
return llvm::ArrayRef<StringValue>(
static_cast<StringValue*>(data.arr_string.arr), data.arr_string.size);
}
@@ -127,7 +129,7 @@ class Value : private NT_Value {
data.v_string.len = 0;
NT_Value::type = NT_STRING;
}
data.v_string = value;
static_cast<StringValue&>(data.v_string) = std::move(value);
}
void SetRaw(llvm::StringRef value) { SetRaw(StringValue(value)); }
void SetRaw(StringValue&& value) {
@@ -137,11 +139,10 @@ class Value : private NT_Value {
data.v_raw.len = 0;
NT_Value::type = NT_RAW;
}
data.v_raw = value;
static_cast<StringValue&>(data.v_raw) = std::move(value);
}
void SetBooleanArray(llvm::ArrayRef<int> value);
void SetBooleanArray(llvm::ArrayRef<bool> value);
void SetDoubleArray(llvm::ArrayRef<double> value);
// Note: This function moves the values out of the vector.
@@ -174,6 +175,9 @@ class Value : private NT_Value {
};
bool operator==(const Value& lhs, const Value& rhs);
inline bool operator!=(const Value& lhs, const Value& rhs) {
return !(lhs == rhs);
}
} // namespace ntimpl