From fd2da463b1c1f0d20370b9e8379a0ef9f2c124cc Mon Sep 17 00:00:00 2001
From: David Sansome <davidsansome@gmail.com>
Date: Sun, 4 Apr 2010 13:17:07 +0000
Subject: [PATCH] Update library backend tests

---
 tests/librarybackend_test.cpp | 19 +++++++++----------
 tests/metatypes_env.h         |  3 +++
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/tests/librarybackend_test.cpp b/tests/librarybackend_test.cpp
index 31438885f..668a7efed 100644
--- a/tests/librarybackend_test.cpp
+++ b/tests/librarybackend_test.cpp
@@ -135,16 +135,16 @@ TEST_F(LibraryBackendTest, EmptyDatabase) {
 }
 
 TEST_F(LibraryBackendTest, AddDirectory) {
-  QSignalSpy spy(backend_.get(), SIGNAL(DirectoriesDiscovered(DirectoryList)));
+  QSignalSpy spy(backend_.get(), SIGNAL(DirectoryDiscovered(Directory, SubdirectoryList)));
 
   backend_->AddDirectory("/test");
 
   // Check the signal was emitted correctly
   ASSERT_EQ(1, spy.count());
-  DirectoryList list = spy[0][0].value<DirectoryList>();
-  ASSERT_EQ(1, list.size());
-  EXPECT_EQ("/test", list[0].path);
-  EXPECT_EQ(1, list[0].id);
+  Directory dir = spy[0][0].value<Directory>();
+  EXPECT_EQ("/test", dir.path);
+  EXPECT_EQ(1, dir.id);
+  EXPECT_EQ(0, spy[0][1].value<SubdirectoryList>().size());
 }
 
 TEST_F(LibraryBackendTest, RemoveDirectory) {
@@ -154,17 +154,16 @@ TEST_F(LibraryBackendTest, RemoveDirectory) {
   dir.path = "/test";
   backend_->AddDirectory(dir.path);
 
-  QSignalSpy spy(backend_.get(), SIGNAL(DirectoriesDeleted(DirectoryList)));
+  QSignalSpy spy(backend_.get(), SIGNAL(DirectoryDeleted(Directory)));
 
   // Remove the directory again
   backend_->RemoveDirectory(dir);
 
   // Check the signal was emitted correctly
   ASSERT_EQ(1, spy.count());
-  DirectoryList list = spy[0][0].value<DirectoryList>();
-  ASSERT_EQ(1, list.size());
-  EXPECT_EQ("/test", list[0].path);
-  EXPECT_EQ(1, list[0].id);
+  dir = spy[0][0].value<Directory>();
+  EXPECT_EQ("/test", dir.path);
+  EXPECT_EQ(1, dir.id);
 }
 
 TEST_F(LibraryBackendTest, AddInvalidSong) {
diff --git a/tests/metatypes_env.h b/tests/metatypes_env.h
index 634bf1761..88a08f77b 100644
--- a/tests/metatypes_env.h
+++ b/tests/metatypes_env.h
@@ -28,7 +28,10 @@
 class MetatypesEnvironment : public ::testing::Environment {
 public:
   void SetUp() {
+    qRegisterMetaType<Directory>("Directory");
     qRegisterMetaType<DirectoryList>("DirectoryList");
+    qRegisterMetaType<Subdirectory>("Subdirectory");
+    qRegisterMetaType<SubdirectoryList>("SubdirectoryList");
     qRegisterMetaType<SongList>("SongList");
     qRegisterMetaType<QModelIndex>("QModelIndex");
   }