From 33418446047d087f501ed8dd4db192450c777e3a Mon Sep 17 00:00:00 2001
From: Vadim Kurland <vadim@slot.vk.crocodile.org>
Date: Sat, 12 Mar 2011 23:36:39 -0800
Subject: [PATCH] unit test fix

---
 src/unit_tests/FWBTreeTest/FWBTreeTest.cpp | 10 +---------
 src/unit_tests/FWBTreeTest/FWBTreeTest.h   |  1 -
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/unit_tests/FWBTreeTest/FWBTreeTest.cpp b/src/unit_tests/FWBTreeTest/FWBTreeTest.cpp
index 70fb610dd..e3077cd27 100644
--- a/src/unit_tests/FWBTreeTest/FWBTreeTest.cpp
+++ b/src/unit_tests/FWBTreeTest/FWBTreeTest.cpp
@@ -51,7 +51,6 @@
 using namespace libfwbuilder;
 using namespace std;
 
-extern const char* standardFolders[];
 
 void FWBTreeTest::isSystem()
 {
@@ -75,19 +74,12 @@ void FWBTreeTest::isSystem()
     CPPUNIT_ASSERT(fwbtree.isSystem(&fw) == false);
 }
 
-bool FWBTreeTest::isStandardFolder(string path)
-{
-    for (const char **cptr=standardFolders; *cptr!=NULL; cptr++)
-        if (path == *cptr) return true;
-    return false;
-}
-
 QSet<FWObject*> FWBTreeTest::getStandardFolders(FWObject *root)
 {
     QSet<FWObject*> res;
     for (FWObject::iterator i = root->begin(); i != root->end(); i++)
     {
-        if (isStandardFolder((*i)->getPath(true))) res.insert(*i);
+        if (FWBTree().isStandardFolder(*i)) res.insert(*i);
         res += getStandardFolders(*i);
     }
     return res;
diff --git a/src/unit_tests/FWBTreeTest/FWBTreeTest.h b/src/unit_tests/FWBTreeTest/FWBTreeTest.h
index 05eef2c42..aa329e5ec 100644
--- a/src/unit_tests/FWBTreeTest/FWBTreeTest.h
+++ b/src/unit_tests/FWBTreeTest/FWBTreeTest.h
@@ -34,7 +34,6 @@
 
 class FWBTreeTest : public CppUnit::TestFixture
 {
-    bool isStandardFolder(std::string path);
     QSet<libfwbuilder::FWObject*> getStandardFolders(libfwbuilder::FWObject *root);
 
 public: