Merging with Upstream.

(bzr r1351.2.9)

2 files changed, 0 insertions, 52 deletions

diff --git a/tests/unit/TestMain.cpp b/tests/unit/TestMain.cpp
index d9a0dc3ca..d109cfa5a 100644
--- a/tests/unit/TestMain.cpp
+++ b/tests/unit/TestMain.cpp
@@ -26,7 +26,6 @@
 #include "Nux/WindowThread.h"
 
 //void TestPanelServiceCreateSuite (void);
-void TestPlaceFactoryFileCreateSuite(void);
 void TestUBusCreateSuite(void);
 void TestQuicklistMenuitemsCreateSuite(void);
 
@@ -71,7 +70,6 @@ main(int argc, char** argv)
 
 //Keep alphabetical please
 //TestPanelServiceCreateSuite ();
- TestPlaceFactoryFileCreateSuite();
 TestQuicklistMenuitemsCreateSuite();
 TestUBusCreateSuite();
 
diff --git a/tests/unit/TestPlaceFactoryFile.cpp b/tests/unit/TestPlaceFactoryFile.cpp
deleted file mode 100644
index b2d03baf6..000000000
--- a/tests/unit/TestPlaceFactoryFile.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2010 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
- * PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * version 3 along with this program. If not, see
- * <http://www.gnu.org/licenses/>
- *
- * Authored by: Neil Jagdish Patel <neil.patel@canonical.com>
- *
- */
-
-
-#include "config.h"
-
-#include "PlaceFactoryFile.h"
-
-static void TestAllocation(void);
-
-void
-TestPlaceFactoryFileCreateSuite()
-{
-#define _DOMAIN "/Unit/PlaceFactoryFile"
-
- if (0)
- g_test_add_func(_DOMAIN"/Allocation", TestAllocation);
-}
-
-static void
-TestAllocation()
-{
- PlaceFactoryFile* factory;
-
- factory = new PlaceFactoryFile();
- g_assert(factory);
-
-// while (!factory->read_directory)
- while (1)
- g_main_context_iteration(NULL, TRUE);
-
- delete factory;
-}