Move the search input controller and view classes over to generic/.

As a side effect, this creates a "controllers" directory in the generic tree,
and removes the now-empty GTK+-specific controller and view directories.
The README files are moved over to the generic locations and tweaked to be
correct for their new home.

3 files changed, 12 insertions, 19 deletions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 12a7ecb9..273064b2 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,19 +1,16 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-if BUILD_GTK
-  MAYBE_LIBGTK = $(top_builddir)/src/gtk/views/libgtk-views.a $(top_builddir)/src/gtk/controllers/libgtk-controllers.a
-endif
-
 INCLUDES = -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/src -I$(srcdir)
 BOOST_TEST_LDFLAGS = @BOOST_UNIT_TEST_LIBS@
 GMOCK_LDFLAGS = -lgmock -lgtest
 AM_CPPFLAGS = -DBOOST_TEST_DYN_LINK -DSRCDIR=\"$(srcdir)\"
 LDADD = $(top_builddir)/src/loggers.o			       \
-$(MAYBE_LIBGTK)                                                \
 $(top_builddir)/src/generic/apt/matching/libgeneric-matching.a \
 $(top_builddir)/src/cmdline/libcmdline.a \
 $(top_builddir)/src/generic/apt/libgeneric-apt.a	       \
+$(top_builddir)/src/generic/controllers/libgeneric-controllers.a \
 $(top_builddir)/src/generic/apt/matching/libgeneric-matching.a \
+$(top_builddir)/src/generic/apt/libgeneric-apt.a	       \
 $(top_builddir)/src/generic/problemresolver/libgeneric-problemresolver.a   \
 $(top_builddir)/src/cmdline/mocks/libcmdline-mocks.a \
 $(top_builddir)/src/cmdline/libcmdline.a \
diff --git a/tests/SConscript b/tests/SConscript
index 06fd8b54..3a174670 100644
--- a/tests/SConscript
+++ b/tests/SConscript
@@ -79,14 +79,14 @@ boost_test_extra_deps = [
     '../src/generic/apt/matching/compare_patterns.o',
     '../src/generic/apt/matching/parse.o',
     '../src/generic/apt/matching/pattern.o',
-    '../src/gtk/controllers/search_input.o',
-    '../src/gtk/views/search_input.o',
+    '../src/generic/controllers/search_input.o',
     '../src/generic/util/file_cache.o',
     '../src/generic/util/logging.o',
     '../src/generic/util/refcounted_base.o',
     '../src/generic/util/sqlite.o',
     '../src/generic/util/temp.o',
     '../src/generic/util/util.o',
+    '../src/generic/views/search_input.o',
     '../src/loggers.o',
     ]
 
diff --git a/tests/test_search_input_controller.cc b/tests/test_search_input_controller.cc
index 77048282..99f70880 100644
--- a/tests/test_search_input_controller.cc
+++ b/tests/test_search_input_controller.cc
@@ -17,12 +17,10 @@
 // the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
-#ifdef HAVE_GTK
-
 #include <generic/apt/matching/compare_patterns.h>
 #include <generic/apt/matching/pattern.h>
-#include <gtk/controllers/search_input.h>
-#include <gtk/views/mocks/search_input.h>
+#include <generic/controllers/search_input.h>
+#include <generic/views/mocks/search_input.h>
 
 #include <boost/make_shared.hpp>
 #include <boost/test/unit_test.hpp>
@@ -30,9 +28,9 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-namespace ctrls = gui::controllers;
-namespace views = gui::views;
-namespace mocks = gui::views::mocks;
+namespace ctrls = aptitude::controllers;
+namespace views = aptitude::views;
+namespace mocks = aptitude::views::mocks;
 
 using aptitude::matching::compare_patterns;
 using aptitude::matching::pattern;
@@ -60,7 +58,7 @@ namespace
   class controller_callbacks
   {
   public:
-    MOCK_METHOD2(activated, void(Glib::ustring, cwidget::util::ref_ptr<aptitude::matching::pattern>));
+    MOCK_METHOD2(activated, void(std::wstring, cwidget::util::ref_ptr<aptitude::matching::pattern>));
   };
 
   struct SearchInputTest
@@ -126,11 +124,11 @@ namespace
 BOOST_FIXTURE_TEST_CASE(testEnteringCorrectTextSearches, SearchInputTest)
 {
   ref_ptr<pattern> p = pattern::make_installed();
-  Glib::ustring p_text = "?installed";
+  std::wstring p_text = L"?installed";
 
   // The controller isn't required to call set_error_message(), but it
   // should set it to "" if it does.
-  EXPECT_CALL(*view, set_error_message(Glib::ustring())).Times(AnyNumber());
+  EXPECT_CALL(*view, set_error_message(std::wstring())).Times(AnyNumber());
 
   Expectation set_search_text;
   {
@@ -148,5 +146,3 @@ BOOST_FIXTURE_TEST_CASE(testEnteringCorrectTextSearches, SearchInputTest)
 
   get_controller()->enter_text(p_text);
 }
-
-#endif // HAVE_GTK