From 122cdd228200810f3530b265e6f9d94d1a0d6ae9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Wed, 6 Apr 2016 15:51:11 +0200
Subject: [PATCH] Simplify BufferGLTest.

---
 src/Magnum/Test/BufferGLTest.cpp | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/Magnum/Test/BufferGLTest.cpp b/src/Magnum/Test/BufferGLTest.cpp
index 858e57f43..55129e983 100644
--- a/src/Magnum/Test/BufferGLTest.cpp
+++ b/src/Magnum/Test/BufferGLTest.cpp
@@ -26,6 +26,7 @@
 #include <array>
 #include <vector>
 #include <Corrade/Containers/Array.h>
+#include <Corrade/TestSuite/Compare/Container.h>
 
 #include "Magnum/Buffer.h"
 #include "Magnum/Context.h"
@@ -247,12 +248,9 @@ void BufferGLTest::data() {
     #ifndef MAGNUM_TARGET_GLES
     const Containers::Array<Int> contents = buffer.data<Int>();
     MAGNUM_VERIFY_NO_ERROR();
-    CORRADE_COMPARE(contents.size(), 5);
-    CORRADE_COMPARE(contents[0], 2);
-    CORRADE_COMPARE(contents[1], 7);
-    CORRADE_COMPARE(contents[2], 5);
-    CORRADE_COMPARE(contents[3], 13);
-    CORRADE_COMPARE(contents[4], 25);
+    CORRADE_COMPARE_AS(contents,
+        Containers::ArrayView<const Int>{data},
+        TestSuite::Compare::Container);
     #endif
 
     /* Plain array */
@@ -277,10 +275,9 @@ void BufferGLTest::data() {
     #ifndef MAGNUM_TARGET_GLES
     const Containers::Array<Int> subContents = buffer.subData<Int>(4, 3);
     MAGNUM_VERIFY_NO_ERROR();
-    CORRADE_COMPARE(subContents.size(), 3);
-    CORRADE_COMPARE(subContents[0], 125);
-    CORRADE_COMPARE(subContents[1], 3);
-    CORRADE_COMPARE(subContents[2], 15);
+    CORRADE_COMPARE_AS(subContents,
+        Containers::ArrayView<const Int>{subData},
+        TestSuite::Compare::Container);
     #endif
 }
 
@@ -427,10 +424,9 @@ void BufferGLTest::copy() {
     /** @todo How to verify the contents in ES? */
     #ifndef MAGNUM_TARGET_GLES
     const Containers::Array<char> subContents = buffer2.subData<char>(2, 3);
-    CORRADE_COMPARE(subContents.size(), 3);
-    CORRADE_COMPARE(subContents[0], 7);
-    CORRADE_COMPARE(subContents[1], 5);
-    CORRADE_COMPARE(subContents[2], 13);
+    CORRADE_COMPARE_AS(subContents,
+        Containers::ArrayView<const char>{data}.slice(1, 4),
+        TestSuite::Compare::Container);
     #endif
 }
 #endif