Merge lp:~unity-team/nux/nux.test-files-renaming into lp:nux/2.0

[Jay Taoko]

* Renaming of tests files
* In nux::View class, do not set the minimum size of the area.
* Added tests for nux::View and nux::Area.

[Jay Taoko (jaytaoko)]

review: Approve

=== modified file 'Nux/View.cpp'
--- Nux/View.cpp	2012-02-22 16:41:47 +0000
+++ Nux/View.cpp	2012-02-26 02:38:17 +0000
@@ -36,9 +36,6 @@
     view_layout_ = NULL;
     draw_cmd_queued_        = false;
     m_TextColor         = Color(1.0f, 1.0f, 1.0f, 1.0f);
-
-    // Set widget default size;
-    SetMinimumSize(DEFAULT_WIDGET_WIDTH, PRACTICAL_WIDGET_HEIGHT);
   }
 
   View::~View()

=== modified file 'tests/Makefile.am'
--- tests/Makefile.am	2012-02-23 06:49:05 +0000
+++ tests/Makefile.am	2012-02-26 02:38:17 +0000
@@ -1,8 +1,7 @@
 if BUILD_TESTS
 check_PROGRAMS = \
-  test-nux \
   gtest-nux \
-  gtest-nux-core \
+  gtest-nuxcore \
   test-graphics-display \
   test-empty-window \
   xtest-button \
@@ -18,45 +17,44 @@
   xtest-focus-on-mouse-enter 
 
 # Please keep alphabetical
-test_nux_SOURCES = \
-  test-canvas.cpp \
-  test-nux.cpp \
-  test-system.cpp
-
-test_nux_CPPFLAGS = \
-  -I$(srcdir) \
-  -I$(top_srcdir) \
-  -DPREFIX=\""$(prefix)"\" \
-	-DLIBDIR=\""$(libdir)"\" \
-  -DDATADIR=\""$(datadir)"\" \
-  -DG_LOG_DOMAIN=\"NuxTests\" \
-  -DTESTDIR=\""$(top_srcdir)/tests"\" \
-  $(GCC_FLAGS) \
-  $(NUX_CORE_CFLAGS) \
-  $(NUX_EXAMPLES_CFLAGS) \
-  $(NUX_CFLAGS) \
-  $(MAINTAINER_CFLAGS)
-
-test_nux_LDADD = \
-  $(top_builddir)/NuxCore/libnux-core-@NUX_API_VERSION@.la \
-  $(top_builddir)/NuxImage/libnux-image-@NUX_API_VERSION@.la \
-  $(top_builddir)/NuxGraphics/libnux-graphics-@NUX_API_VERSION@.la \
-  $(top_builddir)/Nux/libnux-@NUX_API_VERSION@.la \
-  $(NUX_LIBS)
-
-gtest_nux_core_SOURCES = \
+# test_nux_SOURCES = \
+# test-canvas.cpp \
+# test-nux.cpp \
+# test-system.cpp
+
+#test_nux_CPPFLAGS = \
+#  -I$(srcdir) \
+#  -I$(top_srcdir) \
+#  -DPREFIX=\""$(prefix)"\" \
+#	-DLIBDIR=\""$(libdir)"\" \
+#  -DDATADIR=\""$(datadir)"\" \
+#  -DG_LOG_DOMAIN=\"NuxTests\" \
+#  -DTESTDIR=\""$(top_srcdir)/tests"\" \
+#  $(GCC_FLAGS) \
+#  $(NUX_CORE_CFLAGS) \
+#  $(NUX_EXAMPLES_CFLAGS) \
+#  $(NUX_CFLAGS) \
+#  $(MAINTAINER_CFLAGS)
+
+#test_nux_LDADD = \
+#  $(top_builddir)/NuxCore/libnux-core-@NUX_API_VERSION@.la \
+#  $(top_builddir)/NuxImage/libnux-image-@NUX_API_VERSION@.la \
+#  $(top_builddir)/NuxGraphics/libnux-graphics-@NUX_API_VERSION@.la \
+#  $(top_builddir)/Nux/libnux-@NUX_API_VERSION@.la \
+#  $(NUX_LIBS)
+
+gtest_nuxcore_SOURCES = \
   Helpers.h \
   Helpers.cpp \
+  gtest-nuxcore-async-file-writer.cpp \
   gtest-nuxcore-color.cpp \
-  test_object.cpp \
-  test_main.cpp \
-  test_async_file_writer.cpp \
-  test_logger.cpp \
-  test_cairo_wrapper.cpp \
-  test_properties.cpp \
-  test_rolling_file_appender.cpp
+  gtest-nuxcore-logger.cpp \
+  gtest-nuxcore-main.cpp \
+  gtest-nuxcore-object.cpp \
+  gtest-nuxcore-properties.cpp \
+  gtest-nuxcore-rolling-file-appender.cpp
 
-gtest_nux_core_CPPFLAGS = \
+gtest_nuxcore_CPPFLAGS = \
   -I$(srcdir) \
   -I$(top_srcdir) \
   -DPREFIX=\""$(prefix)"\" \
@@ -70,24 +68,26 @@
   $(NUX_CFLAGS) \
   $(MAINTAINER_CFLAGS)
 
-gtest_nux_core_LDADD = \
+gtest_nuxcore_LDADD = \
   $(top_builddir)/NuxCore/libnux-core-@NUX_API_VERSION@.la \
   $(top_builddir)/NuxImage/libnux-image-@NUX_API_VERSION@.la \
   $(top_builddir)/NuxGraphics/libnux-graphics-@NUX_API_VERSION@.la \
   $(top_builddir)/Nux/libnux-@NUX_API_VERSION@.la \
   $(NUX_LIBS)
 
-gtest_nux_core_LDFLAGS = \
+gtest_nuxcore_LDFLAGS = \
   -lpthread -lgtest -lgmock \
   -lboost_filesystem -lboost_system
 
 gtest_nux_SOURCES = \
-  test-nux-main.cpp \
-  test-nux-metrics.cpp \
-  test-nux-statictext.cpp \
+  gtest-nux-area.cpp \
+  gtest-nux-cairo-wrapper.cpp \
+  gtest-nux-emmetrics.cpp \
+  gtest-nux-main.cpp \
+  gtest-nux-statictext.cpp \
+  gtest-nux-view.cpp \
   gtest-nux-windowcompositor.cpp \
-  test-nux-windowthread.cpp
-
+  gtest-nux-windowthread.cpp
 
 gtest_nux_CPPFLAGS = \
   -I$(srcdir) \
@@ -243,14 +243,14 @@
 check-local: test gtest test-apps
 
 test:
-	@gtester --verbose -k -o=test-nux-results.xml ./test-nux
+	@gtester --verbose -k -o=gtest-nux-results.xml ./gtest-nux
 
-gtest: gtest-nux-core gtest-nux
-	./gtest-nux-core
+gtest: gtest-nuxcore gtest-nux
+	./gtest-nuxcore
 	./gtest-nux
 
-check-headless: gtest-nux-core
-	@gtester --verbose -k -o=test-nux-results.xml ./gtest-nux-core
+check-headless: gtest-nuxcore
+	@gtester --verbose -k -o=test-nux-results.xml ./gtest-nuxcore
 
 test-apps: test-graphics-display test-empty-window xtest-text-entry xtest-button xtest-mouse-events xtest-mouse-buttons xtest-hgrid-key-navigation xtest-hlayout-key-navigation xtest-vlayout-key-navigation xtest-scrollbar xtest-focus-on-mouse-down xtest-focus-on-mouse-enter xtest-keynav-directions
 	./test-graphics-display

=== added file 'tests/gtest-nux-area.cpp'
--- tests/gtest-nux-area.cpp	1970-01-01 00:00:00 +0000
+++ tests/gtest-nux-area.cpp	2012-02-26 02:38:17 +0000
@@ -0,0 +1,74 @@
+#include <string>
+#include <fstream>
+
+#include <iostream>
+#include <gmock/gmock.h>
+#include <boost/filesystem.hpp>
+#include <glib.h>
+
+#include "Nux/Nux.h"
+#include "Nux/StaticText.h"
+#include "Nux/ProgramFramework/TestView.h"
+
+
+using namespace testing;
+
+namespace {
+
+TEST(TestArea, TestAreaSize)
+{
+  nux::NuxInitialize(0);
+  nux::WindowThread *wnd_thread = nux::CreateNuxWindow("Area Test", 300, 200,
+    nux::WINDOWSTYLE_NORMAL, NULL, false, NULL, NULL);
+
+  nux::TestView* test_view = new nux::TestView("");
+
+  EXPECT_EQ(test_view->GetMinimumWidth(), nux::AREA_MIN_WIDTH);
+  EXPECT_EQ(test_view->GetMaximumWidth(), nux::AREA_MAX_WIDTH);
+  EXPECT_EQ(test_view->GetMinimumHeight(), nux::AREA_MIN_HEIGHT);
+  EXPECT_EQ(test_view->GetMaximumHeight(), nux::AREA_MAX_HEIGHT);
+
+  test_view->SetMinimumWidth(100);
+  EXPECT_EQ(test_view->GetMinimumWidth(), 100);
+
+  test_view->SetMaximumWidth(1111);
+  EXPECT_EQ(test_view->GetMaximumWidth(), 1111);
+
+  test_view->SetMinimumHeight(123);
+  EXPECT_EQ(test_view->GetMinimumHeight(), 123);
+
+  test_view->SetMaximumHeight(1234);
+  EXPECT_EQ(test_view->GetMaximumHeight(), 1234);
+
+  test_view->SetMaximumSize(4321, 1234);
+  test_view->SetMinimumSize(123, 432);
+
+  EXPECT_EQ(test_view->GetMinimumWidth(), 123);
+  EXPECT_EQ(test_view->GetMaximumWidth(), 4321);
+  EXPECT_EQ(test_view->GetMinimumHeight(), 432);
+  EXPECT_EQ(test_view->GetMaximumHeight(), 1234);
+
+  test_view->UnReference();
+  delete wnd_thread;
+}
+
+TEST(TestArea, TestAreaGeometry)
+{
+  nux::NuxInitialize(0);
+  nux::WindowThread *wnd_thread = nux::CreateNuxWindow("Area Test", 300, 200,
+    nux::WINDOWSTYLE_NORMAL, NULL, false, NULL, NULL);
+
+  nux::TestView* test_view = new nux::TestView("");
+
+  static_cast<nux::Area*>(test_view)->SetGeometry(0, 0, 100, 100);
+
+  EXPECT_EQ(test_view->GetBaseX(), 0);
+  EXPECT_EQ(test_view->GetBaseX(), 0);
+  EXPECT_EQ(test_view->GetBaseWidth(), 100);
+  EXPECT_EQ(test_view->GetBaseHeight(), 100);
+
+
+  test_view->UnReference();
+  delete wnd_thread;
+}
+}

=== renamed file 'tests/test_cairo_wrapper.cpp' => 'tests/gtest-nux-cairo-wrapper.cpp'
=== renamed file 'tests/test-nux-metrics.cpp' => 'tests/gtest-nux-emmetrics.cpp'
=== renamed file 'tests/test-nux-main.cpp' => 'tests/gtest-nux-main.cpp'
=== renamed file 'tests/test-nux-statictext.cpp' => 'tests/gtest-nux-statictext.cpp'
=== added file 'tests/gtest-nux-view.cpp'
--- tests/gtest-nux-view.cpp	1970-01-01 00:00:00 +0000
+++ tests/gtest-nux-view.cpp	2012-02-26 02:38:17 +0000
@@ -0,0 +1,37 @@
+#include <string>
+#include <fstream>
+
+#include <iostream>
+#include <gmock/gmock.h>
+#include <boost/filesystem.hpp>
+#include <glib.h>
+
+#include "Nux/Nux.h"
+#include "Nux/StaticText.h"
+#include "Nux/ProgramFramework/TestView.h"
+
+
+using namespace testing;
+
+namespace {
+
+TEST(TestView, TestViewEnable)
+{
+  nux::NuxInitialize(0);
+  nux::WindowThread *wnd_thread = nux::CreateNuxWindow("View Test", 300, 200,
+    nux::WINDOWSTYLE_NORMAL, NULL, false, NULL, NULL);
+
+  nux::TestView* test_view = new nux::TestView("");
+  
+  test_view->EnableView();
+  EXPECT_TRUE(test_view->IsViewEnabled());
+
+  test_view->DisableView();
+  EXPECT_FALSE(test_view->IsViewEnabled());
+
+
+  test_view->UnReference();
+  delete wnd_thread;
+}
+
+}

=== renamed file 'tests/test-nux-windowthread.cpp' => 'tests/gtest-nux-windowthread.cpp'
=== renamed file 'tests/test_async_file_writer.cpp' => 'tests/gtest-nuxcore-async-file-writer.cpp'
=== renamed file 'tests/test_logger.cpp' => 'tests/gtest-nuxcore-logger.cpp'
--- tests/test_logger.cpp	2011-08-03 04:26:34 +0000
+++ tests/gtest-nuxcore-logger.cpp	2012-02-26 02:38:17 +0000
@@ -238,7 +238,7 @@
   std::string result = out.str();
 
   EXPECT_THAT(result, StartsWith("DEBUG"));
-  EXPECT_THAT(result, HasSubstr(" test.module test_logger.cpp"));
+  EXPECT_THAT(result, HasSubstr(" test.module gtest-nuxcore-logger.cpp"));
   EXPECT_THAT(result, EndsWith("1 Is output now.\n"));
   // Also only one line.
   EXPECT_THAT(counter, Eq(1));

=== renamed file 'tests/test_main.cpp' => 'tests/gtest-nuxcore-main.cpp'
=== renamed file 'tests/test_object.cpp' => 'tests/gtest-nuxcore-object.cpp'
--- tests/test_object.cpp	2011-11-11 02:50:19 +0000
+++ tests/gtest-nuxcore-object.cpp	2012-02-26 02:38:17 +0000
@@ -33,24 +33,24 @@
 {
 public:
   OwnedObject(NUX_FILE_LINE_PROTO)
-    : nux::Object (true, NUX_FILE_LINE_PARAM)
+  : nux::Object(true, NUX_FILE_LINE_PARAM)
   {
   }
 
-  ~OwnedObject () {}
+  ~OwnedObject() {}
 
-  int array [ARRAY_SIZE];
+  int array[ARRAY_SIZE];
 };
 
 class ChildOwnedObject: public OwnedObject
 {
 public:
   ChildOwnedObject(NUX_FILE_LINE_PROTO)
-    : OwnedObject (NUX_FILE_LINE_PARAM)
+  : OwnedObject(NUX_FILE_LINE_PARAM)
   {
   }
 
-  ~ChildOwnedObject () {}
+  ~ChildOwnedObject() {}
 
   int array [ARRAY_SIZE];
 };
@@ -60,11 +60,11 @@
 {
 public:
   UnOwnedObject(NUX_FILE_LINE_PROTO)
-    : nux::Object (false, NUX_FILE_LINE_PARAM)
+  : nux::Object(false, NUX_FILE_LINE_PARAM)
   {
   }
 
-  ~UnOwnedObject () {}
+  ~UnOwnedObject() {}
 
   int array [ARRAY_SIZE];
 };
@@ -84,7 +84,7 @@
 
 TEST(TestObject, TestObject) {
 
-  OwnedObject *a = new OwnedObject (NUX_TRACKER_LOCATION);
+  OwnedObject* a = new OwnedObject(NUX_TRACKER_LOCATION);
   OwnedObject b(NUX_TRACKER_LOCATION);
 
   EXPECT_THAT(a, NotNull());
@@ -125,19 +125,14 @@
 
 TEST(TestObject, TestObjectPtr) {
 
-  OwnedObject *a = new OwnedObject (NUX_TRACKER_LOCATION);  // ref count = 1, owned
+  OwnedObject* a = new OwnedObject(NUX_TRACKER_LOCATION);  // ref count = 1, owned
 
-  nux::ObjectPtr<OwnedObject> object_ptr (a); // ref count = 2
+  nux::ObjectPtr<OwnedObject> object_ptr(a); // ref count = 2
 
   EXPECT_THAT(a->GetReferenceCount(), Eq(2));
   EXPECT_FALSE(a->UnReference()); // ref count = 1
   EXPECT_THAT(a->GetReferenceCount(), Eq(1));
 
-  // Calling UnReference repeatedly should not destroy the object when there
-  // are ObjectPtr's hosting it.
-  EXPECT_FALSE(a->UnReference());
-  EXPECT_THAT(a->GetReferenceCount(), Eq(1));
-
   object_ptr.Release();
 }
 
@@ -166,23 +161,19 @@
 
 TEST(TestObject, TestObjectPtr1) {
 
-  ChildOwnedObject *c = new ChildOwnedObject (NUX_TRACKER_LOCATION);  // ref count = 1, owned
+  ChildOwnedObject* c = new ChildOwnedObject(NUX_TRACKER_LOCATION);  // ref count = 1, owned
 
-  nux::ObjectPtr<OwnedObject> object_ptr0 (c); // ref count = 2
+  nux::ObjectPtr<OwnedObject> object_ptr0(c); // ref count = 2
 
   EXPECT_THAT(c->GetReferenceCount(), Eq(2));
 
-  nux::ObjectPtr<OwnedObject> object_ptr1 (object_ptr0); // ref count = 3
+  nux::ObjectPtr<OwnedObject> object_ptr1(object_ptr0); // ref count = 3
 
   EXPECT_THAT(c->GetReferenceCount(), Eq(3));
 
   EXPECT_FALSE(c->UnReference()); // ref count = 2
-  EXPECT_FALSE(c->UnReference()); // ref count = 2
-  EXPECT_FALSE(c->UnReference()); // ref count = 2
-
-  EXPECT_THAT(c->GetReferenceCount(), Eq(2));
-
-  object_ptr1.Release ();
+
+  object_ptr1.Release();
 
   EXPECT_THAT(c->GetReferenceCount(), Eq(1));
 

=== renamed file 'tests/test_properties.cpp' => 'tests/gtest-nuxcore-properties.cpp'
=== renamed file 'tests/test_rolling_file_appender.cpp' => 'tests/gtest-nuxcore-rolling-file-appender.cpp'