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

[Sam Spilsbury]

Added tests for constrainment to XSizeHints

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

2924. By Sam Spilsbury on 2012-01-20

Merged compiz-core.extents-tests into compiz-core.constrainment-tests.

[Alan Griffiths (alan-griffiths)]

Same issues about redundant "boilerplate" for tests.

Also "#include <iostream>" is totally unnecessary (and one of those headers one should always try to avoid - especially in header files).

But lets land and deal with test architecture as a separate thing.

review: Approve

=== modified file 'include/core/size.h'
--- include/core/size.h	2010-03-24 09:37:19 +0000
+++ include/core/size.h	2012-01-20 09:51:38 +0000
@@ -50,6 +50,17 @@
 	typedef std::list<CompSize> list;
 	typedef std::list<CompSize *> ptrList;
 
+	bool operator== (const CompSize &other) const
+	{
+	    return (this->mWidth == other.mWidth &&
+		    this->mHeight == other.mHeight);
+	}
+
+	bool operator!= (const CompSize &other) const
+	{
+	    return !(*this == other);
+	}
+
     private:
 	int mWidth, mHeight;
 };

=== modified file 'plugins/CMakeLists.txt'
--- plugins/CMakeLists.txt	2012-01-20 09:51:37 +0000
+++ plugins/CMakeLists.txt	2012-01-20 09:51:38 +0000
@@ -19,6 +19,7 @@
   ${CMAKE_CURRENT_SOURCE_DIR}/../src/window/geometry/include
   ${CMAKE_CURRENT_SOURCE_DIR}/../src/window/geometry-saver/include
   ${CMAKE_CURRENT_SOURCE_DIR}/../src/window/extents/include
+  ${CMAKE_CURRENT_SOURCE_DIR}/../src/window/constrainment/include
   ${CMAKE_CURRENT_SOURCE_DIR}/../logmessage/include
 )
 

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2012-01-20 09:51:37 +0000
+++ src/CMakeLists.txt	2012-01-20 09:51:38 +0000
@@ -58,6 +58,9 @@
 
     ${CMAKE_CURRENT_SOURCE_DIR}/window/extents/include
     ${CMAKE_CURRENT_SOURCE_DIR}/window/extents/src
+
+    ${CMAKE_CURRENT_SOURCE_DIR}/window/constrainment/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/window/constrainment/src
 )
 
 add_definitions (
@@ -157,6 +160,7 @@
     compiz_window_geometry
     compiz_window_geometry_saver
     compiz_window_extents
+    compiz_window_constrainment
 #    ${CORE_MOD_LIBRARIES}
 >>>>>>> MERGE-SOURCE
 )

=== modified file 'src/window/CMakeLists.txt'
--- src/window/CMakeLists.txt	2012-01-20 09:51:37 +0000
+++ src/window/CMakeLists.txt	2012-01-20 09:51:38 +0000
@@ -1,3 +1,4 @@
 add_subdirectory (geometry)
 add_subdirectory (geometry-saver)
 add_subdirectory (extents)
+add_subdirectory (constrainment)

=== added directory 'src/window/constrainment'
=== added file 'src/window/constrainment/CMakeLists.txt'
--- src/window/constrainment/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/window/constrainment/CMakeLists.txt	2012-01-20 09:51:38 +0000
@@ -0,0 +1,72 @@
+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
+  ${compiz_SOURCE_DIR}/src/window/geometry/include
+  ${compiz_SOURCE_DIR}/src/window/geometry-saver/include  
+  ${Boost_INCLUDE_DIRS}
+  
+  ${GLIBMM_INCLUDE_DIRS}
+)
+
+LINK_DIRECTORIES (${GLIBMM_LIBRARY_DIRS}) 
+
+SET ( 
+  PUBLIC_HEADERS 
+  ${CMAKE_CURRENT_SOURCE_DIR}/include/core/windowconstrainment.h
+)
+
+SET ( 
+  PRIVATE_HEADERS 
+)
+
+SET( 
+  SRCS 
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/windowconstrainment.cpp
+)
+
+ADD_LIBRARY( 
+  compiz_window_constrainment STATIC
+  
+  ${SRCS}
+  
+  ${PUBLIC_HEADERS}
+  ${PRIVATE_HEADERS}
+)
+
+ADD_SUBDIRECTORY( ${CMAKE_CURRENT_SOURCE_DIR}/tests )
+
+SET_TARGET_PROPERTIES(
+  compiz_window_constrainment PROPERTIES
+  PUBLIC_HEADER "${PUBLIC_HEADERS}"
+  COMPILE_FLAGS "-fPIC"
+)
+
+INSTALL(
+  TARGETS                                 compiz_window_constrainment
+  RUNTIME             DESTINATION         bin
+  LIBRARY             DESTINATION         lib
+  ARCHIVE             DESTINATION         lib
+  PUBLIC_HEADER       DESTINATION         include/compiz/core
+)
+
+
+
+TARGET_LINK_LIBRARIES( 
+  compiz_window_constrainment
+  compiz_window_geometry
+  compiz_point
+  compiz_rect
+  
+  ${GLIBMM_LIBRARIES}
+)

=== added directory 'src/window/constrainment/include'
=== added directory 'src/window/constrainment/include/core'
=== added file 'src/window/constrainment/include/core/windowconstrainment.h'
--- src/window/constrainment/include/core/windowconstrainment.h	1970-01-01 00:00:00 +0000
+++ src/window/constrainment/include/core/windowconstrainment.h	2012-01-20 09:51:38 +0000
@@ -0,0 +1,57 @@
+/*
+ * 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 _COMPWINDOWCONSTRAINMENT_H
+#define _COMPWINDOWCONSTRAINMENT_H
+
+#include <inttypes.h>
+#include <core/size.h>
+#include <core/rect.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <limits>
+
+namespace compiz
+{
+namespace window
+{
+
+namespace constrainment
+{
+const unsigned int PVertResizeInc = (1 << 0);
+const unsigned int PHorzResizeInc = (1 << 1);
+
+CompSize constrainToHints (const XSizeHints &hints,
+			   const CompSize   &size,
+			   unsigned int     ignoreHints,
+			   unsigned int     resizeIgnoreHints);
+}
+
+}
+}
+
+#endif

=== added directory 'src/window/constrainment/src'
=== added file 'src/window/constrainment/src/windowconstrainment.cpp'
--- src/window/constrainment/src/windowconstrainment.cpp	1970-01-01 00:00:00 +0000
+++ src/window/constrainment/src/windowconstrainment.cpp	2012-01-20 09:51:38 +0000
@@ -0,0 +1,161 @@
+/*
+ * Copyright © 2005 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
+ * Novell, Inc. not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior permission.
+ * Novell, Inc. makes no representations about the suitability of this
+ * software for any purpose. It is provided "as is" without express or
+ * implied warranty.
+ *
+ * NOVELL, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+ * NO EVENT SHALL NOVELL, INC. 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.
+ *
+ * Author: David Reveman <[e-mail]>
+ */
+
+#include <core/windowconstrainment.h>
+
+static inline int constrainmentFloor (int value, int base)
+{
+    return (value / base) * base;
+}
+
+static inline uint64_t constrainment64Floor (uint64_t value, uint64_t base)
+{
+    return (value / base) * base;
+}
+
+static inline float constrainmentClamp(float x, float a, float b)
+{
+    return x < a ? a : (x > b ? b : x);
+}
+
+CompSize
+compiz::window::constrainment::constrainToHints (const XSizeHints &hints,
+						 const CompSize   &size,
+						 unsigned int     ignoreHints,
+					         unsigned int     resizeIgnoreHints)
+{
+    int              width = size.width ();
+    int              height = size.height ();
+    int		     min_width = 1;
+    int		     min_height = 1;
+    int		     base_width = 1;
+    int		     base_height = 1;
+    int		     xinc = 1;
+    int		     yinc = 1;
+    int		     max_width = std::numeric_limits <short>::max ();
+    int		     max_height = std::numeric_limits <short>::max ();
+    long	     flags = hints.flags & ~ignoreHints;
+    long	     resizeIncFlags = (flags & PResizeInc) ? (~resizeIgnoreHints) : 0;
+
+    /* Ater gdk_window_constrain_size(), which is partially borrowed from fvwm.
+     *
+     * Copyright 1993, Robert Nation
+     *     You may use this code for any purpose, as long as the original
+     *     copyright remains in the source code and all documentation
+     *
+     * which in turn borrows parts of the algorithm from uwm
+     */
+
+    if ((flags & PBaseSize) && (flags & PMinSize))
+    {
+	base_width = std::max (1, hints.base_width);
+	base_height = std::max (1, hints.base_height);
+	min_width = std::max (1, hints.min_width);
+	min_height = std::max (1, hints.min_height);
+    }
+    else if (flags & PBaseSize)
+    {
+	base_width = std::max (1, hints.base_width);
+	base_height = std::max (1, hints.base_height);
+	min_width = std::max (1, hints.base_width);
+	min_height = std::max (1, hints.base_height);
+    }
+    else if (flags & PMinSize)
+    {
+	base_width = std::max (1, hints.min_width);
+	base_height = std::max (1, hints.min_height);
+	min_width = std::max (1, hints.min_width);
+	min_height = std::max (1, hints.min_height);
+    }
+
+    if (flags & PMaxSize)
+    {
+	max_width = std::max (1, hints.max_width);
+	max_height = std::max (1, hints.max_height);
+    }
+
+    if (resizeIncFlags & PHorzResizeInc)
+	xinc = std::max (xinc, hints.width_inc);
+
+    if (resizeIncFlags & PVertResizeInc)
+	yinc = std::max (yinc, hints.height_inc);
+
+    /* clamp width and height to min and max values */
+    width  = constrainmentClamp (width, min_width, max_width);
+    height = constrainmentClamp (height, min_height, max_height);
+
+    /* shrink to base + N * inc */
+    width  = base_width + constrainmentFloor (width - base_width, xinc);
+    height = base_height + constrainmentFloor (height - base_height, yinc);
+
+    /* constrain aspect ratio, according to:
+     *
+     * min_aspect.x       width      max_aspect.x
+     * ------------  <= -------- <=  -----------
+     * min_aspect.y       height     max_aspect.y
+     */
+    if ((flags & PAspect) && hints.min_aspect.y > 0 && hints.max_aspect.x > 0)
+    {
+	/* Use 64 bit arithmetic to prevent overflow */
+
+	uint64_t min_aspect_x = hints.min_aspect.x;
+	uint64_t min_aspect_y = hints.min_aspect.y;
+	uint64_t max_aspect_x = hints.max_aspect.x;
+	uint64_t max_aspect_y = hints.max_aspect.y;
+	uint64_t delta;
+
+	if (min_aspect_x * height > width * min_aspect_y)
+	{
+	    delta = constrainment64Floor (height - width * min_aspect_y / min_aspect_x,
+			     yinc);
+	    if (height - (int) delta >= min_height)
+		height -= delta;
+	    else
+	    {
+		delta = constrainment64Floor (height * min_aspect_x / min_aspect_y - width,
+				 xinc);
+		if (width + (int) delta <= max_width)
+		    width += delta;
+	    }
+	}
+
+	if (width * max_aspect_y > max_aspect_x * height)
+	{
+	    delta = constrainment64Floor (width - height * max_aspect_x / max_aspect_y,
+			     xinc);
+	    if (width - (int) delta >= min_width)
+		width -= delta;
+	    else
+	    {
+		delta = constrainment64Floor (width * min_aspect_y / min_aspect_x - height,
+				 yinc);
+		if (height + (int) delta <= max_height)
+		    height += delta;
+	    }
+	}
+    }
+
+    return CompSize (width, height);
+}

=== added directory 'src/window/constrainment/tests'
=== added file 'src/window/constrainment/tests/CMakeLists.txt'
--- src/window/constrainment/tests/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/window/constrainment/tests/CMakeLists.txt	2012-01-20 09:51:38 +0000
@@ -0,0 +1,19 @@
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+
+add_library (compiz_window_constrainment_test
+             ${CMAKE_CURRENT_SOURCE_DIR}/test-window-constrainment.cpp)
+
+add_executable (compiz_test_window_constrainment_to_hints
+                ${CMAKE_CURRENT_SOURCE_DIR}/to-hints/src/test-window-constrainment-to-hints.cpp
+		${compiz_SOURCE_DIR}/src/size.cpp)
+
+target_link_libraries (compiz_test_window_constrainment_to_hints
+                       compiz_window_constrainment_test
+                       compiz_window_constrainment 
+                       ${GTEST_BOTH_LIBRARIES}
+		       ${GMOCK_LIBRARY}
+		       ${GMOCK_MAIN_LIBRARY}
+		       ${CMAKE_THREAD_LIBS_INIT} # Link in pthread. 
+                       )
+
+add_test (compiz_window_constrainment_to_hints compiz_test_window_constrainment_to_hints)

=== added file 'src/window/constrainment/tests/test-window-constrainment.cpp'
--- src/window/constrainment/tests/test-window-constrainment.cpp	1970-01-01 00:00:00 +0000
+++ src/window/constrainment/tests/test-window-constrainment.cpp	2012-01-20 09:51:38 +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-constrainment.h"

=== added file 'src/window/constrainment/tests/test-window-constrainment.h'
--- src/window/constrainment/tests/test-window-constrainment.h	1970-01-01 00:00:00 +0000
+++ src/window/constrainment/tests/test-window-constrainment.h	2012-01-20 09:51:38 +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_CONSTRAINMENT_H
+#define _COMPIZ_TEST_WINDOW_CONSTRAINMENT_H
+
+#include <gtest/gtest.h>
+#include <core/windowconstrainment.h>
+#include <core/windowgeometry.h>
+#include <iostream>
+#include <boost/bind.hpp>
+
+class CompWindowConstrainmentTest : public ::testing::Test
+{
+};
+
+#endif

=== added directory 'src/window/constrainment/tests/to-hints'
=== added directory 'src/window/constrainment/tests/to-hints/src'
=== added file 'src/window/constrainment/tests/to-hints/src/test-window-constrainment-to-hints.cpp'
--- src/window/constrainment/tests/to-hints/src/test-window-constrainment-to-hints.cpp	1970-01-01 00:00:00 +0000
+++ src/window/constrainment/tests/to-hints/src/test-window-constrainment-to-hints.cpp	2012-01-20 09:51:38 +0000
@@ -0,0 +1,198 @@
+/*
+ * 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-constrainment.h"
+#include <cstring>
+
+class CompWindowConstrainmentTestToHints :
+    public CompWindowConstrainmentTest
+{
+};
+
+TEST_F (CompWindowConstrainmentTestToHints, ToHints)
+{
+    /* No hints, size is the same */
+    XSizeHints hints;
+    CompSize   size (1000, 1000);
+
+    memset (&hints, 0, sizeof (XSizeHints));
+
+    size = compiz::window::constrainment::constrainToHints (hints, size, 0, 0);
+
+    EXPECT_EQ (size, CompSize (1000, 1000));
+
+    /* Minimum size specified, constrain to minimum size */
+    size = CompSize (100, 100);
+    memset (&hints, 0, sizeof (XSizeHints));
+
+    hints.flags |= PMinSize;
+    hints.min_width = 500;
+    hints.min_height = 500;
+
+    size = compiz::window::constrainment::constrainToHints (hints, size, 0, 0);
+
+    EXPECT_EQ (size, CompSize (500, 500));
+
+    /* Base size specified, constrain to base size as minimum size */
+    size = CompSize (100, 100);
+    memset (&hints, 0, sizeof (XSizeHints));
+
+    hints.flags |= PBaseSize;
+    hints.base_width = 500;
+    hints.base_height = 500;
+
+    size = compiz::window::constrainment::constrainToHints (hints, size, 0, 0);
+
+    EXPECT_EQ (size, CompSize (500, 500));
+
+    /* Minimum and base size specified, constrain to min size as minimum size */
+    size = CompSize (100, 100);
+    memset (&hints, 0, sizeof (XSizeHints));
+
+    hints.flags |= PBaseSize | PMinSize;
+    hints.base_width = 700;
+    hints.base_height = 700;
+    hints.min_width = 500;
+    hints.min_height = 500;
+
+    size = compiz::window::constrainment::constrainToHints (hints, size, 0, 0);
+
+    EXPECT_EQ (size, CompSize (500, 500));
+
+    /* Maximum size specified, constrain to minimum size */
+    size = CompSize (1000, 1000);
+    memset (&hints, 0, sizeof (XSizeHints));
+
+    hints.flags |= PMaxSize;
+    hints.max_width = 500;
+    hints.max_height = 500;
+
+    size = compiz::window::constrainment::constrainToHints (hints, size, 0, 0);
+
+    EXPECT_EQ (size, CompSize (500, 500));
+
+    /* Resize flags specified, constrain to closest low step of
+     * increments for size specified */
+    size = CompSize (1002, 1002);
+    memset (&hints, 0, sizeof (XSizeHints));
+
+    hints.flags |= PBaseSize | PResizeInc;
+    hints.base_width = 500;
+    hints.base_height = 500;
+    hints.width_inc = 5;
+    hints.height_inc = 5;
+
+    size = compiz::window::constrainment::constrainToHints (hints, size, 0, 0);
+
+    EXPECT_EQ (size, CompSize (1000, 1000));
+
+    /* Resize flags specified, constrain to closest low step of
+     * increments for size specified */
+    size = CompSize (1004, 1004);
+    memset (&hints, 0, sizeof (XSizeHints));
+
+    hints.flags |= PBaseSize | PResizeInc;
+    hints.base_width = 500;
+    hints.base_height = 500;
+    hints.width_inc = 5;
+    hints.height_inc = 5;
+
+    size = compiz::window::constrainment::constrainToHints (hints, size, 0, 0);
+
+    EXPECT_EQ (size, CompSize (1000, 1000));
+
+    /* Resize flags specified, constrain to closest low step of
+     * increments for size specified */
+    size = CompSize (1006, 1006);
+    memset (&hints, 0, sizeof (XSizeHints));
+
+    hints.flags |= PBaseSize | PResizeInc;
+    hints.base_width = 500;
+    hints.base_height = 500;
+    hints.width_inc = 5;
+    hints.height_inc = 5;
+
+    size = compiz::window::constrainment::constrainToHints (hints, size, 0, 0);
+
+    EXPECT_EQ (size, CompSize (1005, 1005));
+
+    /* Don't require constrainment on width */
+    size = CompSize (1002, 1002);
+    memset (&hints, 0, sizeof (XSizeHints));
+
+    hints.flags |= PBaseSize | PResizeInc;
+    hints.base_width = 500;
+    hints.base_height = 500;
+    hints.width_inc = 5;
+    hints.height_inc = 5;
+
+    size = compiz::window::constrainment::constrainToHints (hints, size, 0, compiz::window::constrainment::PHorzResizeInc);
+
+    EXPECT_EQ (size, CompSize (1002, 1000));
+
+    /* Don't require constrainment on height */
+    size = CompSize (1002, 1002);
+    memset (&hints, 0, sizeof (XSizeHints));
+
+    hints.flags |= PBaseSize | PResizeInc;
+    hints.base_width = 500;
+    hints.base_height = 500;
+    hints.width_inc = 5;
+    hints.height_inc = 5;
+
+    size = compiz::window::constrainment::constrainToHints (hints, size, 0, compiz::window::constrainment::PVertResizeInc);
+
+    EXPECT_EQ (size, CompSize (1000, 1002));
+
+    /* Aspect ratios - don't allow sizes less than 1:2 or more than 2:5
+     * clamping to the largest size */
+    size = CompSize (4000, 5000);
+    memset (&hints, 0, sizeof (XSizeHints));
+
+    hints.flags |= PAspect;
+    hints.min_aspect.x = 1;
+    hints.min_aspect.y = 2;
+    hints.max_aspect.x = 2;
+    hints.max_aspect.y = 5;
+
+    size = compiz::window::constrainment::constrainToHints (hints, size, 0, 0);
+
+    EXPECT_EQ (size, CompSize (2000, 5000));
+
+    /* Aspect ratios - don't allow sizes less than 1:2 or more than 2:5
+     * clamping to the largest size */
+    size = CompSize (12, 20);
+    memset (&hints, 0, sizeof (XSizeHints));
+
+    hints.flags |= PAspect;
+    hints.min_aspect.x = 1;
+    hints.min_aspect.y = 2;
+    hints.max_aspect.x = 2;
+    hints.max_aspect.y = 5;
+
+    size = compiz::window::constrainment::constrainToHints (hints, size, 0, 0);
+
+    EXPECT_EQ (size, CompSize (8, 20));
+}