summaryrefslogtreecommitdiff
path: root/test/nbttest.cpp
diff options
context:
space:
mode:
authorljfa-ag <ljfa-ag@web.de>2015-07-15 19:03:12 +0200
committerljfa-ag <ljfa-ag@web.de>2015-07-15 19:03:12 +0200
commit3d1965752496afd8f6cdff38a23cc0814c782725 (patch)
treeeb29cbf0bf1a284db1c57c9adb9f00e430c609f0 /test/nbttest.cpp
parent593c3f241f3f6775226341a4343a34dc00358ac8 (diff)
downloadProject-Tick-3d1965752496afd8f6cdff38a23cc0814c782725.tar.gz
Project-Tick-3d1965752496afd8f6cdff38a23cc0814c782725.zip
Use std::equal for tag_list iterator testing
Diffstat (limited to 'test/nbttest.cpp')
-rw-r--r--test/nbttest.cpp13
1 files changed, 5 insertions, 8 deletions
diff --git a/test/nbttest.cpp b/test/nbttest.cpp
index 7193fe0141..9599eb1799 100644
--- a/test/nbttest.cpp
+++ b/test/nbttest.cpp
@@ -19,6 +19,7 @@
*/
#include "microtest.h"
#include "libnbt.h"
+#include <algorithm>
using namespace nbt;
@@ -247,14 +248,10 @@ void test_tag_list()
list.set(1, value(tag_string("baz")));
ASSERT(std::string(list[1]) == "baz");
- const char* values[] = {"foo", "baz"};
- unsigned i = 0;
- for(const value& val: list)
- {
- ASSERT(i < list.size());
- ASSERT(std::string(val) == values[i]);
- ++i;
- }
+ ASSERT(list.size() == 2);
+ tag_string values[] = {"foo", "baz"};
+ ASSERT(list.end() - list.begin() == int(list.size()));
+ ASSERT(std::equal(list.begin(), list.end(), values));
list.pop_back();
ASSERT(list == tag_list{"foo"});