Merge lp:~smspillaz/compiz-core/compiz-core.geometry-tests into lp:compiz-core/0.9.5

[Sam Spilsbury]

Added a compiz::window::Geometry class and added tests for it. Alias
CompWindow::Geometry to compiz::window::Geometry

[lp:~smspillaz/compiz-core/compiz-core.geometry-tests]

2922. By Sam Spilsbury on 2012-01-20

Merged compiz-core.rect-tests into compiz-core.geometry-tests.

[Alan Griffiths (alan-griffiths)]

There seems to be a lot of scaffolding to introduce a single test.

You can drop test-window-geometry.h and /tests/test-window-geometry.cpp - all you need is:

TEST(TestSuite, test_name)
// test body

review: Approve

=== modified file 'plugins/CMakeLists.txt'
--- plugins/CMakeLists.txt	2012-01-20 09:51:31 +0000
+++ plugins/CMakeLists.txt	2012-01-20 09:51:31 +0000
@@ -16,6 +16,7 @@
   ${CMAKE_CURRENT_SOURCE_DIR}/../src/pluginclasshandler/include
   ${CMAKE_CURRENT_SOURCE_DIR}/../src/point/include
   ${CMAKE_CURRENT_SOURCE_DIR}/../src/rect/include
+  ${CMAKE_CURRENT_SOURCE_DIR}/../src/window/geometry/include
   ${CMAKE_CURRENT_SOURCE_DIR}/../logmessage/include
 )
 

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2012-01-20 09:51:31 +0000
+++ src/CMakeLists.txt	2012-01-20 09:51:31 +0000
@@ -7,6 +7,7 @@
 add_subdirectory( pluginclasshandler )
 add_subdirectory( point )
 add_subdirectory( rect )
+add_subdirectory( window )
 add_subdirectory( wrapsystem/tests )
 
 compiz_add_bcop_targets (
@@ -48,6 +49,9 @@
 
     ${CMAKE_CURRENT_SOURCE_DIR}/rect/include
     ${CMAKE_CURRENT_SOURCE_DIR}/rect/src
+
+    ${CMAKE_CURRENT_SOURCE_DIR}/window/geometry/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/window/geometry/src
 )
 
 add_definitions (
@@ -144,6 +148,7 @@
     compiz_pluginclasshandler
     compiz_point
     compiz_rect
+    compiz_window_geometry
 #    ${CORE_MOD_LIBRARIES}
 >>>>>>> MERGE-SOURCE
 )

=== added directory 'src/window'
=== added file 'src/window/CMakeLists.txt'
--- src/window/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/window/CMakeLists.txt	2012-01-20 09:51:31 +0000
@@ -0,0 +1,1 @@
+add_subdirectory (geometry)

=== added directory 'src/window/geometry'
=== added file 'src/window/geometry/CMakeLists.txt'
--- src/window/geometry/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/window/geometry/CMakeLists.txt	2012-01-20 09:51:31 +0000
@@ -0,0 +1,69 @@
+pkg_check_modules (
+  GLIBMM
+  REQUIRED
+  glibmm-2.4 glib-2.0
+)
+
+INCLUDE_DIRECTORIES (  
+  ${CMAKE_CURRENT_SOURCE_DIR}/include
+  ${CMAKE_CURRENT_SOURCE_DIR}/src
+  
+  ${compiz_SOURCE_DIR}/include
+  ${compiz_SOURCE_DIR}/src/point/include
+  ${compiz_SOURCE_DIR}/src/rect/include
+
+  ${Boost_INCLUDE_DIRS}
+  
+  ${GLIBMM_INCLUDE_DIRS}
+)
+
+LINK_DIRECTORIES (${GLIBMM_LIBRARY_DIRS}) 
+
+SET ( 
+  PUBLIC_HEADERS 
+  ${CMAKE_CURRENT_SOURCE_DIR}/include/core/windowgeometry.h
+)
+
+SET ( 
+  PRIVATE_HEADERS 
+)
+
+SET( 
+  SRCS 
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/windowgeometry.cpp
+)
+
+ADD_LIBRARY( 
+  compiz_window_geometry STATIC
+  
+  ${SRCS}
+  
+  ${PUBLIC_HEADERS}
+  ${PRIVATE_HEADERS}
+)
+
+ADD_SUBDIRECTORY( ${CMAKE_CURRENT_SOURCE_DIR}/tests )
+
+SET_TARGET_PROPERTIES(
+  compiz_window_geometry PROPERTIES
+  PUBLIC_HEADER "${PUBLIC_HEADERS}"
+  COMPILE_FLAGS "-fPIC"
+)
+
+INSTALL(
+  TARGETS                                 compiz_window_geometry
+  RUNTIME             DESTINATION         bin
+  LIBRARY             DESTINATION         lib
+  ARCHIVE             DESTINATION         lib
+  PUBLIC_HEADER       DESTINATION         include/compiz/core
+)
+
+
+
+TARGET_LINK_LIBRARIES( 
+  compiz_window_geometry
+  compiz_point
+  compiz_rect
+  
+  ${GLIBMM_LIBRARIES}
+)

=== added directory 'src/window/geometry/include'
=== added directory 'src/window/geometry/include/core'
=== added file 'src/window/geometry/include/core/windowgeometry.h'
--- src/window/geometry/include/core/windowgeometry.h	1970-01-01 00:00:00 +0000
+++ src/window/geometry/include/core/windowgeometry.h	2012-01-20 09:51:31 +0000
@@ -0,0 +1,74 @@
+/*
+ * Copyright © 2011 Canonical Ltd.
+ * Copyright © 2008 Dennis Kasprzyk
+ * Copyright © 2007 Novell, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software
+ * and its documentation for any purpose is hereby granted without
+ * fee, provided that the above copyright notice appear in all copies
+ * and that both that copyright notice and this permission notice
+ * appear in supporting documentation, and that the name of
+ * Dennis Kasprzyk not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior permission.
+ * Dennis Kasprzyk makes no representations about the suitability of this
+ * software for any purpose. It is provided "as is" without express or
+ * implied warranty.
+ *
+ * DENNIS KASPRZYK DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+ * NO EVENT SHALL DENNIS KASPRZYK BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Authors: Dennis Kasprzyk <[e-mail]>
+ *          David Reveman <[e-mail]>
+ */
+
+#ifndef _COMPWINDOWGEOMETRY_H
+#define _COMPWINDOWGEOMETRY_H
+
+#include <core/rect.h>
+
+enum ChangeMask
+{
+    CHANGE_X = 1 << 0,
+    CHANGE_Y = 1 << 1,
+    CHANGE_WIDTH = 1 << 2,
+    CHANGE_HEIGHT = 1 << 3,
+    CHANGE_BORDER = 1 << 4
+};
+
+namespace compiz
+{
+namespace window
+{
+
+/**
+  * A mutable object about the dimensions and location of a CompWindow.
+  */
+class Geometry :
+    public CompRect
+{
+public:
+    Geometry ();
+    Geometry (int x, int y, int width, int height, int border);
+
+    int border () const;
+
+    void set (int x, int y, int width, int height, int border);
+    void setBorder (int border);
+
+    unsigned int	      changeMask (const compiz::window::Geometry &g) const;
+    compiz::window::Geometry  change (const compiz::window::Geometry &g, unsigned int mask) const;
+    void		      applyChange (const compiz::window::Geometry &g, unsigned int mask);
+
+private:
+    int mBorder;
+};
+
+}
+}
+
+#endif

=== added directory 'src/window/geometry/src'
=== added file 'src/window/geometry/src/windowgeometry.cpp'
--- src/window/geometry/src/windowgeometry.cpp	1970-01-01 00:00:00 +0000
+++ src/window/geometry/src/windowgeometry.cpp	2012-01-20 09:51:31 +0000
@@ -0,0 +1,120 @@
+/*
+ * Copyright © 2008 Dennis Kasprzyk
+ *
+ * Permission to use, copy, modify, distribute, and sell this software
+ * and its documentation for any purpose is hereby granted without
+ * fee, provided that the above copyright notice appear in all copies
+ * and that both that copyright notice and this permission notice
+ * appear in supporting documentation, and that the name of
+ * Dennis Kasprzyk not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior permission.
+ * Dennis Kasprzyk makes no representations about the suitability of this
+ * software for any purpose. It is provided "as is" without express or
+ * implied warranty.
+ *
+ * DENNIS KASPRZYK DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+ * NO EVENT SHALL DENNIS KASPRZYK BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Authors: Dennis Kasprzyk <[e-mail]>
+ */
+
+#include <core/windowgeometry.h>
+
+
+compiz::window::Geometry::Geometry () :
+    mBorder (0)
+{
+}
+
+compiz::window::Geometry::Geometry (int x,
+				int y,
+				int width,
+				int height,
+				int border) :
+    CompRect (x, y, width, height),
+    mBorder (border)
+{
+}
+
+int
+compiz::window::Geometry::border () const
+{
+    return mBorder;
+}
+
+void
+compiz::window::Geometry::setBorder (int border)
+{
+    mBorder = border;
+}
+
+void
+compiz::window::Geometry::set (int x,
+			   int y,
+			   int width,
+			   int height,
+			   int border)
+{
+    setX (x);
+    setY (y);
+    setWidth (width);
+    setHeight (height);
+    mBorder = border;
+}
+
+unsigned int
+compiz::window::Geometry::changeMask (const compiz::window::Geometry &g) const
+{
+    unsigned int mask = 0;
+
+    if (g.x () != x ())
+	mask |= CHANGE_X;
+
+    if (g.y () != y ())
+	mask |= CHANGE_Y;
+
+    if (g.width () != width ())
+	mask |= CHANGE_WIDTH;
+
+    if (g.height () != height ())
+	mask |= CHANGE_HEIGHT;
+
+    if (g.border () != border ())
+	mask |= CHANGE_BORDER;
+
+    return mask;
+}
+
+compiz::window::Geometry
+compiz::window::Geometry::change (const compiz::window::Geometry &g, unsigned int mask) const
+{
+    compiz::window::Geometry rg = *this;
+
+    rg.applyChange (g, mask);
+
+    return rg;
+}
+
+void
+compiz::window::Geometry::applyChange (const compiz::window::Geometry &g, unsigned int mask)
+{
+    if (mask & CHANGE_X)
+	setX (g.x ());
+
+    if (mask & CHANGE_Y)
+	setY (g.y ());
+
+    if (mask & CHANGE_WIDTH)
+	setWidth (g.width ());
+
+    if (mask & CHANGE_HEIGHT)
+	setHeight (g.height ());
+
+    if (mask & CHANGE_BORDER)
+	setBorder (g.border ());
+}

=== added directory 'src/window/geometry/tests'
=== added file 'src/window/geometry/tests/CMakeLists.txt'
--- src/window/geometry/tests/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/window/geometry/tests/CMakeLists.txt	2012-01-20 09:51:31 +0000
@@ -0,0 +1,18 @@
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+
+add_library (compiz_window_geometry_test
+             ${CMAKE_CURRENT_SOURCE_DIR}/test-window-geometry.cpp)
+
+add_executable (compiz_test_window_geometry
+                ${CMAKE_CURRENT_SOURCE_DIR}/window-geometry/src/test-window-geometry.cpp)
+
+target_link_libraries (compiz_test_window_geometry
+                       compiz_window_geometry_test
+                       compiz_window_geometry 
+                       ${GTEST_BOTH_LIBRARIES}
+		       ${GMOCK_LIBRARY}
+		       ${GMOCK_MAIN_LIBRARY}
+		       ${CMAKE_THREAD_LIBS_INIT} # Link in pthread. 
+                       )
+
+add_test (compiz_window_geometry compiz_test_window_geometry)

=== added file 'src/window/geometry/tests/test-window-geometry.cpp'
--- src/window/geometry/tests/test-window-geometry.cpp	1970-01-01 00:00:00 +0000
+++ src/window/geometry/tests/test-window-geometry.cpp	2012-01-20 09:51:31 +0000
@@ -0,0 +1,26 @@
+/*
+ * Copyright © 2011 Canonical Ltd.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software
+ * and its documentation for any purpose is hereby granted without
+ * fee, provided that the above copyright notice appear in all copies
+ * and that both that copyright notice and this permission notice
+ * appear in supporting documentation, and that the name of
+ * Canonical Ltd. not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior permission.
+ * Canonical Ltd. makes no representations about the suitability of this
+ * software for any purpose. It is provided "as is" without express or
+ * implied warranty.
+ *
+ * CANONICAL, LTD. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+ * NO EVENT SHALL CANONICAL, LTD. BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Authored by: Sam Spilsbury <[e-mail]>
+ */
+
+#include "test-window-geometry.h"

=== added file 'src/window/geometry/tests/test-window-geometry.h'
--- src/window/geometry/tests/test-window-geometry.h	1970-01-01 00:00:00 +0000
+++ src/window/geometry/tests/test-window-geometry.h	2012-01-20 09:51:31 +0000
@@ -0,0 +1,39 @@
+/*
+ * Copyright © 2011 Canonical Ltd.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software
+ * and its documentation for any purpose is hereby granted without
+ * fee, provided that the above copyright notice appear in all copies
+ * and that both that copyright notice and this permission notice
+ * appear in supporting documentation, and that the name of
+ * Canonical Ltd. not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior permission.
+ * Canonical Ltd. makes no representations about the suitability of this
+ * software for any purpose. It is provided "as is" without express or
+ * implied warranty.
+ *
+ * CANONICAL, LTD. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+ * NO EVENT SHALL CANONICAL, LTD. BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Authored by: Sam Spilsbury <[e-mail]>
+ */
+
+#ifndef _COMPIZ_TEST_WINDOW_GEOMETRY_H
+#define _COMPIZ_TEST_WINDOW_GEOMETRY_H
+
+#include <gtest/gtest.h>
+#include <core/windowgeometry.h>
+#include <core/rect.h>
+#include <iostream>
+#include <boost/bind.hpp>
+
+class CompWindowGeometryTest : public ::testing::Test
+{
+};
+
+#endif

=== added directory 'src/window/geometry/tests/window-geometry'
=== added directory 'src/window/geometry/tests/window-geometry/src'
=== added file 'src/window/geometry/tests/window-geometry/src/test-window-geometry.cpp'
--- src/window/geometry/tests/window-geometry/src/test-window-geometry.cpp	1970-01-01 00:00:00 +0000
+++ src/window/geometry/tests/window-geometry/src/test-window-geometry.cpp	2012-01-20 09:51:31 +0000
@@ -0,0 +1,89 @@
+/*
+ * Copyright © 2011 Canonical Ltd.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software
+ * and its documentation for any purpose is hereby granted without
+ * fee, provided that the above copyright notice appear in all copies
+ * and that both that copyright notice and this permission notice
+ * appear in supporting documentation, and that the name of
+ * Canonical Ltd. not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior permission.
+ * Canonical Ltd. makes no representations about the suitability of this
+ * software for any purpose. It is provided "as is" without express or
+ * implied warranty.
+ *
+ * CANONICAL, LTD. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+ * NO EVENT SHALL CANONICAL, LTD. BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Authored by: Sam Spilsbury <[e-mail]>
+ */
+
+#include "test-window-geometry.h"
+
+class CompWindowGeometryTestGeometry :
+    public CompWindowGeometryTest
+{
+    public:
+
+	CompWindowGeometryTestGeometry ();
+	~CompWindowGeometryTestGeometry ();
+
+    protected:
+
+	compiz::window::Geometry g;
+};
+
+CompWindowGeometryTestGeometry::CompWindowGeometryTestGeometry () :
+    g (50, 100, 200, 300, 5)
+{
+}
+
+CompWindowGeometryTestGeometry::~CompWindowGeometryTestGeometry ()
+{
+}
+
+TEST_F (CompWindowGeometryTestGeometry, TestGeometry)
+{
+
+    /* apply x only */
+    compiz::window::Geometry rg = compiz::window::Geometry ();
+    rg.applyChange (g, CHANGE_X);
+
+    EXPECT_EQ (rg, compiz::window::Geometry (50, 0, 0, 0, 0));
+
+    /* apply y only */
+    rg = compiz::window::Geometry ();
+    rg.applyChange (g, CHANGE_Y);
+
+    EXPECT_EQ (rg, compiz::window::Geometry (0, 100, 0, 0, 0));
+
+    /* apply width only */
+    rg = compiz::window::Geometry ();
+    rg.applyChange (g, CHANGE_WIDTH);
+
+    EXPECT_EQ (rg, compiz::window::Geometry (0, 0, 200, 0, 0));
+
+    /* apply height only */
+    rg = compiz::window::Geometry ();
+    rg.applyChange (g, CHANGE_HEIGHT);
+
+    EXPECT_EQ (rg, compiz::window::Geometry (0, 0, 0, 300, 0));
+
+    /* apply width | height */
+    rg = compiz::window::Geometry ();
+    rg.applyChange (g, CHANGE_WIDTH | CHANGE_HEIGHT);
+
+    EXPECT_EQ (rg, compiz::window::Geometry (0, 0, 200, 300, 0));
+
+    /* change mask for x | y | width | height */
+    rg  = compiz::window::Geometry (49, 99, 199, 299, 5);
+    unsigned int mask = rg.changeMask (g);
+
+    EXPECT_EQ (rg, compiz::window::Geometry (49, 99, 199, 299, 5));
+    EXPECT_EQ (mask, CHANGE_X | CHANGE_Y | CHANGE_WIDTH | CHANGE_HEIGHT);
+}