mir-tests.patch

   1 --- mir-0.16.0/tests/acceptance-tests/test_surface_morphing.cpp.orig    2015-09-29 07:33:42.000000000 +0200
   2 +++ mir-0.16.0/tests/acceptance-tests/test_surface_morphing.cpp 2015-09-29 18:49:35.461087424 +0200
   3 @@ -16,6 +16,9 @@
   4   * Authored By: Alan Griffiths <alan@octopull.co.uk>
   5   */
   6
   7 +#include <gtest/gtest.h>
   8 +#include <gmock/gmock.h>
   9 +
  10  #include "mir/scene/null_surface_observer.h"
  11  #include "mir/scene/surface.h"
  12
  13 --- mir-0.16.0/tests/acceptance-tests/test_surface_specification.cpp.orig       2015-09-29 07:33:42.000000000 +0200
  14 +++ mir-0.16.0/tests/acceptance-tests/test_surface_specification.cpp    2015-09-29 18:59:49.114395005 +0200
  15 @@ -16,6 +16,9 @@
  16   * Authored By: Alan Griffiths <alan@octopull.co.uk>
  17   */
  18
  19 +#include <gtest/gtest.h>
  20 +#include <gmock/gmock.h>
  21 +
  22  #include "mir/events/event_builders.h"
  23  #include "mir/scene/null_surface_observer.h"
  24  #include "mir/scene/surface.h"
  25 --- mir-0.16.0/tests/unit-tests/client/test_connection_resource_map.cpp.orig    2015-09-29 07:33:42.000000000 +0200
  26 +++ mir-0.16.0/tests/unit-tests/client/test_connection_resource_map.cpp 2015-09-29 20:34:08.974157185 +0200
  27 @@ -16,10 +16,11 @@
  28   * Authored by: Kevin DuBois <kevin.dubois@canonical.com>
  29   */
  30
  31 +#include <gtest/gtest.h>
  32 +#include <gmock/gmock.h>
  33  #include "src/client/connection_surface_map.h"
  34  #include "src/client/mir_surface.h"
  35  #include "mir/test/doubles/mock_client_buffer_stream.h"
  36 -#include <gtest/gtest.h>
  37
  38  namespace mf = mir::frontend;
  39  namespace mcl = mir::client;
  40 --- mir-0.16.0/tests/unit-tests/compositor/test_dropping_schedule.cpp.orig      2015-09-29 07:33:42.000000000 +0200
  41 +++ mir-0.16.0/tests/unit-tests/compositor/test_dropping_schedule.cpp   2015-09-29 20:59:31.804093576 +0200
  42 @@ -16,11 +16,12 @@
  43   * Authored by: Kevin DuBois <kevin.dubois@canonical.com>
  44   */
  45
  46 +#include <gtest/gtest.h>
  47 +#include <gmock/gmock.h>
  48  #include "mir/frontend/client_buffers.h"
  49  #include "src/server/compositor/dropping_schedule.h"
  50  #include "mir/test/doubles/stub_buffer.h"
  51  #include "mir/test/fake_shared.h"
  52 -#include <gtest/gtest.h>
  53
  54  using namespace testing;
  55  namespace mtd = mir::test::doubles;
  56 --- mir-0.16.0/tests/unit-tests/compositor/test_queueing_schedule.cpp.orig      2015-09-29 07:33:42.000000000 +0200
  57 +++ mir-0.16.0/tests/unit-tests/compositor/test_queueing_schedule.cpp   2015-09-29 21:21:12.014039012 +0200
  58 @@ -16,9 +16,10 @@
  59   * Authored by: Kevin DuBois <kevin.dubois@canonical.com>
  60   */
  61
  62 +#include <gtest/gtest.h>
  63 +#include <gmock/gmock.h>
  64  #include "src/server/compositor/queueing_schedule.h"
  65  #include "mir/test/doubles/stub_buffer.h"
  66 -#include <gtest/gtest.h>
  67
  68  using namespace testing;
  69  namespace mtd = mir::test::doubles;
  70 --- mir-0.16.0/tests/unit-tests/graphics/test_platform_prober.cpp.orig  2015-09-29 07:33:42.000000000 +0200
  71 +++ mir-0.16.0/tests/unit-tests/graphics/test_platform_prober.cpp       2015-09-29 21:52:25.397293726 +0200
  72 @@ -17,6 +17,7 @@
  73   */
  74
  75  #include <gtest/gtest.h>
  76 +#include <gmock/gmock.h>
  77
  78  #include "mir/graphics/platform.h"
  79  #include "mir/graphics/platform_probe.h"
  80 --- mir-0.16.0/tests/unit-tests/input/evdev/test_evdev_device_detection.cpp.orig        2015-09-29 07:33:42.000000000 +0200
  81 +++ mir-0.16.0/tests/unit-tests/input/evdev/test_evdev_device_detection.cpp     2015-09-30 17:44:16.817626009 +0200
  82 @@ -22,6 +22,7 @@
  83  #include "mir_test_framework/udev_environment.h"
  84
  85  #include <gtest/gtest.h>
  86 +#include <gmock/gmock.h>
  87  #include <tuple>
  88
  89  namespace mtf = mir_test_framework;
  90 --- mir-0.16.0/tests/unit-tests/input/test_input_event.cpp.orig 2015-09-29 07:33:42.000000000 +0200
  91 +++ mir-0.16.0/tests/unit-tests/input/test_input_event.cpp      2015-09-30 18:04:45.110907797 +0200
  92 @@ -17,6 +17,7 @@
  93   */
  94
  95  #include <gtest/gtest.h>
  96 +#include <gmock/gmock.h>
  97
  98  #include "mir/events/event_private.h"
  99  #include "mir_toolkit/events/input/input_event.h"
 100 --- mir-0.16.0/tests/unit-tests/dispatch/test_readable_fd.cpp.orig      2015-09-29 07:33:42.000000000 +0200
 101 +++ mir-0.16.0/tests/unit-tests/dispatch/test_readable_fd.cpp   2015-09-30 19:12:50.107403032 +0200
 102 @@ -19,6 +19,7 @@
 103  #include "mir/dispatch/readable_fd.h"
 104
 105  #include <gtest/gtest.h>
 106 +#include <gmock/gmock.h>
 107
 108  namespace md = mir::dispatch;
 109