From 2826181691a032578a9866794c5b1f98c77a2258 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Sat, 10 Oct 2015 12:19:57 +0200
Subject: [PATCH] WavAudioImporter: various cleanup.

---
 .../WavAudioImporter/Test/WavImporterTest.cpp | 19 +++++++------------
 .../WavAudioImporter/WavImporter.cpp          |  2 --
 .../WavAudioImporter/WavImporter.h            |  2 --
 3 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/src/MagnumPlugins/WavAudioImporter/Test/WavImporterTest.cpp b/src/MagnumPlugins/WavAudioImporter/Test/WavImporterTest.cpp
index 126698ffa..6d6d03b57 100644
--- a/src/MagnumPlugins/WavAudioImporter/Test/WavImporterTest.cpp
+++ b/src/MagnumPlugins/WavAudioImporter/Test/WavImporterTest.cpp
@@ -26,6 +26,7 @@
 #include <sstream>
 #include <Corrade/Containers/ArrayView.h>
 #include <Corrade/TestSuite/Tester.h>
+#include <Corrade/TestSuite/Compare/Container.h>
 #include <Corrade/Utility/Directory.h>
 
 #include "MagnumPlugins/WavAudioImporter/WavImporter.h"
@@ -97,12 +98,9 @@ void WavImporterTest::mono16() {
 
     CORRADE_COMPARE(importer.format(), Buffer::Format::Mono16);
     CORRADE_COMPARE(importer.frequency(), 44000);
-    Containers::Array<char> data = importer.data();
-    CORRADE_COMPARE(data.size(), 4);
-    CORRADE_COMPARE(data[0], '\x1d');
-    CORRADE_COMPARE(data[1], '\x10');
-    CORRADE_COMPARE(data[2], '\x71');
-    CORRADE_COMPARE(data[3], '\xc5');
+    CORRADE_COMPARE_AS(importer.data(),
+        Containers::Array<char>::from('\x1d', '\x10', '\x71', '\xc5'),
+        TestSuite::Compare::Container);
 }
 
 void WavImporterTest::stereo8() {
@@ -111,12 +109,9 @@ void WavImporterTest::stereo8() {
 
     CORRADE_COMPARE(importer.format(), Buffer::Format::Stereo8);
     CORRADE_COMPARE(importer.frequency(), 96000);
-    Containers::Array<char> data = importer.data();
-    CORRADE_COMPARE(data.size(), 4);
-    CORRADE_COMPARE(data[0], '\xde');
-    CORRADE_COMPARE(data[1], '\xfe');
-    CORRADE_COMPARE(data[2], '\xca');
-    CORRADE_COMPARE(data[3], '\x7e');
+    CORRADE_COMPARE_AS(importer.data(),
+        Containers::Array<char>::from('\xde', '\xfe', '\xca', '\x7e'),
+        TestSuite::Compare::Container);
 }
 
 }}}
diff --git a/src/MagnumPlugins/WavAudioImporter/WavImporter.cpp b/src/MagnumPlugins/WavAudioImporter/WavImporter.cpp
index 849f42a58..dd55be188 100644
--- a/src/MagnumPlugins/WavAudioImporter/WavImporter.cpp
+++ b/src/MagnumPlugins/WavAudioImporter/WavImporter.cpp
@@ -37,8 +37,6 @@ WavImporter::WavImporter() = default;
 
 WavImporter::WavImporter(PluginManager::AbstractManager& manager, std::string plugin): AbstractImporter(manager, std::move(plugin)) {}
 
-WavImporter::~WavImporter() { close(); }
-
 auto WavImporter::doFeatures() const -> Features { return Feature::OpenData; }
 
 bool WavImporter::doIsOpened() const { return _data; }
diff --git a/src/MagnumPlugins/WavAudioImporter/WavImporter.h b/src/MagnumPlugins/WavAudioImporter/WavImporter.h
index 64174bafc..0a4d233e3 100644
--- a/src/MagnumPlugins/WavAudioImporter/WavImporter.h
+++ b/src/MagnumPlugins/WavAudioImporter/WavImporter.h
@@ -57,8 +57,6 @@ class WavImporter: public AbstractImporter {
         /** @brief Plugin manager constructor */
         explicit WavImporter(PluginManager::AbstractManager& manager, std::string plugin);
 
-        ~WavImporter();
-
     private:
         Features doFeatures() const override;
         bool doIsOpened() const override;