Merge lp:~raof/mir/i-hate-using-explicitly-forbidden-names into lp:mir

[Chris Halse Rogers]

Conform to Google Test naming requirements (LP: #1149157)

The Google Test docs explicitly say that you should not name_tests_like_this. Convert all our snake_case_named tests to CamelCaseNamed tests.

sed -i -r '/^TEST(_F)?/ s/_([a-z]+)/\u\1/g
/TEST/ s/, ([a-z]+)/, \u\1/g' ../tests/**/*.cpp

Conform to Google Test naming requirements

The Google Test docs explicitly say that you should not name_tests_like_this. Convert all our snake_case_named tests to CamelCaseNamed tests.

Generated by sed, + manual fixup of EGL_MOCK tests + fixup of DISABLED_
sed -i -r '/^TEST(_F)?/ s/_([a-z]+)/\u\1/g
/^TEST/ s/, ([a-z]+)/, \u\1/g' tests/**/*.cpp

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2085
http://jenkins.qa.ubuntu.com/job/mir-ci/2218/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/294/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/294/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/268/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/207/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/268/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/2218/rebuild

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

Yeah I raised this 1.5 years ago (LP: #1149157) but I think there was some resistance to changing anything in discussions at the time.

[Daniel van Vugt (vanvugt)]

I think I approve of the idea, but we might want to time this so as to minimize conflicts. So wait until there are less active reviews...?

[Daniel van Vugt (vanvugt)]

review: Needs Resubmitting

[lp:~raof/mir/i-hate-using-explicitly-forbidden-names]

2095. By Chris Halse Rogers on 2014-11-24

The great un-should-not-ening.

The Google Test docs explicitly say that you should not name_tests_like_this.
Which, for some reason unknown to me, is our style.

For some reason this annoys me everytime I propose a new test.

Change all the snake_case_named tests to CamelCaseNamed tests

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2095
http://jenkins.qa.ubuntu.com/job/mir-ci/2222/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/298
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/298
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/272
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/211
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/211/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/272
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/272/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/3524
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16152

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/2222/rebuild

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

Your script(?) isn't quite catching everything for some reason:

1891 -//TEST_F(MirSurfaceSwapBuffersTest, swap_buffers_does_not_block_when_surface_is_not_composited)
1892 +//TEST_F(MirSurfaceSwapBuffersTest, Swap_buffers_does_not_block_when_surface_is_not_composited)

review: Needs Fixing

[Daniel van Vugt (vanvugt)]

Ah, because of the // :)

[Alexandros Frantzis (afrantzis)]

We have been aware of these naming rules for some time now, but have chosen to do nothing about it because:

1. names_like_this match our current codebase better
2. [subjective] easier_to_read_for_long_sentences vs EasierToReadForLongSentences
3. they don't really cause a problem, read below

The FAQ at [1] offers a strong rationale for not using underscores and at the beginning and end of the test case and test names (may lead to invalid or reserved compiler names), but a much weaker for not using it in the middle (two tests may clash). Since we never use an an underscore in the TestCase name, such clashes are not a concern for us.

There is also some concern that an implementation change may cause problems for our naming scheme, but the chance is low, and we can deal with it when/if it happens. The process can be automated fairly easily (as this branch exhibits), so we are not creating any more work for us if we keep with the current style and need to change in the future.

[1] https://code.google.com/p/googletest/wiki/FAQ#Why_should_not_test_case_names_and_test_names_contain_underscore

review: Disapprove

[Alan Griffiths (alan-griffiths)]

It ain't broke - no need to fix

review: Disapprove

[Cemil Azizoglu (cemil-azizoglu)]

Being proactive is good, IMO. But I see the counter argument too.

review: Abstain

[Chris Halse Rogers (raof)]

Ok, that sounds like a majority. I'll just continue to be annoyed when writing tests :)

Unmerged revisions

2095. By Chris Halse Rogers on 2014-11-24

The great un-should-not-ening.

The Google Test docs explicitly say that you should not name_tests_like_this.
Which, for some reason unknown to me, is our style.

For some reason this annoys me everytime I propose a new test.

Change all the snake_case_named tests to CamelCaseNamed tests

=== modified file 'tests/acceptance-tests/server_configuration_options.cpp'
--- tests/acceptance-tests/server_configuration_options.cpp	2014-11-06 13:26:52 +0000
+++ tests/acceptance-tests/server_configuration_options.cpp	2014-11-24 02:31:01 +0000
@@ -102,7 +102,7 @@
     }
 };
 
-TEST_F(ServerConfigurationOptions, unknown_command_line_options_are_passed_to_handler)
+TEST_F(ServerConfigurationOptions, UnknownCommandLineOptionsArePassedToHandler)
 {
     const int argc = 10;
     char const* argv[argc] = {
@@ -123,7 +123,7 @@
     server.apply_settings();
 }
 
-TEST_F(ServerConfigurationOptions, are_read_from_xdg_config_home)
+TEST_F(ServerConfigurationOptions, AreReadFromXdgConfigHome)
 {
     create_config_file_in(fake_xdg_config_home);
 
@@ -135,7 +135,7 @@
     EXPECT_THAT(options->get(test_config_key, not_found), StrEq(fake_xdg_config_home));
 }
 
-TEST_F(ServerConfigurationOptions, are_read_from_home_config_file)
+TEST_F(ServerConfigurationOptions, AreReadFromHomeConfigFile)
 {
     mkdir(fake_home, 0700);
     create_config_file_in(fake_home_config);
@@ -151,7 +151,7 @@
     EXPECT_THAT(options->get(test_config_key, not_found), StrEq(fake_home_config));
 }
 
-TEST_F(ServerConfigurationOptions, are_read_from_xdg_config_dir0_config_file)
+TEST_F(ServerConfigurationOptions, AreReadFromXdgConfigDir0ConfigFile)
 {
     create_config_file_in(fake_xdg_config_dir0);
 
@@ -163,7 +163,7 @@
     EXPECT_THAT(options->get(test_config_key, not_found), StrEq(fake_xdg_config_dir0));
 }
 
-TEST_F(ServerConfigurationOptions, are_read_from_xdg_config_dir1_config_file)
+TEST_F(ServerConfigurationOptions, AreReadFromXdgConfigDir1ConfigFile)
 {
     create_config_file_in(fake_xdg_config_dir1);
 
@@ -175,7 +175,7 @@
     EXPECT_THAT(options->get(test_config_key, not_found), StrEq(fake_xdg_config_dir1));
 }
 
-TEST_F(ServerConfigurationOptions, are_read_from_xdg_config_dir0_before_xdg_config_dir1)
+TEST_F(ServerConfigurationOptions, AreReadFromXdgConfigDir0BeforeXdgConfigDir1)
 {
     create_config_file_in(fake_xdg_config_dir0);
     create_config_file_in(fake_xdg_config_dir1);
@@ -188,7 +188,7 @@
     EXPECT_THAT(options->get(test_config_key, not_found), StrEq(fake_xdg_config_dir0));
 }
 
-TEST_F(ServerConfigurationOptions, are_read_from_xdg_config_home_before_xdg_config_dirs)
+TEST_F(ServerConfigurationOptions, AreReadFromXdgConfigHomeBeforeXdgConfigDirs)
 {
     create_config_file_in(fake_xdg_config_home);
     create_config_file_in(fake_xdg_config_dir0);

=== modified file 'tests/acceptance-tests/server_configuration_wrapping.cpp'
--- tests/acceptance-tests/server_configuration_wrapping.cpp	2014-11-06 03:56:24 +0000
+++ tests/acceptance-tests/server_configuration_wrapping.cpp	2014-11-24 02:31:01 +0000
@@ -71,14 +71,14 @@
 };
 }
 
-TEST_F(ServerConfigurationWrapping, surface_coordinator_is_of_wrapper_type)
+TEST_F(ServerConfigurationWrapping, SurfaceCoordinatorIsOfWrapperType)
 {
     auto const my_surface_coordinator = std::dynamic_pointer_cast<MySurfaceCoordinator>(surface_coordinator);
 
     EXPECT_THAT(my_surface_coordinator, Ne(nullptr));
 }
 
-TEST_F(ServerConfigurationWrapping, can_override_surface_coordinator_methods)
+TEST_F(ServerConfigurationWrapping, CanOverrideSurfaceCoordinatorMethods)
 {
     auto const my_surface_coordinator = std::dynamic_pointer_cast<MySurfaceCoordinator>(surface_coordinator);
 
@@ -86,19 +86,19 @@
     surface_coordinator->raise({});
 }
 
-TEST_F(ServerConfigurationWrapping, returns_same_surface_coordinator_from_cache)
+TEST_F(ServerConfigurationWrapping, ReturnsSameSurfaceCoordinatorFromCache)
 {
     ASSERT_THAT(server.the_surface_coordinator(), Eq(surface_coordinator));
 }
 
-TEST_F(ServerConfigurationWrapping, session_coordinator_is_of_wrapper_type)
+TEST_F(ServerConfigurationWrapping, SessionCoordinatorIsOfWrapperType)
 {
     auto const my_session_coordinator = std::dynamic_pointer_cast<MySessionCoordinator>(session_coordinator);
 
     EXPECT_THAT(my_session_coordinator, Ne(nullptr));
 }
 
-TEST_F(ServerConfigurationWrapping, can_override_session_coordinator_methods)
+TEST_F(ServerConfigurationWrapping, CanOverrideSessionCoordinatorMethods)
 {
     auto const my_session_coordinator = std::dynamic_pointer_cast<MySessionCoordinator>(session_coordinator);
 
@@ -106,7 +106,7 @@
     session_coordinator->focus_next();
 }
 
-TEST_F(ServerConfigurationWrapping, returns_same_session_coordinator_from_cache)
+TEST_F(ServerConfigurationWrapping, ReturnsSameSessionCoordinatorFromCache)
 {
     ASSERT_THAT(server.the_session_coordinator(), Eq(session_coordinator));
 }

=== modified file 'tests/acceptance-tests/server_signal_handling.cpp'
--- tests/acceptance-tests/server_signal_handling.cpp	2014-11-14 02:41:05 +0000
+++ tests/acceptance-tests/server_signal_handling.cpp	2014-11-24 02:31:01 +0000
@@ -55,7 +55,7 @@
 };
 }
 
-TEST_F(ServerSignal, terminate_handler_is_called_for_SIGTERM)
+TEST_F(ServerSignal, TerminateHandlerIsCalledFor_SIGTERM)
 {
     run_in_server([&]
         {
@@ -65,7 +65,7 @@
         });
 }
 
-TEST_F(ServerSignal, terminate_handler_is_called_for_SIGINT)
+TEST_F(ServerSignal, TerminateHandlerIsCalledFor_SIGINT)
 {
     run_in_server([&]
         {
@@ -77,7 +77,7 @@
 
 struct Abort : ServerSignal, ::testing::WithParamInterface<int> {};
 
-TEST_P(Abort, cleanup_handler_is_called_for)
+TEST_P(Abort, CleanupHandlerIsCalledFor)
 {
     expect_server_signalled(GetParam());
 
@@ -89,7 +89,7 @@
 INSTANTIATE_TEST_CASE_P(ServerSignal, Abort,
     ::testing::Values(SIGQUIT, SIGABRT, SIGFPE, SIGSEGV, SIGBUS));
 
-TEST_F(ServerSignal, multiple_cleanup_handlers_are_called)
+TEST_F(ServerSignal, MultipleCleanupHandlersAreCalled)
 {
     const int multiple = 5;
     expect_server_signalled(SIGABRT);

=== modified file 'tests/acceptance-tests/test_client_authorization.cpp'
--- tests/acceptance-tests/test_client_authorization.cpp	2014-11-03 02:35:50 +0000
+++ tests/acceptance-tests/test_client_authorization.cpp	2014-11-24 02:31:01 +0000
@@ -96,7 +96,7 @@
 };
 }
 
-TEST_F(ClientCredsTestFixture, session_authorizer_receives_pid_of_connecting_clients)
+TEST_F(ClientCredsTestFixture, SessionAuthorizerReceivesPidOfConnectingClients)
 {
     auto const matches_creds = [&](mf::SessionCredentials const& creds)
     {
@@ -143,7 +143,7 @@
 }
 
 // This test is also a regression test for https://bugs.launchpad.net/mir/+bug/1358191
-TEST_F(ClientCredsTestFixture, authorizer_may_prevent_connection_of_clients)
+TEST_F(ClientCredsTestFixture, AuthorizerMayPreventConnectionOfClients)
 {
     init_server([&]
         {

=== modified file 'tests/acceptance-tests/test_client_cursor_api.cpp'
--- tests/acceptance-tests/test_client_cursor_api.cpp	2014-10-29 06:21:10 +0000
+++ tests/acceptance-tests/test_client_cursor_api.cpp	2014-11-24 02:31:01 +0000
@@ -272,7 +272,7 @@
 // In this set we create a 1x1 client surface at the point (1,0). The client requests to disable the cursor
 // over this surface. Since the cursor starts at (0,0) we when we move the cursor by (1,0) thus causing it
 // to enter the bounds of the first surface, we should observe it being disabled.
-TEST_F(TestClientCursorAPI, client_may_disable_cursor_over_surface)
+TEST_F(TestClientCursorAPI, ClientMayDisableCursorOverSurface)
 {
     using namespace ::testing;
 
@@ -292,7 +292,7 @@
     client_shutdown_expectations();
 }
 
-TEST_F(TestClientCursorAPI, cursor_restored_when_leaving_surface)
+TEST_F(TestClientCursorAPI, CursorRestoredWhenLeavingSurface)
 {
     using namespace ::testing;
 
@@ -315,7 +315,7 @@
     client_shutdown_expectations();
 }
 
-TEST_F(TestClientCursorAPI, cursor_changed_when_crossing_surface_boundaries)
+TEST_F(TestClientCursorAPI, CursorChangedWhenCrossingSurfaceBoundaries)
 {
     using namespace ::testing;
 
@@ -342,7 +342,7 @@
     client_shutdown_expectations();
 }
 
-TEST_F(TestClientCursorAPI, cursor_request_taken_from_top_surface)
+TEST_F(TestClientCursorAPI, CursorRequestTakenFromTopSurface)
 {
     using namespace ::testing;
 
@@ -366,7 +366,7 @@
     client_shutdown_expectations();
 }
 
-TEST_F(TestClientCursorAPI, cursor_request_applied_without_cursor_motion)
+TEST_F(TestClientCursorAPI, CursorRequestAppliedWithoutCursorMotion)
 {
     using namespace ::testing;
 

=== modified file 'tests/acceptance-tests/test_client_focus_notification.cpp'
--- tests/acceptance-tests/test_client_focus_notification.cpp	2014-03-06 06:05:17 +0000
+++ tests/acceptance-tests/test_client_focus_notification.cpp	2014-11-24 02:31:01 +0000
@@ -107,7 +107,7 @@
 
 }
 
-TEST_F(BespokeDisplayServerTestFixture, a_surface_is_notified_of_receiving_focus)
+TEST_F(BespokeDisplayServerTestFixture, ASurfaceIsNotifiedOfReceivingFocus)
 {
     using namespace ::testing;
 
@@ -137,7 +137,7 @@
 
 }
 
-TEST_F(BespokeDisplayServerTestFixture, two_surfaces_are_notified_of_gaining_and_losing_focus)
+TEST_F(BespokeDisplayServerTestFixture, TwoSurfacesAreNotifiedOfGainingAndLosingFocus)
 {
     using namespace ::testing;
 

=== modified file 'tests/acceptance-tests/test_client_header_version.cpp'
--- tests/acceptance-tests/test_client_header_version.cpp	2014-11-20 05:43:02 +0000
+++ tests/acceptance-tests/test_client_header_version.cpp	2014-11-24 02:31:01 +0000
@@ -20,7 +20,7 @@
 
 #include <gtest/gtest.h>
 
-TEST(ClientHeaderVersion, mir_client_version_ge_is_sane)
+TEST(ClientHeaderVersion, MirClientVersionGeIsSane)
 {
     // We have to be greater than 0.0.0
     EXPECT_TRUE(MIR_CLIENT_VERSION >= MIR_VERSION_NUMBER(0, 0, 0));
@@ -42,7 +42,7 @@
 				       MIR_CLIENT_MICRO_VERSION + 1));
 }
 
-TEST(ClientHeaderVersion, mir_client_version_ge_is_usable_in_preprocessor)
+TEST(ClientHeaderVersion, MirClientVersionGeIsUsableInPreprocessor)
 {
 #if MIR_CLIENT_VERSION < MIR_VERSION_NUMBER(0, 0, 0)
     FAIL() << "MIR_CLIENT_VERSION < MIR_VERSION_NUMBER(0, 0, 0)";

=== modified file 'tests/acceptance-tests/test_client_input.cpp'
--- tests/acceptance-tests/test_client_input.cpp	2014-11-12 07:07:06 +0000
+++ tests/acceptance-tests/test_client_input.cpp	2014-11-24 02:31:01 +0000
@@ -223,7 +223,7 @@
 
 }
 
-TEST_F(TestClientInput, clients_receive_key_input)
+TEST_F(TestClientInput, ClientsReceiveKeyInput)
 {
     using namespace testing;
 
@@ -243,7 +243,7 @@
             mis::a_key_down_event().of_scancode(KEY_ENTER));
 }
 
-TEST_F(TestClientInput, clients_receive_us_english_mapped_keys)
+TEST_F(TestClientInput, ClientsReceiveUsEnglishMappedKeys)
 {
     using namespace testing;
 
@@ -267,7 +267,7 @@
         mis::a_key_down_event().of_scancode(KEY_4));
 }
 
-TEST_F(TestClientInput, clients_receive_motion_inside_window)
+TEST_F(TestClientInput, ClientsReceiveMotionInsideWindow)
 {
     using namespace testing;
 
@@ -294,7 +294,7 @@
     fake_event_hub()->synthesize_event(mis::a_motion_event().with_movement(2,2));
 }
 
-TEST_F(TestClientInput, clients_receive_button_events_inside_window)
+TEST_F(TestClientInput, ClientsReceiveButtonEventsInsideWindow)
 {
     using namespace testing;
 
@@ -312,7 +312,7 @@
             .with_action(mis::EventAction::Down));
 }
 
-TEST_F(TestClientInput, multiple_clients_receive_motion_inside_windows)
+TEST_F(TestClientInput, MultipleClientsReceiveMotionInsideWindows)
 {
     using namespace testing;
 
@@ -359,7 +359,7 @@
         mis::a_motion_event().with_movement(screen_width / 2, screen_height / 2));
 }
 
-TEST_F(TestClientInput, clients_do_not_receive_motion_outside_input_region)
+TEST_F(TestClientInput, ClientsDoNotReceiveMotionOutsideInputRegion)
 {
     using namespace testing;
 
@@ -414,7 +414,7 @@
     fake_event_hub()->synthesize_event(mis::a_button_up_event().of_button(BTN_LEFT));
 }
 
-TEST_F(TestClientInput, scene_obscure_motion_events_by_stacking)
+TEST_F(TestClientInput, SceneObscureMotionEventsByStacking)
 {
     using namespace testing;
 
@@ -467,7 +467,7 @@
     fake_event_hub()->synthesize_event(mis::a_button_up_event().of_button(BTN_LEFT));
 }
 
-TEST_F(TestClientInput, hidden_clients_do_not_receive_pointer_events)
+TEST_F(TestClientInput, HiddenClientsDoNotReceivePointerEvents)
 {
     using namespace testing;
 
@@ -510,7 +510,7 @@
     fake_event_hub()->synthesize_event(mis::a_motion_event().with_movement(1,1));
 }
 
-TEST_F(TestClientInput, clients_receive_motion_within_coordinate_system_of_window)
+TEST_F(TestClientInput, ClientsReceiveMotionWithinCoordinateSystemOfWindow)
 {
     using namespace testing;
 
@@ -544,7 +544,7 @@
 }
 
 // TODO: Consider tests for more input devices with custom mapping (i.e. joysticks...)
-TEST_F(TestClientInput, usb_direct_input_devices_work)
+TEST_F(TestClientInput, UsbDirectInputDevicesWork)
 {
     using namespace ::testing;
 
@@ -595,7 +595,7 @@
         mis::a_touch_event().at_position({abs_touch_x_2, abs_touch_y_2}));
 }
 
-TEST_F(TestClientInput, send_mir_input_events_through_surface)
+TEST_F(TestClientInput, SendMirInputEventsThroughSurface)
 {
     InputClient client1{new_connection(), test_client_name_1};
 

=== modified file 'tests/acceptance-tests/test_client_library.cpp'
--- tests/acceptance-tests/test_client_library.cpp	2014-11-12 07:07:06 +0000
+++ tests/acceptance-tests/test_client_library.cpp	2014-11-24 02:31:01 +0000
@@ -150,7 +150,7 @@
 
 using namespace testing;
 
-TEST_F(ClientLibrary, client_library_connects_and_disconnects)
+TEST_F(ClientLibrary, ClientLibraryConnectsAndDisconnects)
 {
     MirWaitHandle* wh = mir_connect(new_connection().c_str(), __PRETTY_FUNCTION__, connection_callback, this);
     EXPECT_THAT(wh, NotNull());
@@ -163,7 +163,7 @@
     mir_connection_release(connection);
 }
 
-TEST_F(ClientLibrary, synchronous_connection)
+TEST_F(ClientLibrary, SynchronousConnection)
 {
     connection = mir_connect_sync(new_connection().c_str(), __PRETTY_FUNCTION__);
 
@@ -174,7 +174,7 @@
     mir_connection_release(connection);
 }
 
-TEST_F(ClientLibrary, creates_surface)
+TEST_F(ClientLibrary, CreatesSurface)
 {
     mir_wait_for(mir_connect(new_connection().c_str(), __PRETTY_FUNCTION__, connection_callback, this));
 
@@ -220,7 +220,7 @@
     mir_connection_release(connection);
 }
 
-TEST_F(ClientLibrary, can_set_surface_types)
+TEST_F(ClientLibrary, CanSetSurfaceTypes)
 {
     mir_wait_for(mir_connect(new_connection().c_str(), __PRETTY_FUNCTION__, connection_callback, this));
 
@@ -265,7 +265,7 @@
     mir_connection_release(connection);
 }
 
-TEST_F(ClientLibrary, can_set_surface_state)
+TEST_F(ClientLibrary, CanSetSurfaceState)
 {
     connection = mir_connect_sync(new_connection().c_str(), __PRETTY_FUNCTION__);
 
@@ -307,7 +307,7 @@
     mir_connection_release(connection);
 }
 
-TEST_F(ClientLibrary, receives_surface_dpi_value)
+TEST_F(ClientLibrary, ReceivesSurfaceDpiValue)
 {
     connection = mir_connect_sync(new_connection().c_str(), __PRETTY_FUNCTION__);
 
@@ -330,7 +330,7 @@
 }
 
 #ifndef ANDROID
-TEST_F(ClientLibrary, surface_scanout_flag_toggles)
+TEST_F(ClientLibrary, SurfaceScanoutFlagToggles)
 {
     connection = mir_connect_sync(new_connection().c_str(), __PRETTY_FUNCTION__);
 
@@ -388,9 +388,9 @@
 
 #ifdef ANDROID
 // Mir's Android test infrastructure isn't quite ready for this yet.
-TEST_F(ClientLibrary, DISABLED_gets_buffer_dimensions)
+TEST_F(ClientLibrary, DISABLED_GetsBufferDimensions)
 #else
-TEST_F(ClientLibrary, gets_buffer_dimensions)
+TEST_F(ClientLibrary, GetsBufferDimensions)
 #endif
 {
     connection = mir_connect_sync(new_connection().c_str(), __PRETTY_FUNCTION__);
@@ -436,7 +436,7 @@
     mir_connection_release(connection);
 }
 
-TEST_F(ClientLibrary, creates_multiple_surfaces)
+TEST_F(ClientLibrary, CreatesMultipleSurfaces)
 {
     int const n_surfaces = 13;
     size_t old_surface_count = 0;
@@ -475,7 +475,7 @@
     mir_connection_release(connection);
 }
 
-TEST_F(ClientLibrary, client_library_accesses_and_advances_buffers)
+TEST_F(ClientLibrary, ClientLibraryAccessesAndAdvancesBuffers)
 {
     mir_wait_for(mir_connect(new_connection().c_str(), __PRETTY_FUNCTION__, connection_callback, this));
 
@@ -501,7 +501,7 @@
     mir_connection_release(connection);
 }
 
-TEST_F(ClientLibrary, fully_synchronous_client)
+TEST_F(ClientLibrary, FullySynchronousClient)
 {
     connection = mir_connect_sync(new_connection().c_str(), __PRETTY_FUNCTION__);
 
@@ -527,7 +527,7 @@
     mir_connection_release(connection);
 }
 
-TEST_F(ClientLibrary, highly_threaded_client)
+TEST_F(ClientLibrary, HighlyThreadedClient)
 {
     connection = mir_connect_sync(new_connection().c_str(), __PRETTY_FUNCTION__);
 
@@ -560,7 +560,7 @@
     mir_connection_release(connection);
 }
 
-TEST_F(ClientLibrary, accesses_platform_package)
+TEST_F(ClientLibrary, AccessesPlatformPackage)
 {
     mir_wait_for(mir_connect(new_connection().c_str(), __PRETTY_FUNCTION__, connection_callback, this));
 
@@ -575,7 +575,7 @@
     mir_connection_release(connection);
 }
 
-TEST_F(ClientLibrary, accesses_display_info)
+TEST_F(ClientLibrary, AccessesDisplayInfo)
 {
     mir_wait_for(mir_connect(new_connection().c_str(), __PRETTY_FUNCTION__, connection_callback, this));
 

=== modified file 'tests/acceptance-tests/test_client_library_drm.cpp'
--- tests/acceptance-tests/test_client_library_drm.cpp	2014-11-21 12:16:36 +0000
+++ tests/acceptance-tests/test_client_library_drm.cpp	2014-11-24 02:31:01 +0000
@@ -28,7 +28,7 @@
 
 using MirClientLibraryDrmTest = mtf::ConnectedClientHeadlessServer;
 
-TEST_F(MirClientLibraryDrmTest, sets_gbm_device_in_platform_data)
+TEST_F(MirClientLibraryDrmTest, SetsGbmDeviceInPlatformData)
 {
     struct gbm_device* dev = reinterpret_cast<struct gbm_device*>(connection);
 

=== modified file 'tests/acceptance-tests/test_client_library_errors.cpp'
--- tests/acceptance-tests/test_client_library_errors.cpp	2014-11-18 16:44:19 +0000
+++ tests/acceptance-tests/test_client_library_errors.cpp	2014-11-24 02:31:01 +0000
@@ -135,7 +135,7 @@
 
 using ClientLibraryErrors = mtf::HeadlessInProcessServer;
 
-TEST_F(ClientLibraryErrors, exception_in_client_configuration_constructor_generates_error)
+TEST_F(ClientLibraryErrors, ExceptionInClientConfigurationConstructorGeneratesError)
 {
     mtf::UsingClientPlatform<ConfigurableFailureConfiguration<Method::the_client_platform_factory>> stubby;
 
@@ -146,7 +146,7 @@
     mir_connection_release(connection);
 }
 
-TEST_F(ClientLibraryErrors, exception_in_platform_construction_generates_error)
+TEST_F(ClientLibraryErrors, ExceptionInPlatformConstructionGeneratesError)
 {
     mtf::UsingClientPlatform<ConfigurableFailureConfiguration<Method::create_client_platform>> stubby;
 
@@ -157,7 +157,7 @@
     mir_connection_release(connection);
 }
 
-TEST_F(ClientLibraryErrors, connecting_to_garbage_socket_returns_appropriate_error)
+TEST_F(ClientLibraryErrors, ConnectingToGarbageSocketReturnsAppropriateError)
 {
     using namespace testing;
     mtf::UsingStubClientPlatform stubby;
@@ -176,7 +176,7 @@
     mir_connection_release(connection);
 }
 
-TEST_F(ClientLibraryErrors, create_surface_returns_error_object_on_failure)
+TEST_F(ClientLibraryErrors, CreateSurfaceReturnsErrorObjectOnFailure)
 {
     mtf::UsingClientPlatform<ConfigurableFailureConfiguration<Method::create_buffer_factory>> stubby;
 
@@ -211,7 +211,7 @@
 }
 }
 
-TEST_F(ClientLibraryErrors, surface_release_on_error_object_still_calls_callback)
+TEST_F(ClientLibraryErrors, SurfaceReleaseOnErrorObjectStillCallsCallback)
 {
     mtf::UsingClientPlatform<ConfigurableFailureConfiguration<Method::create_buffer_factory>> stubby;
 
@@ -240,7 +240,7 @@
 }
 
 
-TEST_F(ClientLibraryErrors, create_surface_returns_error_object_on_failure_in_reply_processing)
+TEST_F(ClientLibraryErrors, CreateSurfaceReturnsErrorObjectOnFailureInReplyProcessing)
 {
     mtf::UsingClientPlatform<ConfigurableFailureConfiguration<Method::create_egl_native_window>> stubby;
 
@@ -269,7 +269,7 @@
 using ClientLibraryErrorsDeathTest = ClientLibraryErrors;
 
 
-TEST_F(ClientLibraryErrorsDeathTest, createing_surface_on_garbage_connection_is_fatal)
+TEST_F(ClientLibraryErrorsDeathTest, CreateingSurfaceOnGarbageConnectionIsFatal)
 {
     mtf::UsingStubClientPlatform stubby;
 
@@ -289,7 +289,7 @@
 }
 
 
-TEST_F(ClientLibraryErrorsDeathTest, creating_surface_synchronosly_on_malconstructed_connection_is_fatal)
+TEST_F(ClientLibraryErrorsDeathTest, CreatingSurfaceSynchronoslyOnMalconstructedConnectionIsFatal)
 {
     MirSurfaceParameters const request_params =
     {
@@ -308,7 +308,7 @@
     EXPECT_DEATH(mir_connection_create_surface_sync(connection, &request_params), "");
 }
 
-TEST_F(ClientLibraryErrorsDeathTest, creating_surface_synchronosly_on_invalid_connection_is_fatal)
+TEST_F(ClientLibraryErrorsDeathTest, CreatingSurfaceSynchronoslyOnInvalidConnectionIsFatal)
 {
     MirSurfaceParameters const request_params =
     {

=== modified file 'tests/acceptance-tests/test_client_library_old.cpp'
--- tests/acceptance-tests/test_client_library_old.cpp	2014-11-21 12:16:36 +0000
+++ tests/acceptance-tests/test_client_library_old.cpp	2014-11-24 02:31:01 +0000
@@ -45,7 +45,7 @@
     }
 };
 
-TEST_F(ClientLibraryThread, handles_no_signals)
+TEST_F(ClientLibraryThread, HandlesNoSignals)
 {
     run_in_client([&]
         {
@@ -88,7 +88,7 @@
         });
 }
 
-TEST_F(ClientLibraryThread, does_not_interfere_with_client_signal_handling)
+TEST_F(ClientLibraryThread, DoesNotInterfereWithClientSignalHandling)
 {
     run_in_client([&]
         {

=== modified file 'tests/acceptance-tests/test_client_screencast.cpp'
--- tests/acceptance-tests/test_client_screencast.cpp	2014-10-29 06:21:10 +0000
+++ tests/acceptance-tests/test_client_screencast.cpp	2014-11-24 02:31:01 +0000
@@ -93,7 +93,7 @@
 
 }
 
-TEST_F(MirScreencastTest, creation_with_invalid_connection_fails)
+TEST_F(MirScreencastTest, CreationWithInvalidConnectionFails)
 {
     using namespace testing;
 
@@ -101,7 +101,7 @@
     ASSERT_EQ(nullptr, screencast);
 }
 
-TEST_F(MirScreencastTest, contacts_server_screencast_for_create_and_release)
+TEST_F(MirScreencastTest, ContactsServerScreencastForCreateAndRelease)
 {
     using namespace testing;
 
@@ -123,7 +123,7 @@
     mir_screencast_release_sync(screencast);
 }
 
-TEST_F(MirScreencastTest, contacts_server_screencast_with_provided_params)
+TEST_F(MirScreencastTest, ContactsServerScreencastWithProvidedParams)
 {
     using namespace testing;
 
@@ -152,7 +152,7 @@
     mir_screencast_release_sync(screencast);
 }
 
-TEST_F(MirScreencastTest, creation_with_invalid_params_fails)
+TEST_F(MirScreencastTest, CreationWithInvalidParamsFails)
 {
     using namespace testing;
 
@@ -173,7 +173,7 @@
     ASSERT_EQ(nullptr, screencast);
 }
 
-TEST_F(MirScreencastTest, gets_valid_egl_native_window)
+TEST_F(MirScreencastTest, GetsValidEglNativeWindow)
 {
     using namespace testing;
 
@@ -195,7 +195,7 @@
     mir_screencast_release_sync(screencast);
 }
 
-TEST_F(MirScreencastTest, fails_on_client_when_server_request_fails)
+TEST_F(MirScreencastTest, FailsOnClientWhenServerRequestFails)
 {
     using namespace testing;
 
@@ -234,7 +234,7 @@
 
 }
 
-TEST_F(UnauthorizedMirScreencastTest, fails_to_create_screencast)
+TEST_F(UnauthorizedMirScreencastTest, FailsToCreateScreencast)
 {
     using namespace testing;
 

=== modified file 'tests/acceptance-tests/test_client_surface_events.cpp'
--- tests/acceptance-tests/test_client_surface_events.cpp	2014-11-21 12:16:36 +0000
+++ tests/acceptance-tests/test_client_surface_events.cpp	2014-11-24 02:31:01 +0000
@@ -156,7 +156,7 @@
 };
 }
 
-TEST_F(ClientSurfaceEvents, surface_receives_state_events)
+TEST_F(ClientSurfaceEvents, SurfaceReceivesStateEvents)
 {
     int surface_id = mir_debug_surface_id(surface);
 
@@ -217,7 +217,7 @@
 
 struct OrientationEvents : ClientSurfaceEvents, ::testing::WithParamInterface<MirOrientation> {};
 
-TEST_P(OrientationEvents, surface_receives_orientation_events)
+TEST_P(OrientationEvents, SurfaceReceivesOrientationEvents)
 {
     set_event_filter(mir_event_type_orientation);
 
@@ -238,7 +238,7 @@
     OrientationEvents,
     Values(mir_orientation_normal, mir_orientation_left, mir_orientation_inverted, mir_orientation_right));
 
-TEST_F(ClientSurfaceEvents, client_can_query_current_orientation)
+TEST_F(ClientSurfaceEvents, ClientCanQueryCurrentOrientation)
 {
     set_event_filter(mir_event_type_orientation);
 

=== modified file 'tests/acceptance-tests/test_client_surface_swap_buffers.cpp'
--- tests/acceptance-tests/test_client_surface_swap_buffers.cpp	2014-11-18 16:15:00 +0000
+++ tests/acceptance-tests/test_client_surface_swap_buffers.cpp	2014-11-24 02:31:01 +0000
@@ -52,7 +52,7 @@
 };
 }
 
-TEST_F(SurfaceSwapBuffers, does_not_block_when_surface_is_not_composited)
+TEST_F(SurfaceSwapBuffers, DoesNotBlockWhenSurfaceIsNotComposited)
 {
     for (int i = 0; i != 10; ++i)
     {

=== modified file 'tests/acceptance-tests/test_client_surface_visibility.cpp'
--- tests/acceptance-tests/test_client_surface_visibility.cpp	2014-10-29 06:21:10 +0000
+++ tests/acceptance-tests/test_client_surface_visibility.cpp	2014-11-24 02:31:01 +0000
@@ -312,14 +312,14 @@
 
 }
 
-TEST_F(MirSurfaceVisibilityEvent, occluded_received_when_surface_goes_off_screen)
+TEST_F(MirSurfaceVisibilityEvent, OccludedReceivedWhenSurfaceGoesOffScreen)
 {
     expect_surface_visibility_event_after(
         mir_surface_visibility_occluded,
         [this] { move_surface_off_screen(); });
 }
 
-TEST_F(MirSurfaceVisibilityEvent, exposed_received_when_surface_reenters_screen)
+TEST_F(MirSurfaceVisibilityEvent, ExposedReceivedWhenSurfaceReentersScreen)
 {
     expect_surface_visibility_event_after(
         mir_surface_visibility_occluded,
@@ -330,14 +330,14 @@
         [this] { move_surface_into_screen(); });
 }
 
-TEST_F(MirSurfaceVisibilityEvent, occluded_received_when_surface_occluded_by_other_surface)
+TEST_F(MirSurfaceVisibilityEvent, OccludedReceivedWhenSurfaceOccludedByOtherSurface)
 {
     expect_surface_visibility_event_after(
         mir_surface_visibility_occluded,
         [this] { create_larger_surface_on_top(); });
 }
 
-TEST_F(MirSurfaceVisibilityEvent, exposed_received_when_surface_raised_over_occluding_surface)
+TEST_F(MirSurfaceVisibilityEvent, ExposedReceivedWhenSurfaceRaisedOverOccludingSurface)
 {
     expect_surface_visibility_event_after(
         mir_surface_visibility_occluded,

=== modified file 'tests/acceptance-tests/test_client_surfaces.cpp'
--- tests/acceptance-tests/test_client_surfaces.cpp	2014-10-29 06:21:10 +0000
+++ tests/acceptance-tests/test_client_surfaces.cpp	2014-11-24 02:31:01 +0000
@@ -104,7 +104,7 @@
 }
 }
 
-TEST_F(ClientSurfaces, are_created_with_correct_size)
+TEST_F(ClientSurfaces, AreCreatedWithCorrectSize)
 {
     mir_connection_create_surface(connection, &surface_params, create_surface_callback, ssync);
     wait_for_surface_create(ssync);
@@ -135,7 +135,7 @@
     wait_for_surface_release(ssync);
 }
 
-TEST_F(ClientSurfaces, have_distinct_ids)
+TEST_F(ClientSurfaces, HaveDistinctIds)
 {
     mir_connection_create_surface(connection, &surface_params, create_surface_callback, ssync);
     wait_for_surface_create(ssync);
@@ -157,7 +157,7 @@
     wait_for_surface_release(ssync);
 }
 
-TEST_F(ClientSurfaces, creates_need_not_be_serialized)
+TEST_F(ClientSurfaces, CreatesNeedNotBeSerialized)
 {
     for (int i = 0; i != max_surface_count; ++i)
         mir_connection_create_surface(connection, &surface_params, create_surface_callback, ssync+i);

=== modified file 'tests/acceptance-tests/test_command_line_handling.cpp'
--- tests/acceptance-tests/test_command_line_handling.cpp	2014-11-21 12:16:36 +0000
+++ tests/acceptance-tests/test_command_line_handling.cpp	2014-11-24 02:31:01 +0000
@@ -36,7 +36,7 @@
         };
 };
 
-TEST_F(CommandLineHandling, valid_options_are_accepted_by_default_callback)
+TEST_F(CommandLineHandling, ValidOptionsAreAcceptedByDefaultCallback)
 {
     char const* argv[] =
      { "dummy-exe-name", "--file", "test", "--enable-input", "off"};
@@ -48,7 +48,7 @@
     server.apply_settings();
 }
 
-TEST_F(CommandLineHandling, unrecognised_tokens_cause_default_callback_to_throw)
+TEST_F(CommandLineHandling, UnrecognisedTokensCauseDefaultCallbackToThrow)
 {
     char const* argv[] =
      { "dummy-exe-name", "--file", "test", "--hello", "world", "--enable-input", "off"};
@@ -60,7 +60,7 @@
     EXPECT_THROW(server.apply_settings(), std::runtime_error);
 }
 
-TEST_F(CommandLineHandling, valid_options_are_not_passed_to_callback)
+TEST_F(CommandLineHandling, ValidOptionsAreNotPassedToCallback)
 {
     char const* argv[] =
      { "dummy-exe-name", "--file", "test", "--enable-input", "off"};
@@ -75,7 +75,7 @@
     server.apply_settings();
 }
 
-TEST_F(CommandLineHandling, unrecognised_tokens_are_passed_to_callback)
+TEST_F(CommandLineHandling, UnrecognisedTokensArePassedToCallback)
 {
     char const* argv[] =
      { "dummy-exe-name", "--file", "test", "--hello", "world", "--enable-input", "off"};

=== modified file 'tests/acceptance-tests/test_custom_input_dispatcher.cpp'
--- tests/acceptance-tests/test_custom_input_dispatcher.cpp	2014-10-29 06:21:10 +0000
+++ tests/acceptance-tests/test_custom_input_dispatcher.cpp	2014-11-24 02:31:01 +0000
@@ -104,7 +104,7 @@
 
 using CustomInputDispatcher = BespokeDisplayServerTestFixture;
 
-TEST_F(CustomInputDispatcher, receives_input)
+TEST_F(CustomInputDispatcher, ReceivesInput)
 {
     struct ServerConfig : CustomDispatcherServerConfig
     {
@@ -137,7 +137,7 @@
     });
 }
 
-TEST_F(CustomInputDispatcher, gets_started_and_stopped)
+TEST_F(CustomInputDispatcher, GetsStartedAndStopped)
 {
     struct ServerConfig : CustomDispatcherServerConfig
     {
@@ -155,7 +155,7 @@
     launch_server_process(server_config);
 }
 
-TEST_F(CustomInputDispatcher, receives_focus_changes)
+TEST_F(CustomInputDispatcher, ReceivesFocusChanges)
 {
     struct ServerConfig : CustomDispatcherServerConfig
     {

=== modified file 'tests/acceptance-tests/test_debug_api.cpp'
--- tests/acceptance-tests/test_debug_api.cpp	2014-11-20 11:30:38 +0000
+++ tests/acceptance-tests/test_debug_api.cpp	2014-11-24 02:31:01 +0000
@@ -119,7 +119,7 @@
 };
 }
 
-TEST_F(DebugAPI, translates_surface_coordinates_to_screen_coordinates)
+TEST_F(DebugAPI, TranslatesSurfaceCoordinatesToScreenCoordinates)
 {
     start_server_with_debug(true);
 
@@ -153,7 +153,7 @@
     mir_surface_release_sync(surf);
 }
 
-TEST_F(DebugAPI, is_unavaliable_when_server_not_started_with_debug)
+TEST_F(DebugAPI, IsUnavaliableWhenServerNotStartedWithDebug)
 {
     start_server_with_debug(false);
 

=== modified file 'tests/acceptance-tests/test_display_configuration.cpp'
--- tests/acceptance-tests/test_display_configuration.cpp	2014-10-29 06:21:10 +0000
+++ tests/acceptance-tests/test_display_configuration.cpp	2014-11-24 02:31:01 +0000
@@ -170,7 +170,7 @@
 
 using DisplayConfigurationTest = BespokeDisplayServerTestFixture;
 
-TEST_F(DisplayConfigurationTest, display_configuration_reaches_client)
+TEST_F(DisplayConfigurationTest, DisplayConfigurationReachesClient)
 {
     struct ServerConfig : TestingServerConfiguration
     {
@@ -204,7 +204,7 @@
     launch_client_process(client_config);
 }
 
-TEST_F(DisplayConfigurationTest, hw_display_change_notification_reaches_all_clients)
+TEST_F(DisplayConfigurationTest, HwDisplayChangeNotificationReachesAllClients)
 {
     mtf::CrossProcessSync client_ready_fence;
     mtf::CrossProcessSync unsubscribed_client_ready_fence;
@@ -345,7 +345,7 @@
     });
 }
 
-TEST_F(DisplayConfigurationTest, display_change_request_for_unauthorized_client_fails)
+TEST_F(DisplayConfigurationTest, DisplayChangeRequestForUnauthorizedClientFails)
 {
     struct ServerConfig : TestingServerConfiguration
     {
@@ -458,7 +458,7 @@
 
 }
 
-TEST_F(DisplayConfigurationTest, changing_config_for_focused_client_configures_display)
+TEST_F(DisplayConfigurationTest, ChangingConfigForFocusedClientConfiguresDisplay)
 {
     mt::CrossProcessAction display_client_connect;
     mt::CrossProcessAction display_client_apply_config;
@@ -538,7 +538,7 @@
     });
 }
 
-TEST_F(DisplayConfigurationTest, focusing_client_with_display_config_configures_display)
+TEST_F(DisplayConfigurationTest, FocusingClientWithDisplayConfigConfiguresDisplay)
 {
     mt::CrossProcessAction display_client_connect;
     mt::CrossProcessAction display_client_apply_config;
@@ -634,7 +634,7 @@
     });
 }
 
-TEST_F(DisplayConfigurationTest, changing_focus_from_client_with_config_to_client_without_config_configures_display)
+TEST_F(DisplayConfigurationTest, ChangingFocusFromClientWithConfigToClientWithoutConfigConfiguresDisplay)
 {
     mt::CrossProcessAction display_client_connect;
     mt::CrossProcessAction display_client_apply_config;
@@ -729,7 +729,7 @@
     });
 }
 
-TEST_F(DisplayConfigurationTest, hw_display_change_doesnt_apply_base_config_if_per_session_config_is_active)
+TEST_F(DisplayConfigurationTest, HwDisplayChangeDoesntApplyBaseConfigIfPerSessionConfigIsActive)
 {
     mt::CrossProcessAction display_client_connect;
     mt::CrossProcessAction display_client_apply_config;

=== modified file 'tests/acceptance-tests/test_focus_selection.cpp'
--- tests/acceptance-tests/test_focus_selection.cpp	2014-10-29 06:21:10 +0000
+++ tests/acceptance-tests/test_focus_selection.cpp	2014-11-24 02:31:01 +0000
@@ -46,7 +46,7 @@
 }
 }
 
-TEST_F(BespokeDisplayServerTestFixture, sessions_creating_surface_receive_focus)
+TEST_F(BespokeDisplayServerTestFixture, SessionsCreatingSurfaceReceiveFocus)
 {
     struct ServerConfig : TestingServerConfiguration
     {
@@ -80,7 +80,7 @@
     launch_client_process(client);
 }
 
-TEST_F(BespokeDisplayServerTestFixture, surfaces_receive_input_focus_when_created)
+TEST_F(BespokeDisplayServerTestFixture, SurfacesReceiveInputFocusWhenCreated)
 {
     struct ServerConfig : TestingServerConfiguration
     {

=== modified file 'tests/acceptance-tests/test_large_messages.cpp'
--- tests/acceptance-tests/test_large_messages.cpp	2014-10-29 06:21:10 +0000
+++ tests/acceptance-tests/test_large_messages.cpp	2014-11-24 02:31:01 +0000
@@ -89,7 +89,7 @@
 // Regression test for lp:1320187. Without a fix for that bug, connecting
 // to a server with a lot of information in the display configuration hangs
 // the client, because the server reply message is incomplete/corrupted.
-TEST_F(LargeMessages, connection_to_server_with_large_display_configuration_succeeds)
+TEST_F(LargeMessages, ConnectionToServerWithLargeDisplayConfigurationSucceeds)
 {
     using namespace testing;
 

=== modified file 'tests/acceptance-tests/test_nested_mir.cpp'
--- tests/acceptance-tests/test_nested_mir.cpp	2014-11-21 12:16:36 +0000
+++ tests/acceptance-tests/test_nested_mir.cpp	2014-11-24 02:31:01 +0000
@@ -296,7 +296,7 @@
 };
 }
 
-TEST_F(NestedServer, nested_platform_connects_and_disconnects)
+TEST_F(NestedServer, NestedPlatformConnectsAndDisconnects)
 {
     NestedServerConfiguration nested_config{connection_string, the_graphics_platform()};
 
@@ -307,7 +307,7 @@
     NestedMirRunner nested_mir{nested_config};
 }
 
-TEST_F(NestedServer, sees_expected_outputs)
+TEST_F(NestedServer, SeesExpectedOutputs)
 {
     NestedServerConfiguration nested_config{connection_string, the_graphics_platform()};
     NestedMirRunner nested_mir{nested_config};
@@ -331,7 +331,7 @@
 //////////////////////////////////////////////////////////////////
 // TODO the following test was used in investigating lifetime issues.
 // TODO it may not have much long term value, but decide that later.
-TEST_F(NestedServer, on_exit_display_objects_should_be_destroyed)
+TEST_F(NestedServer, OnExitDisplayObjectsShouldBeDestroyed)
 {
     struct MyServerConfiguration : NestedServerConfiguration
     {
@@ -354,7 +354,7 @@
     EXPECT_FALSE(config.my_display.lock()) << "after run_mir() exits the display should be released";
 }
 
-TEST_F(NestedServer, receives_lifecycle_events_from_host)
+TEST_F(NestedServer, ReceivesLifecycleEventsFromHost)
 {
     struct MyServerConfiguration : NestedServerConfiguration
     {

=== modified file 'tests/acceptance-tests/test_prompt_session_client_api.cpp'
--- tests/acceptance-tests/test_prompt_session_client_api.cpp	2014-11-03 02:35:50 +0000
+++ tests/acceptance-tests/test_prompt_session_client_api.cpp	2014-11-24 02:31:01 +0000
@@ -309,7 +309,7 @@
 }
 }
 
-TEST_F(PromptSessionClientAPI, can_start_and_stop_a_prompt_session)
+TEST_F(PromptSessionClientAPI, CanStartAndStopAPromptSession)
 {
     connection = mir_connect_sync(new_connection().c_str(), __PRETTY_FUNCTION__);
 
@@ -328,7 +328,7 @@
     mir_prompt_session_release_sync(prompt_session);
 }
 
-TEST_F(PromptSessionClientAPI, notifies_start_and_stop)
+TEST_F(PromptSessionClientAPI, NotifiesStartAndStop)
 {
     connection = mir_connect_sync(new_connection().c_str(), __PRETTY_FUNCTION__);
 
@@ -342,7 +342,7 @@
     mir_prompt_session_release_sync(prompt_session);
 }
 
-TEST_F(PromptSessionClientAPI, can_get_fds_for_prompt_providers)
+TEST_F(PromptSessionClientAPI, CanGetFdsForPromptProviders)
 {
     connection = mir_connect_sync(new_connection().c_str(), __PRETTY_FUNCTION__);
 
@@ -386,7 +386,7 @@
 // TODO we need a nice way to run this (and similar tests that require a
 // TODO separate client process) in CI. Disabled as we can't be sure the
 // TODO mir_demo_client_basic executable is about.
-TEST_F(PromptSessionClientAPI, DISABLED_client_pid_is_associated_with_session)
+TEST_F(PromptSessionClientAPI, DISABLED_ClientPidIsAssociatedWithSession)
 {
     connection = mir_connect_sync(new_connection().c_str(), __PRETTY_FUNCTION__);
 
@@ -417,7 +417,7 @@
     mir_prompt_session_release_sync(prompt_session);
 }
 
-TEST_F(PromptSessionClientAPI, notifies_when_server_closes_prompt_session)
+TEST_F(PromptSessionClientAPI, NotifiesWhenServerClosesPromptSession)
 {
     connection = mir_connect_sync(new_connection().c_str(), __PRETTY_FUNCTION__);
 
@@ -438,7 +438,7 @@
     mir_prompt_session_release_sync(prompt_session);
 }
 
-TEST_F(PromptSessionClientAPI, after_server_closes_prompt_session_api_isnt_broken)
+TEST_F(PromptSessionClientAPI, AfterServerClosesPromptSessionApiIsntBroken)
 {
     connection = mir_connect_sync(new_connection().c_str(), __PRETTY_FUNCTION__);
 
@@ -455,7 +455,7 @@
     mir_prompt_session_release_sync(prompt_session);
 }
 
-TEST_F(PromptSessionClientAPI, server_retrieves_application_session)
+TEST_F(PromptSessionClientAPI, ServerRetrievesApplicationSession)
 {
     connection = mir_connect_sync(new_connection().c_str(), __PRETTY_FUNCTION__);
     capture_server_prompt_session();
@@ -469,7 +469,7 @@
     mir_prompt_session_release_sync(prompt_session);
 }
 
-TEST_F(PromptSessionClientAPI, server_retrieves_helper_session)
+TEST_F(PromptSessionClientAPI, ServerRetrievesHelperSession)
 {
     connection = mir_connect_sync(new_connection().c_str(), __PRETTY_FUNCTION__);
 
@@ -486,7 +486,7 @@
     mir_prompt_session_release_sync(prompt_session);
 }
 
-TEST_F(PromptSessionClientAPI, server_retrieves_child_provider_sessions)
+TEST_F(PromptSessionClientAPI, ServerRetrievesChildProviderSessions)
 {
     connection = mir_connect_sync(new_connection().c_str(), __PRETTY_FUNCTION__);
 
@@ -507,7 +507,7 @@
     mir_prompt_session_release_sync(prompt_session);
 }
 
-TEST_F(PromptSessionClientAPI, cannot_start_a_prompt_session_without_authorization)
+TEST_F(PromptSessionClientAPI, CannotStartAPromptSessionWithoutAuthorization)
 {
     EXPECT_CALL(*the_mock_session_authorizer(), prompt_session_is_allowed(_))
         .WillOnce(Return(false));
@@ -570,7 +570,7 @@
 }
 
 // lp:1377968
-TEST_F(PromptSessionClientAPI, when_application_pid_is_invalid_starting_a_prompt_session_fails)
+TEST_F(PromptSessionClientAPI, WhenApplicationPidIsInvalidStartingAPromptSessionFails)
 {
     connection = mir_connect_sync(new_prompt_connection().c_str(), __PRETTY_FUNCTION__);
 

=== modified file 'tests/acceptance-tests/test_server_disconnect.cpp'
--- tests/acceptance-tests/test_server_disconnect.cpp	2014-11-21 12:16:36 +0000
+++ tests/acceptance-tests/test_server_disconnect.cpp	2014-11-24 02:31:01 +0000
@@ -57,7 +57,7 @@
 }
 }
 
-TEST_F(ServerDisconnect, is_detected_by_client)
+TEST_F(ServerDisconnect, IsDetectedByClient)
 {
     mtf::CrossProcessSync sync;
 
@@ -99,7 +99,7 @@
     }
 }
 
-TEST_F(ServerDisconnect, doesnt_stop_client_calling_API_functions)
+TEST_F(ServerDisconnect, DoesntStopClientCalling_APIFunctions)
 {
     mt::CrossProcessAction connect;
     mt::CrossProcessAction create_surface;
@@ -162,7 +162,7 @@
     }
 }
 
-TEST_F(ServerDisconnect, causes_client_to_terminate_by_default)
+TEST_F(ServerDisconnect, CausesClientToTerminateByDefault)
 {
     mt::CrossProcessAction connect;
     mtf::CrossProcessSync create_surface_sync;

=== modified file 'tests/acceptance-tests/test_server_shutdown.cpp'
--- tests/acceptance-tests/test_server_shutdown.cpp	2014-11-21 12:16:36 +0000
+++ tests/acceptance-tests/test_server_shutdown.cpp	2014-11-24 02:31:01 +0000
@@ -36,7 +36,7 @@
 }
 }
 
-TEST_F(ServerShutdown, normal_exit_removes_endpoint)
+TEST_F(ServerShutdown, NormalExitRemovesEndpoint)
 {
     run_in_server([]{});
 
@@ -49,7 +49,7 @@
     }
 }
 
-TEST_F(ServerShutdown, abort_removes_endpoint)
+TEST_F(ServerShutdown, AbortRemovesEndpoint)
 {
     mtf::CrossProcessSync sync;
 
@@ -76,7 +76,7 @@
     }
 }
 
-TEST_F(ServerShutdown, fatal_error_abort_causes_abort_on_fatal_error)
+TEST_F(ServerShutdown, FatalErrorAbortCausesAbortOnFatalError)
 {
     // Change the fatal error strategy before starting the Mir server
     mir::FatalErrorStrategy on_error{mir::fatal_error_abort};
@@ -102,7 +102,7 @@
     }
 }
 
-TEST_F(ServerShutdown, fatal_error_abort_removes_endpoint)
+TEST_F(ServerShutdown, FatalErrorAbortRemovesEndpoint)
 {   // Even fatal errors sometimes need to be caught for critical cleanup...
     mir::FatalErrorStrategy on_error{mir::fatal_error_abort};
 
@@ -126,7 +126,7 @@
     };
 }
 
-TEST_F(ServerShutdown, on_fatal_error_abort_option_causes_abort_on_fatal_error)
+TEST_F(ServerShutdown, OnFatalErrorAbortOptionCausesAbortOnFatalError)
 {
     add_to_environment( "MIR_SERVER_ON_FATAL_ERROR_ABORT", "");
 
@@ -151,7 +151,7 @@
     }
 }
 
-TEST_F(ServerShutdown, mir_fatal_error_during_init_removes_endpoint)
+TEST_F(ServerShutdown, MirFatalErrorDuringInitRemovesEndpoint)
 {   // Even fatal errors sometimes need to be caught for critical cleanup...
 
     add_to_environment("MIR_SERVER_FILE", mir_test_socket);
@@ -180,7 +180,7 @@
 
 struct OnSignal : ServerShutdown, ::testing::WithParamInterface<int> {};
 
-TEST_P(OnSignal, removes_endpoint)
+TEST_P(OnSignal, RemovesEndpoint)
 {
     mtf::CrossProcessSync sync;
 

=== modified file 'tests/acceptance-tests/test_server_startup.cpp'
--- tests/acceptance-tests/test_server_startup.cpp	2014-11-21 12:16:36 +0000
+++ tests/acceptance-tests/test_server_startup.cpp	2014-11-24 02:31:01 +0000
@@ -30,7 +30,7 @@
 
 using ServerStartup = mtf::InterprocessClientServerTest;
 
-TEST_F(ServerStartup, creates_endpoint_on_filesystem)
+TEST_F(ServerStartup, CreatesEndpointOnFilesystem)
 {
     ASSERT_FALSE(mtf::detect_server(mtf::test_socket_file(), std::chrono::milliseconds(0)));
 
@@ -43,7 +43,7 @@
         });
 }
 
-TEST_F(ServerStartup, after_server_sigkilled_can_start_new_instance)
+TEST_F(ServerStartup, AfterServerSigkilledCanStartNewInstance)
 {
     ASSERT_FALSE(mtf::detect_server(mtf::test_socket_file(), std::chrono::milliseconds(0)));
 

=== modified file 'tests/acceptance-tests/test_server_without_active_outputs.cpp'
--- tests/acceptance-tests/test_server_without_active_outputs.cpp	2014-07-28 13:16:45 +0000
+++ tests/acceptance-tests/test_server_without_active_outputs.cpp	2014-11-24 02:31:01 +0000
@@ -42,7 +42,7 @@
 
 }
 
-TEST_F(ServerWithoutActiveOutputs, creates_valid_client_surface)
+TEST_F(ServerWithoutActiveOutputs, CreatesValidClientSurface)
 {
     using namespace testing;
 

=== modified file 'tests/acceptance-tests/test_shell_control_of_surface_configuration.cpp'
--- tests/acceptance-tests/test_shell_control_of_surface_configuration.cpp	2014-10-29 06:21:10 +0000
+++ tests/acceptance-tests/test_shell_control_of_surface_configuration.cpp	2014-11-24 02:31:01 +0000
@@ -70,7 +70,7 @@
 
 }
 
-TEST_F(BespokeDisplayServerTestFixture, the_shell_surface_configurator_is_notified_of_attribute_changes)
+TEST_F(BespokeDisplayServerTestFixture, TheShellSurfaceConfiguratorIsNotifiedOfAttributeChanges)
 {
     struct ServerConfiguration : TestingServerConfiguration
     {
@@ -111,7 +111,7 @@
     launch_client_process(client_config);
 }
 
-TEST_F(BespokeDisplayServerTestFixture, the_shell_surface_configurator_may_interfere_with_attribute_changes)
+TEST_F(BespokeDisplayServerTestFixture, TheShellSurfaceConfiguratorMayInterfereWithAttributeChanges)
 {
     struct ServerConfiguration : TestingServerConfiguration
     {

=== modified file 'tests/acceptance-tests/test_surfaces_with_output_id.cpp'
--- tests/acceptance-tests/test_surfaces_with_output_id.cpp	2014-10-29 06:21:10 +0000
+++ tests/acceptance-tests/test_surfaces_with_output_id.cpp	2014-11-24 02:31:01 +0000
@@ -144,7 +144,7 @@
 
 }
 
-TEST_F(SurfacesWithOutputId, fullscreen_surfaces_are_placed_at_top_left_of_correct_output)
+TEST_F(SurfacesWithOutputId, FullscreenSurfacesArePlacedAtTopLeftOfCorrectOutput)
 {
     std::vector<std::shared_ptr<MirSurface>> surfaces;
 
@@ -163,7 +163,7 @@
     EXPECT_EQ(display_rects, surface_rects);
 }
 
-TEST_F(SurfacesWithOutputId, non_fullscreen_surfaces_are_not_accepted)
+TEST_F(SurfacesWithOutputId, NonFullscreenSurfacesAreNotAccepted)
 {
     for (uint32_t n = 0; n < config->num_outputs; ++n)
     {

=== modified file 'tests/acceptance-tests/test_symbols_required_by_mesa.cpp'
--- tests/acceptance-tests/test_symbols_required_by_mesa.cpp	2014-10-29 06:21:10 +0000
+++ tests/acceptance-tests/test_symbols_required_by_mesa.cpp	2014-11-24 02:31:01 +0000
@@ -23,7 +23,7 @@
 
 using namespace testing;
 
-TEST(SymbolsRequiredByMesa, are_exported_by_libmirclientplatform)
+TEST(SymbolsRequiredByMesa, AreExportedByLibmirclientplatform)
 {
     auto const handle = dlopen(MIR_CLIENT_DRIVER_BINARY, RTLD_LAZY);
     ASSERT_THAT(handle, NotNull());
@@ -34,7 +34,7 @@
     dlclose(handle);
 }
 
-TEST(SymbolsRequiredByMesa, are_exported_by_libmirplatformgraphics)
+TEST(SymbolsRequiredByMesa, AreExportedByLibmirplatformgraphics)
 {
     auto const handle = dlopen(MIR_PLATFORM_DRIVER_BINARY, RTLD_LAZY);
     ASSERT_THAT(handle, NotNull());

=== modified file 'tests/acceptance-tests/test_touchspot_visualization.cpp'
--- tests/acceptance-tests/test_touchspot_visualization.cpp	2014-10-29 06:21:10 +0000
+++ tests/acceptance-tests/test_touchspot_visualization.cpp	2014-11-24 02:31:01 +0000
@@ -164,7 +164,7 @@
 
 using namespace ::testing;
 
-TEST_F(TestTouchspotVisualizations, touch_is_given_to_touchspot_visualizer)
+TEST_F(TestTouchspotVisualizations, TouchIsGivenToTouchspotVisualizer)
 {
     auto minimum_touch = mi::android::FakeEventHub::TouchScreenMinAxisValue;
 
@@ -190,7 +190,7 @@
     start_server();
 }
 
-TEST_F(TestTouchspotVisualizations, touchspots_follow_gesture)
+TEST_F(TestTouchspotVisualizations, TouchspotsFollowGesture)
 {
     auto minimum_touch = mi::android::FakeEventHub::TouchScreenMinAxisValue;
     auto maximum_touch = mi::android::FakeEventHub::TouchScreenMaxAxisValue;

=== modified file 'tests/acceptance-tests/test_unresponsive_client.cpp'
--- tests/acceptance-tests/test_unresponsive_client.cpp	2014-11-03 02:35:50 +0000
+++ tests/acceptance-tests/test_unresponsive_client.cpp	2014-11-24 02:31:01 +0000
@@ -59,7 +59,7 @@
 };
 }
 
-TEST_F(UnresponsiveClient, does_not_hang_server)
+TEST_F(UnresponsiveClient, DoesNotHangServer)
 {
     mt::CrossProcessAction server_send_events;
     mt::CrossProcessAction client_connect;

=== modified file 'tests/integration-tests/client/test_screencast.cpp'
--- tests/integration-tests/client/test_screencast.cpp	2014-10-29 06:21:10 +0000
+++ tests/integration-tests/client/test_screencast.cpp	2014-11-24 02:31:01 +0000
@@ -85,7 +85,7 @@
 
 }
 
-TEST_F(MirScreencastTest, gets_buffer_fd_when_creating_screencast)
+TEST_F(MirScreencastTest, GetsBufferFdWhenCreatingScreencast)
 {
     std::vector<char> const cookie{'2','3','l','$'};
 
@@ -123,7 +123,7 @@
     close(read_fd);
 }
 
-TEST_F(MirScreencastTest, gets_buffer_fd_when_getting_screencast_buffer)
+TEST_F(MirScreencastTest, GetsBufferFdWhenGettingScreencastBuffer)
 {
     std::vector<char> const cookie{'X','%','q','S'};
 

=== modified file 'tests/integration-tests/compositor/test_buffer_stream.cpp'
--- tests/integration-tests/compositor/test_buffer_stream.cpp	2014-10-29 06:21:10 +0000
+++ tests/integration-tests/compositor/test_buffer_stream.cpp	2014-11-24 02:31:01 +0000
@@ -122,7 +122,7 @@
 
 }
 
-TEST_F(BufferStreamTest, gives_same_back_buffer_until_more_available)
+TEST_F(BufferStreamTest, GivesSameBackBufferUntilMoreAvailable)
 {
     mg::Buffer* client1 = buffer_stream.acquire_client_buffer_blocking();
     auto client1_id = client1->id();
@@ -153,7 +153,7 @@
     EXPECT_EQ(comp3_id, comp4->id());
 }
 
-TEST_F(BufferStreamTest, gives_all_monitors_the_same_buffer)
+TEST_F(BufferStreamTest, GivesAllMonitorsTheSameBuffer)
 {
     mg::Buffer* client_buffer{nullptr};
     int const prefill = buffers_free_for_client();
@@ -172,7 +172,7 @@
     }
 }
 
-TEST_F(BufferStreamTest, gives_different_back_buffer_asap)
+TEST_F(BufferStreamTest, GivesDifferentBackBufferAsap)
 {
     buffer_stream.release_client_buffer(buffer_stream.acquire_client_buffer_blocking());
     auto comp1 = buffer_stream.lock_compositor_buffer(nullptr);
@@ -186,7 +186,7 @@
     comp2.reset();
 }
 
-TEST_F(BufferStreamTest, resize_affects_client_buffers_immediately)
+TEST_F(BufferStreamTest, ResizeAffectsClientBuffersImmediately)
 {
     auto old_size = buffer_stream.stream_size();
 
@@ -220,7 +220,7 @@
     buffer_stream.release_client_buffer(client);
 }
 
-TEST_F(BufferStreamTest, compositor_gets_resized_buffers)
+TEST_F(BufferStreamTest, CompositorGetsResizedBuffers)
 {
     auto old_size = buffer_stream.stream_size();
 
@@ -279,7 +279,7 @@
     comp5.reset();
 }
 
-TEST_F(BufferStreamTest, can_get_partly_released_back_buffer)
+TEST_F(BufferStreamTest, CanGetPartlyReleasedBackBuffer)
 {
     mg::Buffer* client = buffer_stream.acquire_client_buffer_blocking();
     buffer_stream.release_client_buffer(client);
@@ -343,7 +343,7 @@
 
 }
 
-TEST_F(BufferStreamTest, stress_test_distinct_buffers)
+TEST_F(BufferStreamTest, StressTestDistinctBuffers)
 {
     // More would be good, but armhf takes too long
     const int num_snapshotters{2};
@@ -381,7 +381,7 @@
         s->join();
 }
 
-TEST_F(BufferStreamTest, blocked_client_is_released_on_timeout)
+TEST_F(BufferStreamTest, BlockedClientIsReleasedOnTimeout)
 {
     using namespace testing;
 

=== modified file 'tests/integration-tests/compositor/test_swapping_swappers.cpp'
--- tests/integration-tests/compositor/test_swapping_swappers.cpp	2014-10-29 06:21:10 +0000
+++ tests/integration-tests/compositor/test_swapping_swappers.cpp	2014-11-24 02:31:01 +0000
@@ -82,7 +82,7 @@
 
 } // namespace
 
-TEST_F(SwapperSwappingStress, swapper)
+TEST_F(SwapperSwappingStress, Swapper)
 {
     std::atomic_bool done(false);
 
@@ -126,7 +126,7 @@
     h.wait();
 }
 
-TEST_F(SwapperSwappingStress, different_swapper_types)
+TEST_F(SwapperSwappingStress, DifferentSwapperTypes)
 {
     std::atomic_bool done(false);
 

=== modified file 'tests/integration-tests/compositor/test_synchronizer.cpp'
--- tests/integration-tests/compositor/test_synchronizer.cpp	2013-02-05 18:21:20 +0000
+++ tests/integration-tests/compositor/test_synchronizer.cpp	2014-11-24 02:31:01 +0000
@@ -33,7 +33,7 @@
 }
 }
 
-TEST(Synchronizer, thread_stop_start)
+TEST(Synchronizer, ThreadStopStart)
 {
     int data = 0;
 
@@ -69,7 +69,7 @@
 }
 }
 
-TEST(Synchronizer, thread_pause_req)
+TEST(Synchronizer, ThreadPauseReq)
 {
     int data = 0, old_data = 0;
 

=== modified file 'tests/integration-tests/frontend/test_session_mediator_report.cpp'
--- tests/integration-tests/frontend/test_session_mediator_report.cpp	2014-10-29 06:21:10 +0000
+++ tests/integration-tests/frontend/test_session_mediator_report.cpp	2014-11-24 02:31:01 +0000
@@ -55,7 +55,7 @@
 typedef BespokeDisplayServerTestFixture SessionMediatorReport;
 }
 
-TEST_F(SessionMediatorReport, session_connect_called)
+TEST_F(SessionMediatorReport, SessionConnectCalled)
 {
     struct Server : TestingServerConfiguration
     {
@@ -99,7 +99,7 @@
     launch_client_process(client_process);
 }
 
-TEST_F(SessionMediatorReport, session_create_surface_called)
+TEST_F(SessionMediatorReport, SessionCreateSurfaceCalled)
 {
     struct Server : TestingServerConfiguration
     {
@@ -154,7 +154,7 @@
     launch_client_process(client_process);
 }
 
-TEST_F(SessionMediatorReport, session_next_buffer_called)
+TEST_F(SessionMediatorReport, SessionNextBufferCalled)
 {
     struct Server : TestingServerConfiguration
     {
@@ -211,7 +211,7 @@
     launch_client_process(client_process);
 }
 
-TEST_F(SessionMediatorReport, session_exchange_buffer_called)
+TEST_F(SessionMediatorReport, SessionExchangeBufferCalled)
 {
     struct Server : TestingServerConfiguration
     {
@@ -272,7 +272,7 @@
     launch_client_process(client_process);
 }
 
-TEST_F(SessionMediatorReport, session_release_surface_called)
+TEST_F(SessionMediatorReport, SessionReleaseSurfaceCalled)
 {
     struct Server : TestingServerConfiguration
     {
@@ -342,7 +342,7 @@
     launch_client_process(client_process);
 }
 
-TEST_F(SessionMediatorReport, session_disconnect_called)
+TEST_F(SessionMediatorReport, SessionDisconnectCalled)
 {
     struct Server : TestingServerConfiguration
     {
@@ -422,7 +422,7 @@
     launch_client_process(client_process);
 }
 
-TEST_F(SessionMediatorReport, prompt_session_start_called)
+TEST_F(SessionMediatorReport, PromptSessionStartCalled)
 {
     struct Server : TestingServerConfiguration
     {
@@ -474,7 +474,7 @@
     launch_client_process(client_process);
 }
 
-TEST_F(SessionMediatorReport, prompt_session_stop_called)
+TEST_F(SessionMediatorReport, PromptSessionStopCalled)
 {
     struct Server : TestingServerConfiguration
     {

=== modified file 'tests/integration-tests/graphics/android/test_buffer_integration.cpp'
--- tests/integration-tests/graphics/android/test_buffer_integration.cpp	2014-11-21 12:16:36 +0000
+++ tests/integration-tests/graphics/android/test_buffer_integration.cpp	2014-11-24 02:31:01 +0000
@@ -79,7 +79,7 @@
 }
 }
 
-TEST_F(AndroidBufferIntegration, allocator_can_create_sw_buffer)
+TEST_F(AndroidBufferIntegration, AllocatorCanCreateSwBuffer)
 {
     using namespace testing;
 
@@ -95,7 +95,7 @@
     EXPECT_TRUE(red_pattern.check(*region));
 }
 
-TEST_F(AndroidBufferIntegration, allocator_can_create_hw_buffer)
+TEST_F(AndroidBufferIntegration, AllocatorCanCreateHwBuffer)
 {
     using namespace testing;
 
@@ -107,7 +107,7 @@
     EXPECT_NE(nullptr, test_buffer);
 }
 
-TEST_F(AndroidBufferIntegration, swapper_creation_is_sane)
+TEST_F(AndroidBufferIntegration, SwapperCreationIsSane)
 {
     using namespace testing;
 

=== modified file 'tests/integration-tests/graphics/android/test_client_render.cpp'
--- tests/integration-tests/graphics/android/test_client_render.cpp	2014-11-21 12:16:36 +0000
+++ tests/integration-tests/graphics/android/test_client_render.cpp	2014-11-24 02:31:01 +0000
@@ -361,7 +361,7 @@
 mtf::CrossProcessSync TestClientIPCRender::sync4;
 std::shared_ptr<mtf::Process> TestClientIPCRender::render_accelerated_process_double;
 
-TEST_F(TestClientIPCRender, test_render_single)
+TEST_F(TestClientIPCRender, TestRenderSingle)
 {
     sync1.try_signal_ready_for();
 
@@ -374,7 +374,7 @@
     EXPECT_TRUE(draw_pattern0.check(*region));
 }
 
-TEST_F(TestClientIPCRender, test_render_double)
+TEST_F(TestClientIPCRender, TestRenderDouble)
 {
     sync2.try_signal_ready_for();
 
@@ -390,7 +390,7 @@
     EXPECT_TRUE(draw_pattern1.check(*region1));
 }
 
-TEST_F(TestClientIPCRender, test_accelerated_render)
+TEST_F(TestClientIPCRender, TestAcceleratedRender)
 {
     mt::DrawPatternSolid red_pattern(0xFF0000FF);
 
@@ -404,7 +404,7 @@
     EXPECT_TRUE(red_pattern.check(*region0));
 }
 
-TEST_F(TestClientIPCRender, test_accelerated_render_double)
+TEST_F(TestClientIPCRender, TestAcceleratedRenderDouble)
 {
     mt::DrawPatternSolid red_pattern(0xFF0000FF);
     mt::DrawPatternSolid green_pattern(0xFF00FF00);

=== modified file 'tests/integration-tests/graphics/android/test_display_integration.cpp'
--- tests/integration-tests/graphics/android/test_display_integration.cpp	2014-10-29 06:21:10 +0000
+++ tests/integration-tests/graphics/android/test_display_integration.cpp	2014-11-24 02:31:01 +0000
@@ -79,7 +79,7 @@
 };
 }
 
-TEST_F(AndroidDisplay, display_can_post)
+TEST_F(AndroidDisplay, DisplayCanPost)
 {
     display->for_each_display_buffer([](mg::DisplayBuffer& buffer)
     {
@@ -95,7 +95,7 @@
     });
 }
 
-TEST_F(AndroidDisplay, display_can_post_overlay)
+TEST_F(AndroidDisplay, DisplayCanPostOverlay)
 {
     display->for_each_display_buffer([](mg::DisplayBuffer& db)
     {

=== modified file 'tests/integration-tests/graphics/android/test_internal_client.cpp'
--- tests/integration-tests/graphics/android/test_internal_client.cpp	2014-10-29 06:21:10 +0000
+++ tests/integration-tests/graphics/android/test_internal_client.cpp	2014-11-24 02:31:01 +0000
@@ -87,7 +87,7 @@
 };
 }
 
-TEST_F(AndroidInternalClient, internal_client_creation_and_use)
+TEST_F(AndroidInternalClient, InternalClientCreationAndUse)
 {
     auto size = geom::Size{334, 122};
     auto pf  = mir_pixel_format_abgr_8888;

=== modified file 'tests/integration-tests/graphics/mesa/test_buffer_integration.cpp'
--- tests/integration-tests/graphics/mesa/test_buffer_integration.cpp	2014-10-29 06:21:10 +0000
+++ tests/integration-tests/graphics/mesa/test_buffer_integration.cpp	2014-11-24 02:31:01 +0000
@@ -193,7 +193,7 @@
     bool exception_thrown;
 };
 
-TEST_F(MesaBufferIntegration, buffer_creation_from_arbitrary_thread_works)
+TEST_F(MesaBufferIntegration, BufferCreationFromArbitraryThreadWorks)
 {
     using namespace testing;
 
@@ -205,7 +205,7 @@
     });
 }
 
-TEST_F(MesaBufferIntegration, buffer_destruction_from_arbitrary_thread_works)
+TEST_F(MesaBufferIntegration, BufferDestructionFromArbitraryThreadWorks)
 {
     using namespace testing;
 
@@ -220,7 +220,7 @@
     });
 }
 
-TEST_F(MesaBufferIntegration, buffer_lazy_texture_instantiation_from_arbitrary_thread_fails)
+TEST_F(MesaBufferIntegration, BufferLazyTextureInstantiationFromArbitraryThreadFails)
 {
     using namespace testing;
 

=== modified file 'tests/integration-tests/input/android/test_android_cursor_listener.cpp'
--- tests/integration-tests/input/android/test_android_cursor_listener.cpp	2014-10-29 06:21:10 +0000
+++ tests/integration-tests/input/android/test_android_cursor_listener.cpp	2014-11-24 02:31:01 +0000
@@ -95,7 +95,7 @@
 
 }
 
-TEST_F(AndroidCursorListenerIntegrationTest, cursor_listener_receives_motion)
+TEST_F(AndroidCursorListenerIntegrationTest, CursorListenerReceivesMotion)
 {
     using namespace ::testing;
 

=== modified file 'tests/integration-tests/input/android/test_android_input_manager.cpp'
--- tests/integration-tests/input/android/test_android_input_manager.cpp	2014-10-29 06:21:10 +0000
+++ tests/integration-tests/input/android/test_android_input_manager.cpp	2014-11-24 02:31:01 +0000
@@ -91,7 +91,7 @@
 
 }
 
-TEST_F(AndroidInputManagerAndEventFilterDispatcherSetup, manager_dispatches_key_events_to_filter)
+TEST_F(AndroidInputManagerAndEventFilterDispatcherSetup, ManagerDispatchesKeyEventsToFilter)
 {
     using namespace ::testing;
 
@@ -109,7 +109,7 @@
     wait_condition.wait_for_at_most_seconds(1);
 }
 
-TEST_F(AndroidInputManagerAndEventFilterDispatcherSetup, manager_dispatches_button_down_events_to_filter)
+TEST_F(AndroidInputManagerAndEventFilterDispatcherSetup, ManagerDispatchesButtonDownEventsToFilter)
 {
     using namespace ::testing;
 
@@ -127,7 +127,7 @@
     wait_condition.wait_for_at_most_seconds(1);
 }
 
-TEST_F(AndroidInputManagerAndEventFilterDispatcherSetup, manager_dispatches_button_up_events_to_filter)
+TEST_F(AndroidInputManagerAndEventFilterDispatcherSetup, ManagerDispatchesButtonUpEventsToFilter)
 {
     using namespace ::testing;
 
@@ -158,7 +158,7 @@
     wait_condition.wait_for_at_most_seconds(1);
 }
 
-TEST_F(AndroidInputManagerAndEventFilterDispatcherSetup, manager_dispatches_motion_events_to_filter)
+TEST_F(AndroidInputManagerAndEventFilterDispatcherSetup, ManagerDispatchesMotionEventsToFilter)
 {
     using namespace ::testing;
 
@@ -266,7 +266,7 @@
 
 }
 
-TEST_F(AndroidInputManagerDispatcherInterceptSetup, server_input_fd_of_focused_channel_is_sent_unfiltered_key_events)
+TEST_F(AndroidInputManagerDispatcherInterceptSetup, ServerInputFdOfFocusedChannelIsSentUnfilteredKeyEvents)
 {
     using namespace ::testing;
 
@@ -288,7 +288,7 @@
     wait_condition.wait_for_at_most_seconds(1);
 }
 
-TEST_F(AndroidInputManagerDispatcherInterceptSetup, changing_focus_changes_event_recipient)
+TEST_F(AndroidInputManagerDispatcherInterceptSetup, ChangingFocusChangesEventRecipient)
 {
     using namespace ::testing;
 

=== modified file 'tests/integration-tests/input/test_configuring_input_manager.cpp'
--- tests/integration-tests/input/test_configuring_input_manager.cpp	2013-04-24 05:22:20 +0000
+++ tests/integration-tests/input/test_configuring_input_manager.cpp	2014-11-24 02:31:01 +0000
@@ -28,7 +28,7 @@
 
 #include <stdio.h>
 
-TEST_F(BespokeDisplayServerTestFixture, starting_display_server_starts_input_manager)
+TEST_F(BespokeDisplayServerTestFixture, StartingDisplayServerStartsInputManager)
 {
     struct ServerConfig : TestingServerConfiguration
     {

=== modified file 'tests/integration-tests/input/test_nested_input.cpp'
--- tests/integration-tests/input/test_nested_input.cpp	2014-10-29 06:21:10 +0000
+++ tests/integration-tests/input/test_nested_input.cpp	2014-11-24 02:31:01 +0000
@@ -42,7 +42,7 @@
 namespace mt = mir::test;
 namespace mtd = mir::test::doubles;
 
-TEST(NestedInputTest, applies_event_filter_on_relayed_event)
+TEST(NestedInputTest, AppliesEventFilterOnRelayedEvent)
 {
     using namespace testing;
 

=== modified file 'tests/integration-tests/session_management.cpp'
--- tests/integration-tests/session_management.cpp	2014-10-29 06:21:10 +0000
+++ tests/integration-tests/session_management.cpp	2014-11-24 02:31:01 +0000
@@ -115,7 +115,7 @@
 }
 }
 
-TEST_F(SessionManagement, creating_a_surface_adds_it_to_scene)
+TEST_F(SessionManagement, CreatingASurfaceAddsItToScene)
 {
     auto const session = session_manager->open_session(0, __PRETTY_FUNCTION__, event_sink);
 
@@ -123,7 +123,7 @@
     session->create_surface(params);
 }
 
-TEST_F(SessionManagement, focus_on_a_session_raises_its_surface)
+TEST_F(SessionManagement, FocusOnASessionRaisesItsSurface)
 {
     EXPECT_CALL(*test_surface_stack, add_surface(_,_,_)).Times(AnyNumber());
 

=== modified file 'tests/integration-tests/shell/test_session_lifecycle_event.cpp'
--- tests/integration-tests/shell/test_session_lifecycle_event.cpp	2014-10-29 06:21:10 +0000
+++ tests/integration-tests/shell/test_session_lifecycle_event.cpp	2014-11-24 02:31:01 +0000
@@ -73,7 +73,7 @@
 
 }
 
-TEST_F(LifecycleEventTest, lifecycle_event_test)
+TEST_F(LifecycleEventTest, LifecycleEventTest)
 {
     using namespace ::testing;
 

=== modified file 'tests/integration-tests/surface_composition.cpp'
--- tests/integration-tests/surface_composition.cpp	2014-10-02 11:56:12 +0000
+++ tests/integration-tests/surface_composition.cpp	2014-11-24 02:31:01 +0000
@@ -102,7 +102,7 @@
 }
 
 // Presumptive cause of lp:1376324
-TEST_F(SurfaceComposition, does_not_send_client_buffers_to_dead_surfaces)
+TEST_F(SurfaceComposition, DoesNotSendClientBuffersToDeadSurfaces)
 {
     auto surface = create_surface();
 

=== modified file 'tests/integration-tests/test_client_surface_swap_buffers.cpp'
--- tests/integration-tests/test_client_surface_swap_buffers.cpp	2014-10-29 06:21:10 +0000
+++ tests/integration-tests/test_client_surface_swap_buffers.cpp	2014-11-24 02:31:01 +0000
@@ -52,7 +52,7 @@
 //
 //}
 //
-//TEST_F(MirSurfaceSwapBuffersTest, swap_buffers_does_not_block_when_surface_is_not_composited)
+//TEST_F(MirSurfaceSwapBuffersTest, Swap_buffers_does_not_block_when_surface_is_not_composited)
 //{
 //    using namespace testing;
 //

=== modified file 'tests/integration-tests/test_display_info.cpp'
--- tests/integration-tests/test_display_info.cpp	2014-10-29 06:21:10 +0000
+++ tests/integration-tests/test_display_info.cpp	2014-11-24 02:31:01 +0000
@@ -132,7 +132,7 @@
 
 using AvailableSurfaceFormatsTest = BespokeDisplayServerTestFixture;
 
-TEST_F(AvailableSurfaceFormatsTest, surface_pixel_formats_reach_client)
+TEST_F(AvailableSurfaceFormatsTest, SurfacePixelFormatsReachClient)
 {
     struct ServerConfig : TestingServerConfiguration
     {

=== modified file 'tests/integration-tests/test_display_server_main_loop_events.cpp'
--- tests/integration-tests/test_display_server_main_loop_events.cpp	2014-11-05 03:25:04 +0000
+++ tests/integration-tests/test_display_server_main_loop_events.cpp	2014-11-24 02:31:01 +0000
@@ -349,7 +349,7 @@
 
 }
 
-TEST(DisplayServerMainLoopEvents, display_server_shuts_down_properly_on_sigint)
+TEST(DisplayServerMainLoopEvents, DisplayServerShutsDownProperlyOnSigint)
 {
     ServerConfig server_config;
 
@@ -360,7 +360,7 @@
                  });
 }
 
-TEST(DisplayServerMainLoopEvents, display_server_shuts_down_properly_on_sigterm)
+TEST(DisplayServerMainLoopEvents, DisplayServerShutsDownProperlyOnSigterm)
 {
     ServerConfig server_config;
 
@@ -371,7 +371,7 @@
                  });
 }
 
-TEST(DisplayServerMainLoopEvents, display_server_components_pause_and_resume)
+TEST(DisplayServerMainLoopEvents, DisplayServerComponentsPauseAndResume)
 {
     using namespace testing;
 
@@ -427,7 +427,7 @@
                  });
 }
 
-TEST(DisplayServerMainLoopEvents, display_server_quits_when_paused)
+TEST(DisplayServerMainLoopEvents, DisplayServerQuitsWhenPaused)
 {
     using namespace testing;
 
@@ -475,7 +475,7 @@
                  });
 }
 
-TEST(DisplayServerMainLoopEvents, display_server_attempts_to_continue_on_pause_failure)
+TEST(DisplayServerMainLoopEvents, DisplayServerAttemptsToContinueOnPauseFailure)
 {
     using namespace testing;
 
@@ -530,7 +530,7 @@
                  });
 }
 
-TEST(DisplayServerMainLoopEvents, display_server_handles_configuration_change)
+TEST(DisplayServerMainLoopEvents, DisplayServerHandlesConfigurationChange)
 {
     using namespace testing;
 
@@ -577,7 +577,7 @@
                  });
 }
 
-TEST(DisplayServerMainLoopEvents, postpones_configuration_when_paused)
+TEST(DisplayServerMainLoopEvents, PostponesConfigurationWhenPaused)
 {
     using namespace testing;
 
@@ -641,7 +641,7 @@
                  });
 }
 
-TEST(DisplayServerMainLoopEvents, server_status_listener)
+TEST(DisplayServerMainLoopEvents, ServerStatusListener)
 {
     using namespace testing;
 

=== modified file 'tests/integration-tests/test_drm_auth_magic.cpp'
--- tests/integration-tests/test_drm_auth_magic.cpp	2014-11-18 03:21:20 +0000
+++ tests/integration-tests/test_drm_auth_magic.cpp	2014-11-24 02:31:01 +0000
@@ -88,7 +88,7 @@
 
 }
 
-TEST_F(BespokeDisplayServerTestFixture, client_drm_auth_magic_calls_platform)
+TEST_F(BespokeDisplayServerTestFixture, ClientDrmAuthMagicCallsPlatform)
 {
     unsigned int const magic{0x10111213};
 
@@ -142,7 +142,7 @@
     launch_client_process(client_config);
 }
 
-TEST_F(BespokeDisplayServerTestFixture, drm_auth_magic_platform_error_reaches_client)
+TEST_F(BespokeDisplayServerTestFixture, DrmAuthMagicPlatformErrorReachesClient)
 {
     unsigned int const magic{0x10111213};
     static int const auth_magic_error{667};

=== modified file 'tests/integration-tests/test_error_reporting.cpp'
--- tests/integration-tests/test_error_reporting.cpp	2014-11-12 07:07:06 +0000
+++ tests/integration-tests/test_error_reporting.cpp	2014-11-24 02:31:01 +0000
@@ -174,7 +174,7 @@
 
 using ErrorReporting = BespokeDisplayServerTestFixture;
 
-TEST_F(ErrorReporting, c_api_returns_connection_error)
+TEST_F(ErrorReporting, CApiReturnsConnectionError)
 {
 
     struct ServerConfig : TestingServerConfiguration
@@ -208,7 +208,7 @@
     launch_client_process(client_config);
 }
 
-TEST_F(ErrorReporting, c_api_returns_surface_creation_error)
+TEST_F(ErrorReporting, CApiReturnsSurfaceCreationError)
 {
 
     struct ServerConfig : TestingServerConfiguration

=== modified file 'tests/integration-tests/test_exchange_buffer.cpp'
--- tests/integration-tests/test_exchange_buffer.cpp	2014-11-16 07:44:33 +0000
+++ tests/integration-tests/test_exchange_buffer.cpp	2014-11-24 02:31:01 +0000
@@ -242,7 +242,7 @@
 };
 }
 
-TEST_F(ExchangeBufferTest, exchanges_happen)
+TEST_F(ExchangeBufferTest, ExchangesHappen)
 {
     auto connection = mir_connect_sync(new_connection().c_str(), __PRETTY_FUNCTION__);
     MirSurfaceParameters const request_params =
@@ -278,7 +278,7 @@
     return arg > 0;
 }
 }
-TEST_F(ExchangeBufferTest, fds_can_be_sent_back)
+TEST_F(ExchangeBufferTest, FdsCanBeSentBack)
 {
     using namespace testing;
     std::string test_string{"mir was a space station"};

=== modified file 'tests/integration-tests/test_macros.cpp'
--- tests/integration-tests/test_macros.cpp	2014-11-18 03:21:20 +0000
+++ tests/integration-tests/test_macros.cpp	2014-11-24 02:31:01 +0000
@@ -19,7 +19,7 @@
 #include "cutils/log.h"  // Get the final value of LOG_NDEBUG
 #include <gtest/gtest.h>
 
-TEST(Macros, android_verbose_logging_is_disabled)
+TEST(Macros, AndroidVerboseLoggingIsDisabled)
 {
     // Ensure verbose logging (ALOGV) is removed. It requires significant
     // CPU time to constantly format some verbose messages...

=== modified file 'tests/integration-tests/test_protobuf.cpp'
--- tests/integration-tests/test_protobuf.cpp	2014-10-29 06:21:10 +0000
+++ tests/integration-tests/test_protobuf.cpp	2014-11-24 02:31:01 +0000
@@ -183,7 +183,7 @@
 char const* const nothing_returned = "Nothing returned";
 }
 
-TEST_F(DemoPrivateProtobuf, client_calls_server)
+TEST_F(DemoPrivateProtobuf, ClientCallsServer)
 {
     using namespace testing;
     EXPECT_CALL(*demo_connection_creator, create_processor(_, _, _));
@@ -230,7 +230,7 @@
     EXPECT_THAT(result.error(), Eq(nothing_returned));
 }
 
-TEST_F(DemoPrivateProtobuf, wrapping_message_processor)
+TEST_F(DemoPrivateProtobuf, WrappingMessageProcessor)
 {
     using namespace testing;
     EXPECT_CALL(*demo_connection_creator, create_processor(_, _, _))
@@ -242,7 +242,7 @@
     mir_connection_release(connection);
 }
 
-TEST_F(DemoPrivateProtobuf, server_receives_function_call)
+TEST_F(DemoPrivateProtobuf, ServerReceivesFunctionCall)
 {
     using namespace testing;
     EXPECT_CALL(*demo_connection_creator, create_processor(_, _, _))
@@ -270,7 +270,7 @@
 }
 
 
-TEST_F(DemoPrivateProtobuf, client_receives_result)
+TEST_F(DemoPrivateProtobuf, ClientReceivesResult)
 {
     using namespace testing;
     EXPECT_CALL(*demo_connection_creator, create_processor(_, _, _))

=== modified file 'tests/integration-tests/test_server_client_types.cpp'
--- tests/integration-tests/test_server_client_types.cpp	2013-09-04 19:01:36 +0000
+++ tests/integration-tests/test_server_client_types.cpp	2014-11-24 02:31:01 +0000
@@ -27,7 +27,7 @@
     EXPECT_EQ(static_cast<mg::DisplayConfigurationOutputType>(mir_display_output_type_##TYPE), \
               mg::DisplayConfigurationOutputType::TYPE)
 
-TEST(ServerClientTypes, display_output_types_match)
+TEST(ServerClientTypes, DisplayOutputTypesMatch)
 {
     EXPECT_DISPLAY_OUTPUT_TYPES_MATCH(unknown);
     EXPECT_DISPLAY_OUTPUT_TYPES_MATCH(vga);

=== modified file 'tests/integration-tests/test_server_shutdown.cpp'
--- tests/integration-tests/test_server_shutdown.cpp	2014-10-29 06:21:10 +0000
+++ tests/integration-tests/test_server_shutdown.cpp	2014-11-24 02:31:01 +0000
@@ -159,7 +159,7 @@
 
 using ServerShutdown = BespokeDisplayServerTestFixture;
 
-TEST_F(ServerShutdown, server_can_shut_down_when_clients_are_blocked)
+TEST_F(ServerShutdown, ServerCanShutDownWhenClientsAreBlocked)
 {
     Flag next_buffer_done1{"next_buffer_done1_c5d49978.tmp"};
     Flag next_buffer_done2{"next_buffer_done2_c5d49978.tmp"};
@@ -285,7 +285,7 @@
     EXPECT_EQ(0, input_manager.use_count());
 }
 
-TEST_F(ServerShutdown, server_releases_resources_on_shutdown_with_connected_clients)
+TEST_F(ServerShutdown, ServerReleasesResourcesOnShutdownWithConnectedClients)
 {
     Flag surface_created1{"surface_created1_7e9c69fc.tmp"};
     Flag surface_created2{"surface_created2_7e9c69fc.tmp"};

=== modified file 'tests/integration-tests/test_session.cpp'
--- tests/integration-tests/test_session.cpp	2014-10-29 06:21:10 +0000
+++ tests/integration-tests/test_session.cpp	2014-11-24 02:31:01 +0000
@@ -128,7 +128,7 @@
 
 }
 
-TEST(ApplicationSession, stress_test_take_snapshot)
+TEST(ApplicationSession, StressTestTakeSnapshot)
 {
     TestServerConfiguration conf;
 

=== modified file 'tests/integration-tests/test_session_manager.cpp'
--- tests/integration-tests/test_session_manager.cpp	2014-10-29 06:21:10 +0000
+++ tests/integration-tests/test_session_manager.cpp	2014-11-24 02:31:01 +0000
@@ -72,7 +72,7 @@
 
 }
 
-TEST_F(TestSessionManagerAndFocusSelectionStrategy, cycle_focus)
+TEST_F(TestSessionManagerAndFocusSelectionStrategy, CycleFocus)
 {
     using namespace ::testing;
 
@@ -101,7 +101,7 @@
     EXPECT_CALL(focus_setter, set_focus_to(_)).Times(AtLeast(0));
 }
 
-TEST_F(TestSessionManagerAndFocusSelectionStrategy, closing_applications_transfers_focus)
+TEST_F(TestSessionManagerAndFocusSelectionStrategy, ClosingApplicationsTransfersFocus)
 {
     using namespace ::testing;
 

=== modified file 'tests/integration-tests/test_stale_frames.cpp'
--- tests/integration-tests/test_stale_frames.cpp	2014-11-12 07:07:06 +0000
+++ tests/integration-tests/test_stale_frames.cpp	2014-11-24 02:31:01 +0000
@@ -183,7 +183,7 @@
 
 }
 
-TEST_F(StaleFrames, are_dropped_when_restarting_compositor)
+TEST_F(StaleFrames, AreDroppedWhenRestartingCompositor)
 {
     using namespace testing;
 
@@ -212,7 +212,7 @@
     EXPECT_THAT(stale_buffers, Not(Contains(new_buffers[0])));
 }
 
-TEST_F(StaleFrames, only_fresh_frames_are_used_after_restarting_compositor)
+TEST_F(StaleFrames, OnlyFreshFramesAreUsedAfterRestartingCompositor)
 {
     using namespace testing;
 

=== modified file 'tests/integration-tests/test_surface_first_frame_sync.cpp'
--- tests/integration-tests/test_surface_first_frame_sync.cpp	2014-10-29 06:21:10 +0000
+++ tests/integration-tests/test_surface_first_frame_sync.cpp	2014-11-24 02:31:01 +0000
@@ -136,7 +136,7 @@
 
 using SurfaceFirstFrameSync = BespokeDisplayServerTestFixture;
 
-TEST_F(SurfaceFirstFrameSync, surface_not_rendered_until_buffer_is_pushed)
+TEST_F(SurfaceFirstFrameSync, SurfaceNotRenderedUntilBufferIsPushed)
 {
     static std::string const surface_created{"surface_created_0950f3f9.tmp"};
     static std::string const do_next_buffer{"do_next_buffer_0950f3f9.tmp"};

=== modified file 'tests/integration-tests/test_surface_stack_with_compositor.cpp'
--- tests/integration-tests/test_surface_stack_with_compositor.cpp	2014-10-29 06:21:10 +0000
+++ tests/integration-tests/test_surface_stack_with_compositor.cpp	2014-11-24 02:31:01 +0000
@@ -160,7 +160,7 @@
 };
 }
 
-TEST_F(SurfaceStackCompositor, composes_on_start_if_told_to_in_constructor)
+TEST_F(SurfaceStackCompositor, ComposesOnStartIfToldToInConstructor)
 {
     mc::MultiThreadedCompositor mt_compositor(
         mt::fake_shared(stub_display),
@@ -173,7 +173,7 @@
     EXPECT_TRUE(stub_secondary_db.has_posted_at_least(1, timeout));
 }
 
-TEST_F(SurfaceStackCompositor, does_not_composes_on_start_if_told_not_to_in_constructor)
+TEST_F(SurfaceStackCompositor, DoesNotComposesOnStartIfToldNotToInConstructor)
 {
     mc::MultiThreadedCompositor mt_compositor(
         mt::fake_shared(stub_display),
@@ -186,7 +186,7 @@
     EXPECT_TRUE(stub_secondary_db.has_posted_at_least(0, timeout));
 }
 
-TEST_F(SurfaceStackCompositor, adding_a_surface_that_has_been_swapped_triggers_a_composition)
+TEST_F(SurfaceStackCompositor, AddingASurfaceThatHasBeenSwappedTriggersAComposition)
 {
     mc::MultiThreadedCompositor mt_compositor(
         mt::fake_shared(stub_display),
@@ -203,7 +203,7 @@
 }
 
 //test associated with lp:1290306, 1293896, 1294048, 1294051, 1294053
-TEST_F(SurfaceStackCompositor, compositor_runs_until_all_surfaces_buffers_are_consumed)
+TEST_F(SurfaceStackCompositor, CompositorRunsUntilAllSurfacesBuffersAreConsumed)
 {
     using namespace testing;
     ON_CALL(*mock_buffer_stream, buffers_ready_for_compositor())
@@ -223,7 +223,7 @@
     EXPECT_TRUE(stub_secondary_db.has_posted_at_least(5, timeout));
 }
 
-TEST_F(SurfaceStackCompositor, bypassed_compositor_runs_until_all_surfaces_buffers_are_consumed)
+TEST_F(SurfaceStackCompositor, BypassedCompositorRunsUntilAllSurfacesBuffersAreConsumed)
 {
     using namespace testing;
     ON_CALL(*mock_buffer_stream, buffers_ready_for_compositor())
@@ -245,7 +245,7 @@
     EXPECT_TRUE(stub_secondary_db.has_posted_at_least(5, timeout));
 }
 
-TEST_F(SurfaceStackCompositor, an_empty_scene_retriggers)
+TEST_F(SurfaceStackCompositor, AnEmptySceneRetriggers)
 {
     using namespace testing;
     ON_CALL(*mock_buffer_stream, buffers_ready_for_compositor())
@@ -270,7 +270,7 @@
     EXPECT_TRUE(stub_secondary_db.has_posted_at_least(2, timeout));
 }
 
-TEST_F(SurfaceStackCompositor, moving_a_surface_triggers_composition)
+TEST_F(SurfaceStackCompositor, MovingASurfaceTriggersComposition)
 {
     stub_surface->swap_buffers(&stubbuf, [](mg::Buffer*){});
     stack.add_surface(stub_surface, default_params.depth, default_params.input_mode);
@@ -288,7 +288,7 @@
     EXPECT_TRUE(stub_secondary_db.has_posted_at_least(1, timeout));
 }
 
-TEST_F(SurfaceStackCompositor, removing_a_surface_triggers_composition)
+TEST_F(SurfaceStackCompositor, RemovingASurfaceTriggersComposition)
 {
     stub_surface->swap_buffers(&stubbuf, [](mg::Buffer*){});
     stack.add_surface(stub_surface, default_params.depth, default_params.input_mode);
@@ -306,7 +306,7 @@
     EXPECT_TRUE(stub_secondary_db.has_posted_at_least(1, timeout));
 }
 
-TEST_F(SurfaceStackCompositor, buffer_updates_trigger_composition)
+TEST_F(SurfaceStackCompositor, BufferUpdatesTriggerComposition)
 {
     ON_CALL(*mock_buffer_stream, buffers_ready_for_compositor())
         .WillByDefault(testing::Return(1));

=== modified file 'tests/integration-tests/test_surfaceloop.cpp'
--- tests/integration-tests/test_surfaceloop.cpp	2014-10-29 06:21:10 +0000
+++ tests/integration-tests/test_surfaceloop.cpp	2014-11-24 02:31:01 +0000
@@ -242,7 +242,7 @@
     }
 };
 
-TEST_F(SurfaceLoop, all_created_buffers_are_destroyed)
+TEST_F(SurfaceLoop, AllCreatedBuffersAreDestroyed)
 {
     for (int i = 0; i != max_surface_count; ++i)
         mir_connection_create_surface(connection, &request_params, create_surface_callback, ssync+i);
@@ -257,7 +257,7 @@
         wait_for_surface_release(ssync+i);
 }
 
-TEST_F(SurfaceLoop, all_created_buffers_are_destroyed_if_client_disconnects_without_releasing_surfaces)
+TEST_F(SurfaceLoop, AllCreatedBuffersAreDestroyedIfClientDisconnectsWithoutReleasingSurfaces)
 {
     for (int i = 0; i != max_surface_count; ++i)
         mir_connection_create_surface(connection, &request_params, create_surface_callback, ssync+i);

=== modified file 'tests/integration-tests/test_swapinterval.cpp'
--- tests/integration-tests/test_swapinterval.cpp	2014-10-29 06:21:10 +0000
+++ tests/integration-tests/test_swapinterval.cpp	2014-11-24 02:31:01 +0000
@@ -94,7 +94,7 @@
 }
 
 using SwapIntervalSignalTest = BespokeDisplayServerTestFixture;
-TEST_F(SwapIntervalSignalTest, swapinterval_test)
+TEST_F(SwapIntervalSignalTest, SwapintervalTest)
 {
     static std::string const swapinterval_set{"swapinterval_set_952f3f10.tmp"};
     static std::string const do_client_finish{"do_client_finish_952f3f10.tmp"};

=== modified file 'tests/integration-tests/test_test_framework.cpp'
--- tests/integration-tests/test_test_framework.cpp	2014-11-03 02:35:50 +0000
+++ tests/integration-tests/test_test_framework.cpp	2014-11-24 02:31:01 +0000
@@ -34,7 +34,7 @@
 // We need some tests to prove that errors are reported by the
 // display server test fixture.  But don't want them to fail in
 // normal builds.
-TEST_F(BespokeDisplayServerTestFixture, DISABLED_failing_server_side_test)
+TEST_F(BespokeDisplayServerTestFixture, DISABLED_FailingServerSideTest)
 {
     struct Server : TestingServerConfiguration
     {
@@ -48,11 +48,11 @@
     launch_server_process(fail);
 }
 
-TEST_F(BespokeDisplayServerTestFixture, DISABLED_failing_without_server)
+TEST_F(BespokeDisplayServerTestFixture, DISABLED_FailingWithoutServer)
 {
 }
 
-TEST_F(DefaultDisplayServerTestFixture, demonstrate_multiple_clients)
+TEST_F(DefaultDisplayServerTestFixture, DemonstrateMultipleClients)
 {
     struct Client : TestingClientConfiguration
     {
@@ -79,7 +79,7 @@
 };
 }
 
-TEST_F(DemoInProcessServer, client_can_connect)
+TEST_F(DemoInProcessServer, ClientCanConnect)
 {
     auto const connection = mir_connect_sync(new_connection().c_str(), __PRETTY_FUNCTION__);
     EXPECT_TRUE(mir_connection_is_valid(connection));

=== modified file 'tests/performance-tests/test_glmark2-es2-mir.cpp'
--- tests/performance-tests/test_glmark2-es2-mir.cpp	2014-10-29 06:21:10 +0000
+++ tests/performance-tests/test_glmark2-es2-mir.cpp	2014-11-24 02:31:01 +0000
@@ -71,7 +71,7 @@
     mir::DefaultServerConfiguration config;
 };
 
-TEST_F(GLMark2Test, benchmark_fullscreen_default)
+TEST_F(GLMark2Test, BenchmarkFullscreenDefault)
 {
     run_glmark2("/tmp/glmark2_fullscreen_default.results", raw);
 }

=== modified file 'tests/unit-tests/android_input/input_reader.cpp'
--- tests/unit-tests/android_input/input_reader.cpp	2014-11-21 12:16:36 +0000
+++ tests/unit-tests/android_input/input_reader.cpp	2014-11-24 02:31:01 +0000
@@ -3438,7 +3438,7 @@
     }
 }
 
-TEST_F(MultiTouchInputMapperTest, DISABLED_Process_NormalMultiTouchGesture_WithoutTrackingIds) {
+TEST_F(MultiTouchInputMapperTest, DISABLED__Process_NormalMultiTouchGesture_WithoutTrackingIds) {
     MultiTouchInputMapper* mapper = new MultiTouchInputMapper(mDevice);
     addConfigurationProperty("touch.deviceType", "touchScreen");
     prepareDisplay(DISPLAY_ORIENTATION_0);

=== modified file 'tests/unit-tests/android_input/int_set.cpp'
--- tests/unit-tests/android_input/int_set.cpp	2013-10-25 13:59:31 +0000
+++ tests/unit-tests/android_input/int_set.cpp	2014-11-24 02:31:01 +0000
@@ -44,7 +44,7 @@
 };
 }
 
-TEST_F(AndroidInputIntSet, difference)
+TEST_F(AndroidInputIntSet, Difference)
 {
     IntSet a = {1, 2, 3,       6};
     IntSet b = {   2, 3, 4, 5};
@@ -54,7 +54,7 @@
     EXPECT_EQ(expected_c, c);
 }
 
-TEST_F(AndroidInputIntSet, intersection)
+TEST_F(AndroidInputIntSet, Intersection)
 {
     IntSet a = {1, 2, 3};
     IntSet b = {   2, 3, 4, 5};
@@ -64,13 +64,13 @@
     EXPECT_EQ(expected_c, c);
 }
 
-TEST_F(AndroidInputIntSet, first)
+TEST_F(AndroidInputIntSet, First)
 {
     IntSet a = {4, 2, 1, 3};
     EXPECT_EQ(1, a.first());
 }
 
-TEST_F(AndroidInputIntSet, remove_set)
+TEST_F(AndroidInputIntSet, RemoveSet)
 {
     IntSet a = {1, 2, 3, 4};
     IntSet b = {   2, 3,    5};
@@ -81,7 +81,7 @@
     EXPECT_EQ(expected_a, a);
 }
 
-TEST_F(AndroidInputIntSet, index_of)
+TEST_F(AndroidInputIntSet, IndexOf)
 {
     IntSet a = {5, 6, 10, 15};
 
@@ -89,7 +89,7 @@
     EXPECT_EQ(2u, a.indexOf(10));
 }
 
-TEST_F(AndroidInputIntSet, for_each)
+TEST_F(AndroidInputIntSet, ForEach)
 {
     IntSet a = {5, 6, 10, 15};
 
@@ -103,14 +103,14 @@
     EXPECT_EQ(expected_values, actual_values);
 }
 
-TEST_F(AndroidInputIntSet, to_string)
+TEST_F(AndroidInputIntSet, ToString)
 {
     IntSet a = {1, 2, 3};
     string expected_str = "1, 2, 3";
     EXPECT_EQ(expected_str, a.toString());
 }
 
-TEST_F(AndroidInputIntSet, unnecessary_constructions)
+TEST_F(AndroidInputIntSet, UnnecessaryConstructions)
 {
     IntSet a = {1, 2, 3,       6};
     IntSet b = {   2, 3, 4, 5};

=== modified file 'tests/unit-tests/android_input/property_map.cpp'
--- tests/unit-tests/android_input/property_map.cpp	2013-05-03 16:38:07 +0000
+++ tests/unit-tests/android_input/property_map.cpp	2014-11-24 02:31:01 +0000
@@ -60,26 +60,26 @@
 };
 }
 
-TEST_F(AndroidInputPropertyMap, test_map_created)
+TEST_F(AndroidInputPropertyMap, TestMapCreated)
 {
     EXPECT_TRUE(test_map);
 }
 
-TEST_F(AndroidInputPropertyMap, test_map_has_a_string)
+TEST_F(AndroidInputPropertyMap, TestMapHasAString)
 {
     String8 result;
     EXPECT_TRUE(test_map->tryGetProperty(String8("test.string"), result));
     EXPECT_EQ(String8("a_string"), result);
 }
 
-TEST_F(AndroidInputPropertyMap, test_map_has_an_int32_t)
+TEST_F(AndroidInputPropertyMap, TestMapHasAnInt32T)
 {
     int32_t result;
     EXPECT_TRUE(test_map->tryGetProperty(String8("test.int_32"), result));
     EXPECT_EQ(123, result);
 }
 
-TEST_F(AndroidInputPropertyMap, test_map_has_bools_true_and_false)
+TEST_F(AndroidInputPropertyMap, TestMapHasBoolsTrueAndFalse)
 {
     bool result{};
     EXPECT_TRUE(test_map->tryGetProperty(String8("test.bool.true"), result));
@@ -89,38 +89,38 @@
     EXPECT_FALSE(result);
 }
 
-TEST_F(AndroidInputPropertyMap, test_map_has_a_float)
+TEST_F(AndroidInputPropertyMap, TestMapHasAFloat)
 {
     float result;
     EXPECT_TRUE(test_map->tryGetProperty(String8("test.float"), result));
     EXPECT_EQ(0.5, result);
 }
 
-TEST_F(AndroidInputPropertyMap, test_map_fails_to_get_unknown_string)
+TEST_F(AndroidInputPropertyMap, TestMapFailsToGetUnknownString)
 {
     String8 result;
     EXPECT_FALSE(test_map->tryGetProperty(String8("unknown"), result));
 }
 
-TEST_F(AndroidInputPropertyMap, test_map_fails_to_get_unknown_bool)
+TEST_F(AndroidInputPropertyMap, TestMapFailsToGetUnknownBool)
 {
     bool result{};
     EXPECT_FALSE(test_map->tryGetProperty(String8("unknown"), result));
 }
 
-TEST_F(AndroidInputPropertyMap, test_map_fails_to_get_unknown_int32_t)
+TEST_F(AndroidInputPropertyMap, TestMapFailsToGetUnknownInt32T)
 {
     int32_t result;
     EXPECT_FALSE(test_map->tryGetProperty(String8("unknown"), result));
 }
 
-TEST_F(AndroidInputPropertyMap, test_map_fails_to_get_unknown_float)
+TEST_F(AndroidInputPropertyMap, TestMapFailsToGetUnknownFloat)
 {
     float result;
     EXPECT_FALSE(test_map->tryGetProperty(String8("unknown"), result));
 }
 
-TEST_F(AndroidInputPropertyMap, test_map_ignores_comment)
+TEST_F(AndroidInputPropertyMap, TestMapIgnoresComment)
 {
     int32_t result;
     EXPECT_FALSE(test_map->tryGetProperty(String8("test.int.ignored"), result));

=== modified file 'tests/unit-tests/android_input/sha1.cpp'
--- tests/unit-tests/android_input/sha1.cpp	2013-02-07 15:31:17 +0000
+++ tests/unit-tests/android_input/sha1.cpp	2014-11-24 02:31:01 +0000
@@ -39,7 +39,7 @@
 et malesuada fames ac turpis egestas.)";
 }
 
-TEST(AndroidSha1, test)
+TEST(AndroidSha1, Test)
 {
     EXPECT_STREQ("aa74e4cdc9b384c5e30df0d3ea3cd1121a854ef7",
         c_str(detail::sha1(String8(test_text))));

=== modified file 'tests/unit-tests/android_input/sorted_vector.cpp'
--- tests/unit-tests/android_input/sorted_vector.cpp	2013-05-03 16:38:07 +0000
+++ tests/unit-tests/android_input/sorted_vector.cpp	2014-11-24 02:31:01 +0000
@@ -35,18 +35,18 @@
 };
 }
 
-TEST_F(AndroidInputSortedVector, empty_vector_isEmpty)
+TEST_F(AndroidInputSortedVector, EmptyVectorIsEmpty)
 {
     EXPECT_TRUE(test_vector.isEmpty());
 }
 
-TEST_F(AndroidInputSortedVector, non_empty_vector_not_isEmpty)
+TEST_F(AndroidInputSortedVector, NonEmptyVectorNotIsEmpty)
 {
     test_vector.add(1);
     EXPECT_FALSE(test_vector.isEmpty());
 }
 
-TEST_F(AndroidInputSortedVector, items_found_at_expected_indexes)
+TEST_F(AndroidInputSortedVector, ItemsFoundAtExpectedIndexes)
 {
     test_vector.add(3);
     test_vector.add(1);
@@ -61,7 +61,7 @@
     EXPECT_EQ(android::NAME_NOT_FOUND, test_vector.indexOf(4));
 }
 
-TEST_F(AndroidInputSortedVector, duplicate_adds_create_single_entry)
+TEST_F(AndroidInputSortedVector, DuplicateAddsCreateSingleEntry)
 {
     test_vector.add(3);
     test_vector.add(1);
@@ -83,7 +83,7 @@
     EXPECT_EQ(android::NAME_NOT_FOUND, test_vector.indexOf(4));
 }
 
-TEST_F(AndroidInputSortedVector, adds_returns_correct_index)
+TEST_F(AndroidInputSortedVector, AddsReturnsCorrectIndex)
 {
     EXPECT_EQ(0, test_vector.add(3));
     EXPECT_EQ(0, test_vector.add(1));
@@ -96,7 +96,7 @@
     EXPECT_EQ(0, test_vector.add(0));
 }
 
-TEST_F(AndroidInputSortedVector, missing_items_are_not_found)
+TEST_F(AndroidInputSortedVector, MissingItemsAreNotFound)
 {
     test_vector.add(3);
     test_vector.add(1);
@@ -106,7 +106,7 @@
     EXPECT_EQ(android::NAME_NOT_FOUND, test_vector.indexOf(4));
 }
 
-TEST_F(AndroidInputSortedVector, index_gets_expected_items)
+TEST_F(AndroidInputSortedVector, IndexGetsExpectedItems)
 {
     test_vector.add(30);
     test_vector.add(10);
@@ -119,7 +119,7 @@
     EXPECT_EQ(30, test_vector.itemAt(3));
 }
 
-TEST_F(AndroidInputSortedVector, edit_changes_item)
+TEST_F(AndroidInputSortedVector, EditChangesItem)
 {
     test_vector.add(30);
     test_vector.add(10);
@@ -132,7 +132,7 @@
     EXPECT_EQ(12, test_vector.itemAt(1));
 }
 
-TEST_F(AndroidInputSortedVector, removed_items_are_not_found)
+TEST_F(AndroidInputSortedVector, RemovedItemsAreNotFound)
 {
     test_vector.add(3);
     test_vector.add(1);
@@ -145,7 +145,7 @@
     EXPECT_EQ(android::NAME_NOT_FOUND, test_vector.indexOf(1));
 }
 
-TEST_F(AndroidInputSortedVector, remove_unknown_items_is_noop)
+TEST_F(AndroidInputSortedVector, RemoveUnknownItemsIsNoop)
 {
     test_vector.add(3);
     test_vector.add(2);
@@ -155,7 +155,7 @@
     EXPECT_EQ(3u, test_vector.size());
 }
 
-TEST_F(AndroidInputSortedVector, item_at_removed_index_are_not_found)
+TEST_F(AndroidInputSortedVector, ItemAtRemovedIndexAreNotFound)
 {
     test_vector.add(30);
     test_vector.add(10);
@@ -169,7 +169,7 @@
     EXPECT_EQ(android::NAME_NOT_FOUND, test_vector.indexOf(10));
 }
 
-TEST_F(AndroidInputSortedVector, count_items_at_removed_index_are_not_found)
+TEST_F(AndroidInputSortedVector, CountItemsAtRemovedIndexAreNotFound)
 {
     test_vector.add(30);
     test_vector.add(10);
@@ -187,7 +187,7 @@
 }
 
 // Android utils use ALOG_ASSERT - which tends to bomb the program
-TEST_F(AndroidInputSortedVector, remove_beyond_end_fails)
+TEST_F(AndroidInputSortedVector, RemoveBeyondEndFails)
 {
     test_vector.add(30);
     test_vector.add(10);

=== modified file 'tests/unit-tests/android_input/string8.cpp'
--- tests/unit-tests/android_input/string8.cpp	2013-05-03 16:38:07 +0000
+++ tests/unit-tests/android_input/string8.cpp	2014-11-24 02:31:01 +0000
@@ -24,7 +24,7 @@
 
 using namespace android;
 
-TEST(AndroidString8, appendFormat)
+TEST(AndroidString8, AppendFormat)
 {
     String8 string;
 
@@ -40,7 +40,7 @@
     EXPECT_STREQ("Hello12", c_str(string));
 }
 
-TEST(AndroidString8, formatString8)
+TEST(AndroidString8, FormatString8)
 {
     auto string = formatString8("Hello %s #%02x", "world", 0x42);
 

=== modified file 'tests/unit-tests/client/android/test_android_client_platform.cpp'
--- tests/unit-tests/client/android/test_android_client_platform.cpp	2014-03-06 06:05:17 +0000
+++ tests/unit-tests/client/android/test_android_client_platform.cpp	2014-11-24 02:31:01 +0000
@@ -29,7 +29,7 @@
 namespace mt = mir::test;
 namespace mtd = mt::doubles;
 
-TEST(AndroidClientPlatformTest, egl_native_display_is_egl_default_display)
+TEST(AndroidClientPlatformTest, EglNativeDisplayIsEglDefaultDisplay)
 {
     mtd::MockClientContext context;
     mcl::android::ClientPlatformFactory factory;
@@ -40,7 +40,7 @@
     EXPECT_EQ(EGL_DEFAULT_DISPLAY, *native_display);
 }
 
-TEST(AndroidClientPlatformTest, egl_native_window_is_set)
+TEST(AndroidClientPlatformTest, EglNativeWindowIsSet)
 {
     mtd::MockClientContext context;
     mcl::android::ClientPlatformFactory factory;

=== modified file 'tests/unit-tests/client/android/test_android_native_window.cpp'
--- tests/unit-tests/client/android/test_android_native_window.cpp	2014-10-29 06:21:10 +0000
+++ tests/unit-tests/client/android/test_android_native_window.cpp	2014-11-24 02:31:01 +0000
@@ -63,7 +63,7 @@
 
 }
 
-TEST_F(AndroidNativeWindowTest, native_window_swapinterval)
+TEST_F(AndroidNativeWindowTest, NativeWindowSwapinterval)
 {
     using namespace testing;
 
@@ -84,7 +84,7 @@
 }
 
 /* Query hook tests */
-TEST_F(AndroidNativeWindowTest, native_window_query_hook)
+TEST_F(AndroidNativeWindowTest, NativeWindowQueryHook)
 {
     using namespace testing;
 
@@ -102,7 +102,7 @@
 }
 
 /* perform hook tests */
-TEST_F(AndroidNativeWindowTest, native_window_perform_hook_callable)
+TEST_F(AndroidNativeWindowTest, NativeWindowPerformHookCallable)
 {
     int const format = 4;
 
@@ -114,7 +114,7 @@
 }
 
 /* setSwapInterval hook tests */
-TEST_F(AndroidNativeWindowTest, native_window_setswapinterval_hook_callable)
+TEST_F(AndroidNativeWindowTest, NativeWindowSetswapintervalHookCallable)
 {
     int const swap = 2;
 
@@ -123,7 +123,7 @@
 }
 
 /* dequeue hook tests */
-TEST_F(AndroidNativeWindowTest, native_window_dequeue_hook_callable)
+TEST_F(AndroidNativeWindowTest, NativeWindowDequeueHookCallable)
 {
     ANativeWindowBuffer* returned_buffer;
     int fence_fd;
@@ -132,7 +132,7 @@
     window.dequeueBuffer(&window, &returned_buffer, &fence_fd);
 }
 
-TEST_F(AndroidNativeWindowTest, native_window_dequeue_returns_right_buffer)
+TEST_F(AndroidNativeWindowTest, NativeWindowDequeueReturnsRightBuffer)
 {
     using namespace testing;
 
@@ -153,7 +153,7 @@
     EXPECT_EQ(fake_fd, fence_fd);
 }
 
-TEST_F(AndroidNativeWindowTest, native_window_dequeue_returns_previously_cancelled_buffer)
+TEST_F(AndroidNativeWindowTest, NativeWindowDequeueReturnsPreviouslyCancelledBuffer)
 {
     using namespace testing;
     ANativeWindowBuffer buffer;
@@ -171,7 +171,7 @@
     EXPECT_EQ(dequeued_buffer, expected_buffer);
 }
 
-TEST_F(AndroidNativeWindowTest, native_window_dequeue_deprecated_hook_callable)
+TEST_F(AndroidNativeWindowTest, NativeWindowDequeueDeprecatedHookCallable)
 {
     ANativeWindowBuffer* tmp;
 
@@ -179,7 +179,7 @@
     window.dequeueBuffer_DEPRECATED(&window, &tmp);
 }
 
-TEST_F(AndroidNativeWindowTest, native_window_dequeue_deprecated_returns_right_buffer)
+TEST_F(AndroidNativeWindowTest, NativeWindowDequeueDeprecatedReturnsRightBuffer)
 {
     using namespace testing;
 
@@ -198,7 +198,7 @@
     EXPECT_EQ(mock_buffer->anwb(), returned_buffer);
 }
 
-TEST_F(AndroidNativeWindowTest, native_window_dequeue_deprecated_returns_previously_cancelled_buffer)
+TEST_F(AndroidNativeWindowTest, NativeWindowDequeueDeprecatedReturnsPreviouslyCancelledBuffer)
 {
     using namespace testing;
     ANativeWindowBuffer buffer;
@@ -216,7 +216,7 @@
 }
 
 /* queue hook tests */
-TEST_F(AndroidNativeWindowTest, native_window_queue_hook_callable)
+TEST_F(AndroidNativeWindowTest, NativeWindowQueueHookCallable)
 {
     ANativeWindowBuffer* tmp = nullptr;
 
@@ -224,7 +224,7 @@
     window.queueBuffer(&window, tmp, -1);
 }
 
-TEST_F(AndroidNativeWindowTest, native_window_queue_passes_buffer_back)
+TEST_F(AndroidNativeWindowTest, NativeWindowQueuePassesBufferBack)
 {
     using namespace testing;
     ANativeWindowBuffer buffer;
@@ -236,7 +236,7 @@
     window.queueBuffer(&window, &buffer, fence_fd);
 }
 
-TEST_F(AndroidNativeWindowTest, native_window_queue_deprecated_hook_callable)
+TEST_F(AndroidNativeWindowTest, NativeWindowQueueDeprecatedHookCallable)
 {
     ANativeWindowBuffer* tmp = nullptr;
 
@@ -244,7 +244,7 @@
     window.queueBuffer_DEPRECATED(&window, tmp);
 }
 
-TEST_F(AndroidNativeWindowTest, native_window_queue_deprecated_passes_buffer_back)
+TEST_F(AndroidNativeWindowTest, NativeWindowQueueDeprecatedPassesBufferBack)
 {
     using namespace testing;
     ANativeWindowBuffer buffer;
@@ -256,7 +256,7 @@
 }
 
 /* cancel hook tests */
-TEST_F(AndroidNativeWindowTest, native_window_cancel_hooks_callable)
+TEST_F(AndroidNativeWindowTest, NativeWindowCancelHooksCallable)
 {
     ANativeWindowBuffer* tmp = nullptr;
 
@@ -267,7 +267,7 @@
 }
 
 /* lock hook tests */
-TEST_F(AndroidNativeWindowTest, native_window_lock_hook_callable)
+TEST_F(AndroidNativeWindowTest, NativeWindowLockHookCallable)
 {
     ANativeWindowBuffer* tmp = 0x0;
 
@@ -275,19 +275,19 @@
     window.lockBuffer_DEPRECATED(&window, tmp);
 }
 
-TEST_F(AndroidNativeWindowTest, native_window_incref_hook_callable)
+TEST_F(AndroidNativeWindowTest, NativeWindowIncrefHookCallable)
 {
     ASSERT_NE(nullptr, window.common.incRef);
     window.common.incRef(NULL);
 }
 
-TEST_F(AndroidNativeWindowTest, native_window_decref_hook_callable)
+TEST_F(AndroidNativeWindowTest, NativeWindowDecrefHookCallable)
 {
     ASSERT_NE(nullptr, window.common.decRef);
     window.common.decRef(NULL);
 }
 
-TEST_F(AndroidNativeWindowTest, native_window_dequeue_deprecated_has_proper_rc)
+TEST_F(AndroidNativeWindowTest, NativeWindowDequeueDeprecatedHasProperRc)
 {
     ANativeWindowBuffer* tmp;
 
@@ -295,7 +295,7 @@
     EXPECT_EQ(0, ret);
 }
 
-TEST_F(AndroidNativeWindowTest, native_window_dequeue_has_proper_rc)
+TEST_F(AndroidNativeWindowTest, NativeWindowDequeueHasProperRc)
 {
     ANativeWindowBuffer* tmp;
     int fencefd;
@@ -304,7 +304,7 @@
     EXPECT_EQ(0, ret);
 }
 
-TEST_F(AndroidNativeWindowTest, native_window_cancel_hook_does_not_call_driver_interpreter)
+TEST_F(AndroidNativeWindowTest, NativeWindowCancelHookDoesNotCallDriverInterpreter)
 {
     using namespace testing;
     ANativeWindowBuffer buffer;
@@ -317,7 +317,7 @@
     EXPECT_EQ(0, rc);
 }
 
-TEST_F(AndroidNativeWindowTest, returns_error_on_dequeue_buffer_failure)
+TEST_F(AndroidNativeWindowTest, ReturnsErrorOnDequeueBufferFailure)
 {
     using namespace testing;
 
@@ -329,7 +329,7 @@
     EXPECT_THAT(window.dequeueBuffer_DEPRECATED(&window, nullptr), Eq(failure_code));
 }
 
-TEST_F(AndroidNativeWindowTest, returns_error_on_queue_buffer_failure)
+TEST_F(AndroidNativeWindowTest, ReturnsErrorOnQueueBufferFailure)
 {
     using namespace testing;
 
@@ -341,7 +341,7 @@
     EXPECT_THAT(window.queueBuffer_DEPRECATED(&window, nullptr), Eq(failure_code));
 }
 
-TEST_F(AndroidNativeWindowTest, returns_error_on_query_failure)
+TEST_F(AndroidNativeWindowTest, ReturnsErrorOnQueryFailure)
 {
     using namespace testing;
 
@@ -351,7 +351,7 @@
     EXPECT_THAT(window.query(&window, 0, nullptr), Eq(failure_code));
 }
 
-TEST_F(AndroidNativeWindowTest, returns_error_on_perform_failure)
+TEST_F(AndroidNativeWindowTest, ReturnsErrorOnPerformFailure)
 {
     using namespace testing;
 

=== modified file 'tests/unit-tests/client/android/test_buffer.cpp'
--- tests/unit-tests/client/android/test_buffer.cpp	2014-11-03 02:35:50 +0000
+++ tests/unit-tests/client/android/test_buffer.cpp	2014-11-24 02:31:01 +0000
@@ -58,7 +58,7 @@
     MirBufferPackage package;
 };
 
-TEST_F(AndroidClientBuffer, registers_native_handle_with_correct_size)
+TEST_F(AndroidClientBuffer, RegistersNativeHandleWithCorrectSize)
 {
     EXPECT_CALL(*mock_registrar, register_buffer(testing::_, testing::_))
         .WillOnce(testing::Return(mock_native_buffer));
@@ -69,7 +69,7 @@
     EXPECT_EQ(stride, buffer.stride());
 }
 
-TEST_F(AndroidClientBuffer, packs_memory_region_correctly)
+TEST_F(AndroidClientBuffer, PacksMemoryRegionCorrectly)
 {
     using namespace testing;
     geom::Rectangle rect{{0,0}, size};
@@ -87,7 +87,7 @@
     EXPECT_EQ(pf, region->format);
 }
 
-TEST_F(AndroidClientBuffer, update_from_package_merges_fence_when_present)
+TEST_F(AndroidClientBuffer, UpdateFromPackageMergesFenceWhenPresent)
 {
     mga::NativeFence fake_fence{213};
     EXPECT_CALL(*mock_native_buffer, update_usage(fake_fence, mga::BufferAccess::read))
@@ -104,7 +104,7 @@
     buffer.update_from(package);
 }
 
-TEST_F(AndroidClientBuffer, fills_update_msg)
+TEST_F(AndroidClientBuffer, FillsUpdateMsg)
 {
     using namespace testing;
     using mir::graphics::android::BufferFlag;

=== modified file 'tests/unit-tests/client/android/test_client_surface_interpreter.cpp'
--- tests/unit-tests/client/android/test_client_surface_interpreter.cpp	2014-10-29 06:21:10 +0000
+++ tests/unit-tests/client/android/test_client_surface_interpreter.cpp	2014-11-24 02:31:01 +0000
@@ -99,7 +99,7 @@
     std::shared_ptr<MockClientBuffer> mock_client_buffer;
 };
 
-TEST_F(AndroidInterpreter, gets_buffer_via_the_surface_on_request)
+TEST_F(AndroidInterpreter, GetsBufferViaTheSurfaceOnRequest)
 {
     using namespace testing;
     testing::NiceMock<MockMirSurface> mock_surface{surf_params};
@@ -112,7 +112,7 @@
     interpreter.driver_requests_buffer();
 }
 
-TEST_F(AndroidInterpreter, gets_native_handle_from_returned_buffer)
+TEST_F(AndroidInterpreter, GetsNativeHandleFromReturnedBuffer)
 {
     using namespace testing;
     auto buffer = std::make_shared<mtd::StubAndroidNativeBuffer>();
@@ -131,7 +131,7 @@
     EXPECT_EQ(buffer.get(), returned_buffer);
 }
 
-TEST_F(AndroidInterpreter, advances_surface_on_buffer_return)
+TEST_F(AndroidInterpreter, AdvancesSurfaceOnBufferReturn)
 {
     using namespace testing;
     ANativeWindowBuffer buffer;
@@ -146,7 +146,7 @@
 }
 
 /* format is an int that is set by the driver. these are not the HAL_PIXEL_FORMATS in android */
-TEST_F(AndroidInterpreter, remembers_format)
+TEST_F(AndroidInterpreter, RemembersFormat)
 {
     int format = 945;
     testing::NiceMock<MockMirSurface> mock_surface{surf_params};
@@ -158,7 +158,7 @@
     EXPECT_EQ(format, tmp_format);
 }
 
-TEST_F(AndroidInterpreter, returns_no_transform_for_transform_hint_query)
+TEST_F(AndroidInterpreter, ReturnsNoTransformForTransformHintQuery)
 {
     testing::NiceMock<MockMirSurface> mock_surface{surf_params};
     mcla::ClientSurfaceInterpreter interpreter(mock_surface);
@@ -170,7 +170,7 @@
     EXPECT_EQ(transform_hint_zero, transform);
 }
 
-TEST_F(AndroidInterpreter, returns_width_as_default_width)
+TEST_F(AndroidInterpreter, ReturnsWidthAsDefaultWidth)
 {
     testing::NiceMock<MockMirSurface> mock_surface{surf_params};
     mcla::ClientSurfaceInterpreter interpreter(mock_surface);
@@ -180,7 +180,7 @@
     EXPECT_EQ(surf_params.width, default_width);
 }
 
-TEST_F(AndroidInterpreter, returns_height_as_default_height)
+TEST_F(AndroidInterpreter, ReturnsHeightAsDefaultHeight)
 {
     testing::NiceMock<MockMirSurface> mock_surface{surf_params};
     mcla::ClientSurfaceInterpreter interpreter(mock_surface);
@@ -190,7 +190,7 @@
     EXPECT_EQ(surf_params.height, default_height);
 }
 
-TEST_F(AndroidInterpreter, returns_surface_as_concrete_type)
+TEST_F(AndroidInterpreter, ReturnsSurfaceAsConcreteType)
 {
     testing::NiceMock<MockMirSurface> mock_surface{surf_params};
     mcla::ClientSurfaceInterpreter interpreter(mock_surface);
@@ -199,7 +199,7 @@
     EXPECT_EQ(NATIVE_WINDOW_SURFACE, concrete_type);
 }
 
-TEST_F(AndroidInterpreter, returns_width)
+TEST_F(AndroidInterpreter, ReturnsWidth)
 {
     testing::NiceMock<MockMirSurface> mock_surface{surf_params};
     mcla::ClientSurfaceInterpreter interpreter(mock_surface);
@@ -209,7 +209,7 @@
     EXPECT_EQ(surf_params.width, width);
 }
 
-TEST_F(AndroidInterpreter, returns_height)
+TEST_F(AndroidInterpreter, ReturnsHeight)
 {
     testing::NiceMock<MockMirSurface> mock_surface{surf_params};
     mcla::ClientSurfaceInterpreter interpreter(mock_surface);
@@ -226,7 +226,7 @@
    to keep 2 buffers on hand at all time, the driver might dequeue 5 buffers, then cancel those 5 buffers.
    After the first call to queueBuffer however, the client may never own more than the number it has
    reserved (in this case, 3 buffers) */
-TEST_F(AndroidInterpreter, returns_2_for_min_undequeued_query)
+TEST_F(AndroidInterpreter, Returns_2ForMinUndequeuedQuery)
 {
     testing::NiceMock<MockMirSurface> mock_surface{surf_params};
     mcla::ClientSurfaceInterpreter interpreter(mock_surface);
@@ -235,7 +235,7 @@
     EXPECT_EQ(2, num_buffers);
 }
 
-TEST_F(AndroidInterpreter, requests_swapinterval_change)
+TEST_F(AndroidInterpreter, RequestsSwapintervalChange)
 {
     testing::NiceMock<MockMirSurface> mock_surface{surf_params};
     testing::InSequence seq;

=== modified file 'tests/unit-tests/client/android/test_gralloc_registrar.cpp'
--- tests/unit-tests/client/android/test_gralloc_registrar.cpp	2014-11-03 02:35:50 +0000
+++ tests/unit-tests/client/android/test_gralloc_registrar.cpp	2014-11-24 02:31:01 +0000
@@ -111,7 +111,7 @@
     std::shared_ptr<mtd::MockAndroidNativeBuffer> const mock_native_buffer;
 };
 
-TEST_F(GrallocRegistrar, client_buffer_converts_stub_package)
+TEST_F(GrallocRegistrar, ClientBufferConvertsStubPackage)
 {
     int const flag_offset{1};
     mcla::GrallocRegistrar registrar(mock_module);
@@ -127,14 +127,14 @@
         EXPECT_EQ(stub_package.data[i + flag_offset], handle->data[i + stub_package.fd_items]);
 }
 
-TEST_F(GrallocRegistrar, client_sets_correct_version)
+TEST_F(GrallocRegistrar, ClientSetsCorrectVersion)
 {
     mcla::GrallocRegistrar registrar(mock_module);
     auto buffer = registrar.register_buffer(stub_package, pf);
     EXPECT_EQ(buffer->handle()->version, static_cast<int>(sizeof(native_handle_t)));
 }
 
-TEST_F(GrallocRegistrar, registrar_registers_using_module)
+TEST_F(GrallocRegistrar, RegistrarRegistersUsingModule)
 {
     using namespace testing;
     native_handle_t const* handle1 = nullptr;
@@ -155,7 +155,7 @@
     EXPECT_EQ(handle1, handle2);
 }
 
-TEST_F(GrallocRegistrar, registrar_frees_fds)
+TEST_F(GrallocRegistrar, RegistrarFreesFds)
 {
     using namespace testing;
     MirBufferPackage stub_package;
@@ -174,7 +174,7 @@
 }
 
 
-TEST_F(GrallocRegistrar, register_failure)
+TEST_F(GrallocRegistrar, RegisterFailure)
 {
     using namespace testing;
     EXPECT_CALL(*mock_module, registerBuffer_interface(_, _))
@@ -189,7 +189,7 @@
     }, std::runtime_error);
 }
 
-TEST_F(GrallocRegistrar, region_is_cleaned_up_correctly)
+TEST_F(GrallocRegistrar, RegionIsCleanedUpCorrectly)
 {
     using namespace testing;
     mcla::GrallocRegistrar registrar(mock_module);
@@ -219,7 +219,7 @@
     EXPECT_EQ(handle_alloc, handle_freed);
 }
 
-TEST_F(GrallocRegistrar, maps_buffer_for_cpu_correctly)
+TEST_F(GrallocRegistrar, MapsBufferForCpuCorrectly)
 {
     EXPECT_CALL(*mock_module, lock_interface(
         mock_module.get(),
@@ -236,7 +236,7 @@
     registrar.secure_for_cpu(mock_native_buffer, rect);
 }
 
-TEST_F(GrallocRegistrar, lock_failure_throws)
+TEST_F(GrallocRegistrar, LockFailureThrows)
 {
     using namespace testing;
     EXPECT_CALL(*mock_module, lock_interface(_,_,_,_,_,_,_,_))
@@ -251,7 +251,7 @@
 }
 
 /* unlock is called in destructor. should not throw */
-TEST_F(GrallocRegistrar, unlock_failure_doesnt_throw)
+TEST_F(GrallocRegistrar, UnlockFailureDoesntThrow)
 {
     using namespace testing;
     EXPECT_CALL(*mock_module, unlock_interface(_,_))
@@ -265,7 +265,7 @@
     });
 }
 
-TEST_F(GrallocRegistrar, produces_valid_anwb)
+TEST_F(GrallocRegistrar, ProducesValidAnwb)
 {
     using namespace testing;
     mcla::GrallocRegistrar registrar(mock_module);

=== modified file 'tests/unit-tests/client/input/test_android_input_receiver.cpp'
--- tests/unit-tests/client/input/test_android_input_receiver.cpp	2014-10-29 06:21:10 +0000
+++ tests/unit-tests/client/input/test_android_input_receiver.cpp	2014-11-24 02:31:01 +0000
@@ -146,14 +146,14 @@
 
 }
 
-TEST_F(AndroidInputReceiverSetup, receiever_takes_channel_fd)
+TEST_F(AndroidInputReceiverSetup, ReceieverTakesChannelFd)
 {
     mircva::InputReceiver receiver(client_fd, std::make_shared<mircv::NullInputReceiverReport>());
 
     EXPECT_EQ(client_fd, receiver.fd());
 }
 
-TEST_F(AndroidInputReceiverSetup, receiver_receives_key_events)
+TEST_F(AndroidInputReceiverSetup, ReceiverReceivesKeyEvents)
 {
     mircva::InputReceiver receiver(client_fd, std::make_shared<mircv::NullInputReceiverReport>());
     TestingInputProducer producer(server_fd);
@@ -169,7 +169,7 @@
     EXPECT_EQ(producer.testing_key_event_scan_code, ev.key.scan_code);
 }
 
-TEST_F(AndroidInputReceiverSetup, receiver_handles_events)
+TEST_F(AndroidInputReceiverSetup, ReceiverHandlesEvents)
 {
     mircva::InputReceiver receiver(client_fd, std::make_shared<mircv::NullInputReceiverReport>());
     TestingInputProducer producer(server_fd);
@@ -185,7 +185,7 @@
     EXPECT_TRUE (producer.must_receive_handled_signal());
 }
 
-TEST_F(AndroidInputReceiverSetup, receiver_consumes_batched_motion_events)
+TEST_F(AndroidInputReceiverSetup, ReceiverConsumesBatchedMotionEvents)
 {
     mircva::InputReceiver receiver(client_fd, std::make_shared<mircv::NullInputReceiverReport>());
     TestingInputProducer producer(server_fd);
@@ -204,7 +204,7 @@
     EXPECT_FALSE(receiver.next_event(std::chrono::milliseconds(1), ev)); // Minimal timeout needed for valgrind
 }
 
-TEST_F(AndroidInputReceiverSetup, slow_raw_input_doesnt_cause_frameskipping)
+TEST_F(AndroidInputReceiverSetup, SlowRawInputDoesntCauseFrameskipping)
 {   // Regression test for LP: #1372300
     using namespace testing;
     using namespace std::chrono;
@@ -252,7 +252,7 @@
     ASSERT_EQ(mir_event_type_motion, ev.type);
 }
 
-TEST_F(AndroidInputReceiverSetup, rendering_does_not_lag_behind_input)
+TEST_F(AndroidInputReceiverSetup, RenderingDoesNotLagBehindInput)
 {
     using namespace testing;
 
@@ -300,7 +300,7 @@
     EXPECT_THAT(average_lag_milliseconds, Le(1));
 }
 
-TEST_F(AndroidInputReceiverSetup, input_comes_in_phase_with_rendering)
+TEST_F(AndroidInputReceiverSetup, InputComesInPhaseWithRendering)
 {
     using namespace testing;
 

=== modified file 'tests/unit-tests/client/input/test_android_input_receiver_thread.cpp'
--- tests/unit-tests/client/input/test_android_input_receiver_thread.cpp	2014-10-29 06:21:10 +0000
+++ tests/unit-tests/client/input/test_android_input_receiver_thread.cpp	2014-11-24 02:31:01 +0000
@@ -76,7 +76,7 @@
 
 }
 
-TEST_F(AndroidInputReceiverThreadSetup, reads_events_until_stopped)
+TEST_F(AndroidInputReceiverThreadSetup, ReadsEventsUntilStopped)
 {
     using namespace ::testing;
 
@@ -92,7 +92,7 @@
     input_thread.join();
 }
 
-TEST_F(AndroidInputReceiverThreadSetup, receives_and_dispatches_available_events_when_ready)
+TEST_F(AndroidInputReceiverThreadSetup, ReceivesAndDispatchesAvailableEventsWhenReady)
 {
     using namespace ::testing;
     MockEventHandler mock_handler;
@@ -122,7 +122,7 @@
     input_thread.join();
 }
 
-TEST_F(AndroidInputReceiverThreadSetup, input_callback_invoked_from_thread)
+TEST_F(AndroidInputReceiverThreadSetup, InputCallbackInvokedFromThread)
 {
     using namespace ::testing;
     MockEventHandler mock_handler;

=== modified file 'tests/unit-tests/client/input/test_xkb_mapper.cpp'
--- tests/unit-tests/client/input/test_xkb_mapper.cpp	2014-03-06 06:05:17 +0000
+++ tests/unit-tests/client/input/test_xkb_mapper.cpp	2014-11-24 02:31:01 +0000
@@ -54,7 +54,7 @@
 
 }
 
-TEST(XKBMapper, maps_generic_us_english_keys)
+TEST(XKBMapper, MapsGenericUsEnglishKeys)
 {
     mircv::XKBMapper mapper;
 
@@ -66,7 +66,7 @@
     EXPECT_EQ(XKB_KEY_4, map_key(mapper, mir_key_action_down, KEY_4));
 }
 
-TEST(XKBMapper, key_action_multiple_does_not_update_modifier_state)
+TEST(XKBMapper, KeyActionMultipleDoesNotUpdateModifierState)
 {
     mircv::XKBMapper mapper;
 
@@ -74,7 +74,7 @@
     EXPECT_EQ(XKB_KEY_7, map_key(mapper, mir_key_action_down, KEY_7));
 }
 
-TEST(XKBMapper, key_repeats_do_not_recurse_modifier_state)
+TEST(XKBMapper, KeyRepeatsDoNotRecurseModifierState)
 {
     mircv::XKBMapper mapper;
 

=== modified file 'tests/unit-tests/client/mesa/test_client_buffer.cpp'
--- tests/unit-tests/client/mesa/test_client_buffer.cpp	2014-10-21 19:10:52 +0000
+++ tests/unit-tests/client/mesa/test_client_buffer.cpp	2014-11-24 02:31:01 +0000
@@ -75,7 +75,7 @@
 
 }
 
-TEST_F(MesaClientBufferTest, width_and_height)
+TEST_F(MesaClientBufferTest, WidthAndHeight)
 {
     using namespace testing;
 
@@ -86,7 +86,7 @@
     EXPECT_EQ(buffer.pixel_format(), pf);
 }
 
-TEST_F(MesaClientBufferTest, buffer_returns_correct_stride)
+TEST_F(MesaClientBufferTest, BufferReturnsCorrectStride)
 {
     using namespace testing;
 
@@ -95,7 +95,7 @@
     EXPECT_EQ(buffer.stride(), stride);
 }
 
-TEST_F(MesaClientBufferTest, buffer_returns_set_package)
+TEST_F(MesaClientBufferTest, BufferReturnsSetPackage)
 {
     using namespace testing;
 
@@ -111,7 +111,7 @@
         EXPECT_EQ(package_return->fd[i], package_copy->fd[i]);
 }
 
-TEST_F(MesaClientBufferTest, secure_for_cpu_write_maps_buffer_fd)
+TEST_F(MesaClientBufferTest, SecureForCpuWriteMapsBufferFd)
 {
     using namespace testing;
     void *map_addr{reinterpret_cast<void*>(0xabcdef)};
@@ -133,7 +133,7 @@
     ASSERT_EQ(pf, mem_region->format);
 }
 
-TEST_F(MesaClientBufferTest, secure_for_cpu_write_throws_on_map_failure)
+TEST_F(MesaClientBufferTest, SecureForCpuWriteThrowsOnMapFailure)
 {
     using namespace testing;
 
@@ -151,7 +151,7 @@
     }, std::runtime_error);
 }
 
-TEST_F(MesaClientBufferTest, buffer_fd_closed_on_buffer_destruction)
+TEST_F(MesaClientBufferTest, BufferFdClosedOnBufferDestruction)
 {
     using namespace testing;
 
@@ -161,7 +161,7 @@
     mclg::ClientBuffer buffer(buffer_file_ops, package, size, pf);
 }
 
-TEST_F(MesaClientBufferTest, factory_gets_size_from_package)
+TEST_F(MesaClientBufferTest, FactoryGetsSizeFromPackage)
 {
     using namespace testing;
 
@@ -177,7 +177,7 @@
     EXPECT_NE(unused_size, buf_size);
 }
 
-TEST_F(MesaClientBufferTest, creation_with_invalid_buffer_package_throws)
+TEST_F(MesaClientBufferTest, CreationWithInvalidBufferPackageThrows)
 {
     using namespace testing;
 
@@ -191,7 +191,7 @@
     }, std::runtime_error);
 }
 
-TEST_F(MesaClientBufferTest, packs_empty_update_msg)
+TEST_F(MesaClientBufferTest, PacksEmptyUpdateMsg)
 {
     using namespace testing;
     mclg::ClientBuffer buffer(buffer_file_ops, package, size, pf);

=== modified file 'tests/unit-tests/client/mesa/test_client_platform.cpp'
--- tests/unit-tests/client/mesa/test_client_platform.cpp	2014-03-06 06:05:17 +0000
+++ tests/unit-tests/client/mesa/test_client_platform.cpp	2014-11-24 02:31:01 +0000
@@ -31,7 +31,7 @@
 namespace mt = mir::test;
 namespace mtd = mir::test::doubles;
 
-TEST(MesaClientPlatformTest, egl_native_display_is_valid_until_released)
+TEST(MesaClientPlatformTest, EglNativeDisplayIsValidUntilReleased)
 {
     mtd::MockClientContext context;
     mclm::ClientPlatformFactory factory;

=== modified file 'tests/unit-tests/client/mesa/test_mesa_native_display_container.cpp'
--- tests/unit-tests/client/mesa/test_mesa_native_display_container.cpp	2014-03-06 06:05:17 +0000
+++ tests/unit-tests/client/mesa/test_mesa_native_display_container.cpp	2014-11-24 02:31:01 +0000
@@ -45,7 +45,7 @@
 
 }
 
-TEST_F(MesaNativeDisplayContainerSetup, valid_displays_come_from_factory)
+TEST_F(MesaNativeDisplayContainerSetup, ValidDisplaysComeFromFactory)
 {
     using namespace ::testing;
 
@@ -56,7 +56,7 @@
     EXPECT_FALSE(container->validate(&invalid_native_display));
 }
 
-TEST_F(MesaNativeDisplayContainerSetup, releasing_displays_invalidates_address)
+TEST_F(MesaNativeDisplayContainerSetup, ReleasingDisplaysInvalidatesAddress)
 {
     using namespace ::testing;
 

=== modified file 'tests/unit-tests/client/mesa/test_native_surface.cpp'
--- tests/unit-tests/client/mesa/test_native_surface.cpp	2014-10-29 06:21:10 +0000
+++ tests/unit-tests/client/mesa/test_native_surface.cpp	2014-11-24 02:31:01 +0000
@@ -78,7 +78,7 @@
     mclg::NativeSurface native_surface{mock_surface};
 };
 
-TEST_F(MesaClientNativeSurfaceTest, basic_parameters)
+TEST_F(MesaClientNativeSurfaceTest, BasicParameters)
 {
     MirSurfaceParameters params;
     native_surface.surface_get_parameters(&native_surface, &params);
@@ -87,7 +87,7 @@
     EXPECT_EQ(surf_params.pixel_format, params.pixel_format);
 }
 
-TEST_F(MesaClientNativeSurfaceTest, first_advance_skips_request)
+TEST_F(MesaClientNativeSurfaceTest, FirstAdvanceSkipsRequest)
 {   // Verify the workaround for LP: #1281938 is functioning, until it's
     // fixed in Mesa and we can remove it from Mir.
     
@@ -101,7 +101,7 @@
     native_surface.surface_advance_buffer(&native_surface, &buffer_package);
 }
 
-TEST_F(MesaClientNativeSurfaceTest, basic_advance)
+TEST_F(MesaClientNativeSurfaceTest, BasicAdvance)
 {
     using namespace testing;
     MirBufferPackage buffer_package;
@@ -118,7 +118,7 @@
     native_surface.surface_advance_buffer(&native_surface, &buffer_package);
 }
 
-TEST_F(MesaClientNativeSurfaceTest, swapinterval_request)
+TEST_F(MesaClientNativeSurfaceTest, SwapintervalRequest)
 {
     using namespace testing;
 
@@ -132,7 +132,7 @@
     native_surface.set_swapinterval(1);
 }
 
-TEST_F(MesaClientNativeSurfaceTest, swapinterval_unsupported_request)
+TEST_F(MesaClientNativeSurfaceTest, SwapintervalUnsupportedRequest)
 {
     EXPECT_EQ(MIR_MESA_FALSE, native_surface.set_swapinterval(-1));
     EXPECT_EQ(MIR_MESA_TRUE, native_surface.set_swapinterval(0));
@@ -140,7 +140,7 @@
     EXPECT_EQ(MIR_MESA_FALSE, native_surface.set_swapinterval(2));
 }
 
-TEST_F(MesaClientNativeSurfaceTest, returns_error_on_advance_buffer_failure)
+TEST_F(MesaClientNativeSurfaceTest, ReturnsErrorOnAdvanceBufferFailure)
 {
     using namespace testing;
 
@@ -151,7 +151,7 @@
     EXPECT_THAT(native_surface.advance_buffer(&buffer_package), Eq(MIR_MESA_FALSE));
 }
 
-TEST_F(MesaClientNativeSurfaceTest, returns_error_on_get_parameters_failure)
+TEST_F(MesaClientNativeSurfaceTest, ReturnsErrorOnGetParametersFailure)
 {
     using namespace testing;
 
@@ -162,7 +162,7 @@
     EXPECT_THAT(native_surface.get_parameters(&surface_params), Eq(MIR_MESA_FALSE));
 }
 
-TEST_F(MesaClientNativeSurfaceTest, returns_error_on_set_swap_interval_failure)
+TEST_F(MesaClientNativeSurfaceTest, ReturnsErrorOnSetSwapIntervalFailure)
 {
     using namespace testing;
 

=== modified file 'tests/unit-tests/client/test_aging_buffer.cpp'
--- tests/unit-tests/client/test_aging_buffer.cpp	2014-11-05 03:25:04 +0000
+++ tests/unit-tests/client/test_aging_buffer.cpp	2014-11-24 02:31:01 +0000
@@ -65,7 +65,7 @@
     }
 };
 
-TEST(MirClientAgingBufferTest, buffer_age_starts_at_zero)
+TEST(MirClientAgingBufferTest, BufferAgeStartsAtZero)
 {
     using namespace testing;
 
@@ -74,7 +74,7 @@
     EXPECT_EQ(0u, buffer.age());
 }
 
-TEST(MirClientAgingBufferTest, buffer_age_set_to_one_on_submit)
+TEST(MirClientAgingBufferTest, BufferAgeSetToOneOnSubmit)
 {
     using namespace testing;
 
@@ -84,7 +84,7 @@
     EXPECT_EQ(1u, buffer.age());
 }
 
-TEST(MirClientAgingBufferTest, buffer_age_increases_on_increment)
+TEST(MirClientAgingBufferTest, BufferAgeIncreasesOnIncrement)
 {
     using namespace testing;
 
@@ -98,7 +98,7 @@
     }
 }
 
-TEST(MirClientAgingBufferTest, incrementing_age_has_no_effect_for_unsubmitted_buffer)
+TEST(MirClientAgingBufferTest, IncrementingAgeHasNoEffectForUnsubmittedBuffer)
 {
     using namespace testing;
 

=== modified file 'tests/unit-tests/client/test_android_client_buffer_factory.cpp'
--- tests/unit-tests/client/test_android_client_buffer_factory.cpp	2014-03-06 06:05:17 +0000
+++ tests/unit-tests/client/test_android_client_buffer_factory.cpp	2014-11-24 02:31:01 +0000
@@ -55,7 +55,7 @@
 
 };
 
-TEST_F(MirBufferFactoryTest, factory_sets_width_and_height)
+TEST_F(MirBufferFactoryTest, FactorySetsWidthAndHeight)
 {
     using namespace testing;
 

=== modified file 'tests/unit-tests/client/test_client.cpp'
--- tests/unit-tests/client/test_client.cpp	2014-10-29 06:21:10 +0000
+++ tests/unit-tests/client/test_client.cpp	2014-11-24 02:31:01 +0000
@@ -22,7 +22,7 @@
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 
-TEST(MirClientTest, mir_connection_is_valid_handles_invalid_pointers)
+TEST(MirClientTest, MirConnectionIsValidHandlesInvalidPointers)
 {
     using namespace testing;
 
@@ -37,7 +37,7 @@
     ASSERT_FALSE(mir_connection_is_valid(not_a_mir_connection_on_the_heap));
 }
 
-TEST(MirClientTest, mir_surface_is_valid_handles_invalid_pointers)
+TEST(MirClientTest, MirSurfaceIsValidHandlesInvalidPointers)
 {
     MirSurface* null_pointer = NULL;
     double stack_variable;

=== modified file 'tests/unit-tests/client/test_client_buffer_depository.cpp'
--- tests/unit-tests/client/test_client_buffer_depository.cpp	2014-10-29 06:21:10 +0000
+++ tests/unit-tests/client/test_client_buffer_depository.cpp	2014-11-24 02:31:01 +0000
@@ -120,7 +120,7 @@
     return value == arg;
 }
 
-TEST_F(MirBufferDepositoryTest, depository_sets_width_and_height)
+TEST_F(MirBufferDepositoryTest, DepositorySetsWidthAndHeight)
 {
     using namespace testing;
 
@@ -131,7 +131,7 @@
     depository.deposit_package(package, 8, size, pf);
 }
 
-TEST_F(MirBufferDepositoryTest, depository_new_deposit_changes_current_buffer)
+TEST_F(MirBufferDepositoryTest, DepositoryNewDepositChangesCurrentBuffer)
 {
     using namespace testing;
 
@@ -147,7 +147,7 @@
     EXPECT_NE(buffer1, buffer2);
 }
 
-TEST_F(MirBufferDepositoryTest, depository_sets_buffer_age_to_zero_for_new_buffer)
+TEST_F(MirBufferDepositoryTest, DepositorySetsBufferAgeToZeroForNewBuffer)
 {
     using namespace testing;
 
@@ -159,7 +159,7 @@
     EXPECT_EQ(0u, buffer1->age());
 }
 
-TEST_F(MirBufferDepositoryTest, just_sumbitted_buffer_has_age_1)
+TEST_F(MirBufferDepositoryTest, JustSumbittedBufferHasAge_1)
 {
     using namespace testing;
 
@@ -177,7 +177,7 @@
     EXPECT_EQ(1u, buffer1->age());
 }
 
-TEST_F(MirBufferDepositoryTest, submitting_buffer_ages_other_buffers)
+TEST_F(MirBufferDepositoryTest, SubmittingBufferAgesOtherBuffers)
 {
     using namespace testing;
 
@@ -204,7 +204,7 @@
     EXPECT_EQ(0u, buffer3->age());
 }
 
-TEST_F(MirBufferDepositoryTest, double_buffering_reaches_steady_state_age)
+TEST_F(MirBufferDepositoryTest, DoubleBufferingReachesSteadyStateAge)
 {
     using namespace testing;
 
@@ -233,7 +233,7 @@
     EXPECT_EQ(2u, buffer2->age());
 }
 
-TEST_F(MirBufferDepositoryTest, triple_buffering_reaches_steady_state_age)
+TEST_F(MirBufferDepositoryTest, TripleBufferingReachesSteadyStateAge)
 {
     using namespace testing;
 
@@ -273,7 +273,7 @@
     EXPECT_EQ(3u, buffer3->age());
 }
 
-TEST_F(MirBufferDepositoryTest, depository_destroys_old_buffers)
+TEST_F(MirBufferDepositoryTest, DepositoryDestroysOldBuffers)
 {
     using namespace testing;
     const int num_buffers = 3;
@@ -295,7 +295,7 @@
     EXPECT_TRUE(mock_factory->first_buffer_allocated_and_then_freed());
 }
 
-TEST_F(MirBufferDepositoryTest, depositing_packages_implicitly_submits_current_buffer)
+TEST_F(MirBufferDepositoryTest, DepositingPackagesImplicitlySubmitsCurrentBuffer)
 {
     using namespace testing;
     const int num_buffers = 3;
@@ -310,7 +310,7 @@
     depository.deposit_package(package2, 2, size, pf);
 }
 
-TEST_F(MirBufferDepositoryTest, depository_frees_buffers_after_reaching_capacity)
+TEST_F(MirBufferDepositoryTest, DepositoryFreesBuffersAfterReachingCapacity)
 {
     using namespace testing;
     std::shared_ptr<mcl::ClientBufferDepository> depository;
@@ -334,7 +334,7 @@
     }
 }
 
-TEST_F(MirBufferDepositoryTest, depository_caches_recently_seen_buffer)
+TEST_F(MirBufferDepositoryTest, DepositoryCachesRecentlySeenBuffer)
 {
     using namespace testing;
 
@@ -358,7 +358,7 @@
     depository.deposit_package(package3, 8, size, pf);
 }
 
-TEST_F(MirBufferDepositoryTest, depository_creates_new_buffer_for_different_id)
+TEST_F(MirBufferDepositoryTest, DepositoryCreatesNewBufferForDifferentId)
 {
     using namespace testing;
 
@@ -374,7 +374,7 @@
     depository.deposit_package(package2, 9, size, pf);
 }
 
-TEST_F(MirBufferDepositoryTest, depository_keeps_last_2_buffers_regardless_of_age)
+TEST_F(MirBufferDepositoryTest, DepositoryKeepsLast_2BuffersRegardlessOfAge)
 {
     using namespace testing;
 
@@ -389,7 +389,7 @@
     depository.deposit_package(package, 8, size, pf);
 }
 
-TEST_F(MirBufferDepositoryTest, depository_keeps_last_3_buffers_regardless_of_age)
+TEST_F(MirBufferDepositoryTest, DepositoryKeepsLast_3BuffersRegardlessOfAge)
 {
     using namespace testing;
 

=== modified file 'tests/unit-tests/client/test_client_display_conf.cpp'
--- tests/unit-tests/client/test_client_display_conf.cpp	2014-03-06 06:05:17 +0000
+++ tests/unit-tests/client/test_client_display_conf.cpp	2014-11-24 02:31:01 +0000
@@ -54,7 +54,7 @@
 }
 }
 
-TEST(TestDisplayConfiguration, configuration_storage)
+TEST(TestDisplayConfiguration, ConfigurationStorage)
 {
     mp::DisplayConfiguration protobuf_config;
     fill(protobuf_config.add_display_output());

=== modified file 'tests/unit-tests/client/test_client_mir_surface.cpp'
--- tests/unit-tests/client/test_client_mir_surface.cpp	2014-10-29 06:21:10 +0000
+++ tests/unit-tests/client/test_client_mir_surface.cpp	2014-11-24 02:31:01 +0000
@@ -496,7 +496,7 @@
 
 }
 
-TEST_F(MirClientSurfaceTest, client_buffer_created_on_surface_creation)
+TEST_F(MirClientSurfaceTest, ClientBufferCreatedOnSurfaceCreation)
 {
     using namespace testing;
 
@@ -506,7 +506,7 @@
     create_and_wait_for_surface_with(*client_comm_channel, mock_buffer_factory);
 }
 
-TEST_F(MirClientSurfaceTest, attributes_set_on_surface_creation)
+TEST_F(MirClientSurfaceTest, AttributesSetOnSurfaceCreation)
 {
     using namespace testing;
 
@@ -518,7 +518,7 @@
     }
 }
 
-TEST_F(MirClientSurfaceTest, create_wait_handle_really_blocks)
+TEST_F(MirClientSurfaceTest, CreateWaitHandleReallyBlocks)
 {
     using namespace testing;
 
@@ -534,7 +534,7 @@
     EXPECT_GE(std::chrono::steady_clock::now(), expected_end);
 }
 
-TEST_F(MirClientSurfaceTest, next_buffer_wait_handle_really_blocks)
+TEST_F(MirClientSurfaceTest, NextBufferWaitHandleReallyBlocks)
 {
     using namespace testing;
 
@@ -551,7 +551,7 @@
     EXPECT_GE(std::chrono::steady_clock::now(), expected_end);
 }
 
-TEST_F(MirClientSurfaceTest, client_buffer_created_on_next_buffer)
+TEST_F(MirClientSurfaceTest, ClientBufferCreatedOnNextBuffer)
 {
     using namespace testing;
 
@@ -568,7 +568,7 @@
     buffer_wait_handle->wait_for_all();
 }
 
-TEST_F(MirClientSurfaceTest, client_buffer_uses_ipc_message_from_server_on_create)
+TEST_F(MirClientSurfaceTest, ClientBufferUsesIpcMessageFromServerOnCreate)
 {
     using namespace testing;
 
@@ -578,7 +578,7 @@
                 BufferPackageMatches(mock_server_tool->server_package));
 }
 
-TEST_F(MirClientSurfaceTest, message_width_height_used_in_buffer_creation)
+TEST_F(MirClientSurfaceTest, MessageWidthHeightUsedInBufferCreation)
 {
     using namespace testing;
 
@@ -588,7 +588,7 @@
                 Eq(geom::Size(mock_server_tool->width_sent, mock_server_tool->height_sent)));
 }
 
-TEST_F(MirClientSurfaceTest, message_pf_used_in_buffer_creation)
+TEST_F(MirClientSurfaceTest, MessagePfUsedInBufferCreation)
 {
     using namespace testing;
 
@@ -599,7 +599,7 @@
 }
 
 // TODO: input fd is not checked in the test
-TEST_F(MirClientSurfaceTest, creates_input_thread_with_input_fd_when_delegate_specified)
+TEST_F(MirClientSurfaceTest, CreatesInputThreadWithInputFdWhenDelegateSpecified)
 {
     using namespace ::testing;
 
@@ -619,7 +619,7 @@
     surface.set_event_handler(&delegate);
 }
 
-TEST_F(MirClientSurfaceTest, does_not_create_input_thread_when_no_delegate_specified)
+TEST_F(MirClientSurfaceTest, DoesNotCreateInputThreadWhenNoDelegateSpecified)
 {
     using namespace ::testing;
 
@@ -636,7 +636,7 @@
     wait_handle->wait_for_all();
 }
 
-TEST_F(MirClientSurfaceTest, returns_current_buffer)
+TEST_F(MirClientSurfaceTest, ReturnsCurrentBuffer)
 {
     using namespace testing;
 
@@ -655,7 +655,7 @@
     EXPECT_THAT(next_buffer, Ne(creation_buffer));
 }
 
-TEST_F(MirClientSurfaceTest, surface_resizes_with_latest_buffer)
+TEST_F(MirClientSurfaceTest, SurfaceResizesWithLatestBuffer)
 {
     using namespace testing;
 
@@ -679,7 +679,7 @@
     EXPECT_THAT(after.height, Eq(new_height));
 }
 
-TEST_F(MirClientSurfaceTest, get_cpu_region_returns_correct_data)
+TEST_F(MirClientSurfaceTest, GetCpuRegionReturnsCorrectData)
 {
     using namespace testing;
 
@@ -716,14 +716,14 @@
     }
 }
 
-TEST_F(MirClientSurfaceTest, valid_surface_is_valid)
+TEST_F(MirClientSurfaceTest, ValidSurfaceIsValid)
 {
     auto const surface = create_and_wait_for_surface_with(*client_comm_channel, stub_buffer_factory);
 
     EXPECT_TRUE(MirSurface::is_valid(surface.get()));
 }
 
-TEST_F(MirClientSurfaceTest, configure_cursor_wait_handle_really_blocks)
+TEST_F(MirClientSurfaceTest, ConfigureCursorWaitHandleReallyBlocks)
 {
     using namespace testing;
 
@@ -743,7 +743,7 @@
     mir_cursor_configuration_destroy(cursor_config);
 }
 
-TEST_F(MirClientSurfaceTest, configure_wait_handle_really_blocks)
+TEST_F(MirClientSurfaceTest, ConfigureWaitHandleReallyBlocks)
 {
     using namespace testing;
 

=== modified file 'tests/unit-tests/client/test_client_platform.cpp'
--- tests/unit-tests/client/test_client_platform.cpp	2014-03-06 06:05:17 +0000
+++ tests/unit-tests/client/test_client_platform.cpp	2014-11-24 02:31:01 +0000
@@ -45,7 +45,7 @@
 #endif
 };
 
-TEST_F(ClientPlatformTest, platform_name)
+TEST_F(ClientPlatformTest, PlatformName)
 {
     auto platform = factory.create_client_platform(&context);
 #ifdef ANDROID
@@ -56,14 +56,14 @@
     EXPECT_EQ(type, platform->platform_type());
 }
 
-TEST_F(ClientPlatformTest, platform_creates)
+TEST_F(ClientPlatformTest, PlatformCreates)
 {
     auto platform = factory.create_client_platform(&context);
     auto buffer_factory = platform->create_buffer_factory();
     EXPECT_NE(buffer_factory.get(), (mcl::ClientBufferFactory*) NULL);
 }
 
-TEST_F(ClientPlatformTest, platform_creates_native_window)
+TEST_F(ClientPlatformTest, PlatformCreatesNativeWindow)
 {
     auto platform = factory.create_client_platform(&context);
     auto mock_client_surface = std::make_shared<mtd::MockClientSurface>();
@@ -71,7 +71,7 @@
     EXPECT_NE(*native_window, (EGLNativeWindowType) NULL);
 }
 
-TEST_F(ClientPlatformTest, platform_creates_egl_native_display)
+TEST_F(ClientPlatformTest, PlatformCreatesEglNativeDisplay)
 {
     auto platform = factory.create_client_platform(&context);
     auto native_display = platform->create_egl_native_display();

=== modified file 'tests/unit-tests/client/test_event_distributor.cpp'
--- tests/unit-tests/client/test_event_distributor.cpp	2014-10-29 06:21:10 +0000
+++ tests/unit-tests/client/test_event_distributor.cpp	2014-11-24 02:31:01 +0000
@@ -46,7 +46,7 @@
 
 }
 
-TEST_F(EventDistributorTest, calls_back_when_registered)
+TEST_F(EventDistributorTest, CallsBackWhenRegistered)
 {
     using namespace testing;
 
@@ -61,7 +61,7 @@
     event_distributor.handle_event(e);
 }
 
-TEST_F(EventDistributorTest, no_calls_back_after_unregistered)
+TEST_F(EventDistributorTest, NoCallsBackAfterUnregistered)
 {
     using namespace testing;
 
@@ -77,7 +77,7 @@
     event_distributor.handle_event(e);
 }
 
-TEST_F(EventDistributorTest, no_callback_on_callback_deregistration)
+TEST_F(EventDistributorTest, NoCallbackOnCallbackDeregistration)
 {
     using namespace testing;
     int reg_id2;
@@ -98,7 +98,7 @@
     event_distributor.handle_event(e);
 }
 
-TEST_F(EventDistributorTest, succeeds_with_thread_delete_unregister)
+TEST_F(EventDistributorTest, SucceedsWithThreadDeleteUnregister)
 {
     using namespace testing;
 

=== modified file 'tests/unit-tests/client/test_mir_connection.cpp'
--- tests/unit-tests/client/test_mir_connection.cpp	2014-03-27 06:27:59 +0000
+++ tests/unit-tests/client/test_mir_connection.cpp	2014-11-24 02:31:01 +0000
@@ -185,7 +185,7 @@
     std::shared_ptr<MirConnection> const connection;
 };
 
-TEST_F(MirConnectionTest, returns_correct_egl_native_display)
+TEST_F(MirConnectionTest, ReturnsCorrectEglNativeDisplay)
 {
     using namespace testing;
 
@@ -210,7 +210,7 @@
     return arg->magic() == magic;
 }
 
-TEST_F(MirConnectionTest, client_drm_auth_magic_calls_server_drm_auth_magic)
+TEST_F(MirConnectionTest, ClientDrmAuthMagicCallsServerDrmAuthMagic)
 {
     using namespace testing;
 
@@ -280,7 +280,7 @@
 
 }
 
-TEST_F(MirConnectionTest, populates_display_output_correctly_on_startup)
+TEST_F(MirConnectionTest, PopulatesDisplayOutputCorrectlyOnStartup)
 {
     using namespace testing;
 
@@ -319,7 +319,7 @@
     mcl::delete_config_storage(configuration);
 }
 
-TEST_F(MirConnectionTest, user_tries_to_configure_incorrectly)
+TEST_F(MirConnectionTest, UserTriesToConfigureIncorrectly)
 {
     using namespace testing;
 
@@ -364,7 +364,7 @@
     mcl::delete_config_storage(configuration);
 }
 
-TEST_F(MirConnectionTest, display_configuration_validation_succeeds_for_invalid_mode_in_disconnected_output)
+TEST_F(MirConnectionTest, DisplayConfigurationValidationSucceedsForInvalidModeInDisconnectedOutput)
 {
     using namespace testing;
 
@@ -385,7 +385,7 @@
     mcl::delete_config_storage(configuration);
 }
 
-TEST_F(MirConnectionTest, display_configuration_validation_uses_updated_configuration)
+TEST_F(MirConnectionTest, DisplayConfigurationValidationUsesUpdatedConfiguration)
 {
     using namespace testing;
 
@@ -422,7 +422,7 @@
     mcl::delete_config_storage(configuration);
 }
 
-TEST_F(MirConnectionTest, populates_pfs_correctly)
+TEST_F(MirConnectionTest, PopulatesPfsCorrectly)
 {
     using namespace testing;
 
@@ -445,7 +445,7 @@
     }
 }
 
-TEST_F(MirConnectionTest, valid_display_configure_sent)
+TEST_F(MirConnectionTest, ValidDisplayConfigureSent)
 {
     using namespace testing;
 
@@ -508,7 +508,7 @@
 
 }
 
-TEST_F(MirConnectionTest, focused_window_synthesises_unfocus_event_on_release)
+TEST_F(MirConnectionTest, FocusedWindowSynthesisesUnfocusEventOnRelease)
 {
     using namespace testing;
 
@@ -546,7 +546,7 @@
     EXPECT_TRUE(unfocused_received);
 }
 
-TEST_F(MirConnectionTest, unfocused_window_does_not_synthesise_unfocus_event_on_release)
+TEST_F(MirConnectionTest, UnfocusedWindowDoesNotSynthesiseUnfocusEventOnRelease)
 {
     using namespace testing;
 
@@ -595,7 +595,7 @@
 
 }
 
-TEST_F(MirConnectionTest, sets_extra_platform_data)
+TEST_F(MirConnectionTest, SetsExtraPlatformData)
 {
     using namespace testing;
     std::vector<int> const initial_data{0x66, 0x67, 0x68};

=== modified file 'tests/unit-tests/client/test_mir_prompt_session.cpp'
--- tests/unit-tests/client/test_mir_prompt_session.cpp	2014-10-29 06:21:10 +0000
+++ tests/unit-tests/client/test_mir_prompt_session.cpp	2014-11-24 02:31:01 +0000
@@ -139,7 +139,7 @@
 
 }
 
-TEST_F(MirPromptSessionTest, start_prompt_session)
+TEST_F(MirPromptSessionTest, StartPromptSession)
 {
     using namespace testing;
 
@@ -153,7 +153,7 @@
     prompt_session.start(__LINE__, null_callback_func, nullptr);
 }
 
-TEST_F(MirPromptSessionTest, stop_prompt_session)
+TEST_F(MirPromptSessionTest, StopPromptSession)
 {
     using namespace testing;
 
@@ -167,7 +167,7 @@
     prompt_session.stop(null_callback_func, nullptr);
 }
 
-TEST_F(MirPromptSessionTest, executes_callback_on_start)
+TEST_F(MirPromptSessionTest, ExecutesCallbackOnStart)
 {
     using namespace testing;
 
@@ -180,7 +180,7 @@
     prompt_session.start(__LINE__, mock_callback_func, &mock_cb)->wait_for_all();
 }
 
-TEST_F(MirPromptSessionTest, executes_callback_on_stop)
+TEST_F(MirPromptSessionTest, ExecutesCallbackOnStop)
 {
     using namespace testing;
 
@@ -193,7 +193,7 @@
     prompt_session.stop(mock_callback_func, &mock_cb)->wait_for_all();
 }
 
-TEST_F(MirPromptSessionTest, notifies_event_callback)
+TEST_F(MirPromptSessionTest, NotifiesEventCallback)
 {
     using namespace testing;
 

=== modified file 'tests/unit-tests/client/test_mir_screencast.cpp'
--- tests/unit-tests/client/test_mir_screencast.cpp	2014-03-11 16:19:27 +0000
+++ tests/unit-tests/client/test_mir_screencast.cpp	2014-11-24 02:31:01 +0000
@@ -261,7 +261,7 @@
 
 }
 
-TEST_F(MirScreencastTest, creates_screencast_on_construction)
+TEST_F(MirScreencastTest, CreatesScreencastOnConstruction)
 {
     using namespace testing;
 
@@ -278,7 +278,7 @@
         null_callback_func, nullptr};
 }
 
-TEST_F(MirScreencastTest, releases_screencast_on_release)
+TEST_F(MirScreencastTest, ReleasesScreencastOnRelease)
 {
     using namespace testing;
 
@@ -305,7 +305,7 @@
     screencast.release(null_callback_func, nullptr);
 }
 
-TEST_F(MirScreencastTest, requests_screencast_buffer_on_next_buffer)
+TEST_F(MirScreencastTest, RequestsScreencastBufferOnNextBuffer)
 {
     using namespace testing;
     uint32_t const screencast_id{77};
@@ -331,7 +331,7 @@
     screencast.next_buffer(null_callback_func, nullptr);
 }
 
-TEST_F(MirScreencastTest, executes_callback_on_creation)
+TEST_F(MirScreencastTest, ExecutesCallbackOnCreation)
 {
     using namespace testing;
 
@@ -349,7 +349,7 @@
     screencast.creation_wait_handle()->wait_for_all();
 }
 
-TEST_F(MirScreencastTest, executes_callback_on_release)
+TEST_F(MirScreencastTest, ExecutesCallbackOnRelease)
 {
     using namespace testing;
 
@@ -370,7 +370,7 @@
     wh->wait_for_all();
 }
 
-TEST_F(MirScreencastTest, executes_callback_on_next_buffer)
+TEST_F(MirScreencastTest, ExecutesCallbackOnNextBuffer)
 {
     using namespace testing;
 
@@ -391,7 +391,7 @@
     wh->wait_for_all();
 }
 
-TEST_F(MirScreencastTest, construction_throws_on_invalid_params)
+TEST_F(MirScreencastTest, ConstructionThrowsOnInvalidParams)
 {
     mir::geometry::Size const invalid_size{0, 0};
     mir::geometry::Rectangle const invalid_region{{0, 0}, {0, 0}};
@@ -427,7 +427,7 @@
     }, std::runtime_error);
 }
 
-TEST_F(MirScreencastTest, returns_correct_surface_parameters)
+TEST_F(MirScreencastTest, ReturnsCorrectSurfaceParameters)
 {
     MirScreencast screencast{
         default_region,
@@ -449,7 +449,7 @@
     EXPECT_EQ(mir_display_output_id_invalid, params.output_id);
 }
 
-TEST_F(MirScreencastTest, uses_buffer_message_from_server)
+TEST_F(MirScreencastTest, UsesBufferMessageFromServer)
 {
     using namespace testing;
 
@@ -481,7 +481,7 @@
     screencast.creation_wait_handle()->wait_for_all();
 }
 
-TEST_F(MirScreencastTest, returns_current_client_buffer)
+TEST_F(MirScreencastTest, ReturnsCurrentClientBuffer)
 {
     using namespace testing;
 
@@ -523,7 +523,7 @@
     EXPECT_EQ(client_buffer2, screencast.get_current_buffer());
 }
 
-TEST_F(MirScreencastTest, gets_egl_native_window)
+TEST_F(MirScreencastTest, GetsEglNativeWindow)
 {
     using namespace testing;
 
@@ -542,7 +542,7 @@
     EXPECT_EQ(StubEGLNativeWindowFactory::egl_native_window, egl_native_window);
 }
 
-TEST_F(MirScreencastTest, is_invalid_if_server_create_screencast_fails)
+TEST_F(MirScreencastTest, IsInvalidIfServerCreateScreencastFails)
 {
     using namespace testing;
 
@@ -562,7 +562,7 @@
     EXPECT_FALSE(screencast.valid());
 }
 
-TEST_F(MirScreencastTest, calls_callback_on_creation_failure)
+TEST_F(MirScreencastTest, CallsCallbackOnCreationFailure)
 {
     using namespace testing;
 

=== modified file 'tests/unit-tests/client/test_periodic_perf_report.cpp'
--- tests/unit-tests/client/test_periodic_perf_report.cpp	2014-11-03 11:07:02 +0000
+++ tests/unit-tests/client/test_periodic_perf_report.cpp	2014-11-24 02:31:01 +0000
@@ -51,7 +51,7 @@
 
 } // namespace
 
-TEST_F(PeriodicPerfReport, reports_the_right_numbers_at_full_speed)
+TEST_F(PeriodicPerfReport, ReportsTheRightNumbersAtFullSpeed)
 {
     int const fps = 50;
     int const nbuffers = 3;
@@ -93,7 +93,7 @@
     }
 }
 
-TEST_F(PeriodicPerfReport, reports_the_right_numbers_at_low_speed)
+TEST_F(PeriodicPerfReport, ReportsTheRightNumbersAtLowSpeed)
 {
     int const nbuffers = 3;
     std::chrono::microseconds const render_time = std::chrono::milliseconds(3);
@@ -123,7 +123,7 @@
     }
 }
 
-TEST_F(PeriodicPerfReport, reports_nothing_on_idle)
+TEST_F(PeriodicPerfReport, ReportsNothingOnIdle)
 {
     using namespace testing;
     EXPECT_CALL(report, display(_,_,_,_,_)).Times(0);

=== modified file 'tests/unit-tests/client/test_wait_handle.cpp'
--- tests/unit-tests/client/test_wait_handle.cpp	2014-10-29 06:21:10 +0000
+++ tests/unit-tests/client/test_wait_handle.cpp	2014-11-24 02:31:01 +0000
@@ -25,7 +25,7 @@
 int const arbitrary_number_of_events = 100;
 }
 
-TEST(WaitHandle, symmetric_synchronous)
+TEST(WaitHandle, SymmetricSynchronous)
 {
     MirWaitHandle w;
     for (int i = 0; i != arbitrary_number_of_events; ++i)
@@ -41,7 +41,7 @@
     EXPECT_TRUE(true);   // Failure would be hanging in the above loop
 }
 
-TEST(WaitHandle, asymmetric_synchronous)
+TEST(WaitHandle, AsymmetricSynchronous)
 {
     MirWaitHandle w;
 
@@ -75,7 +75,7 @@
     }
 }
 
-TEST(WaitHandle, symmetric_asynchronous)
+TEST(WaitHandle, SymmetricAsynchronous)
 {
     const int max = 100;
     MirWaitHandle in, out;
@@ -108,7 +108,7 @@
     }
 }
 
-TEST(WaitHandle, asymmetric_asynchronous)
+TEST(WaitHandle, AsymmetricAsynchronous)
 {
     const int max = 100;
     MirWaitHandle in, out;
@@ -144,7 +144,7 @@
     }
 }
 
-TEST(WaitHandle, many_waiters)
+TEST(WaitHandle, ManyWaiters)
 {
     const int max = 100;
     MirWaitHandle w;

=== modified file 'tests/unit-tests/compositor/test_buffer_queue.cpp'
--- tests/unit-tests/compositor/test_buffer_queue.cpp	2014-10-29 06:21:10 +0000
+++ tests/unit-tests/compositor/test_buffer_queue.cpp	2014-11-24 02:31:01 +0000
@@ -194,7 +194,7 @@
 }
 }
 
-TEST_F(BufferQueueTest, buffer_queue_of_one_is_supported)
+TEST_F(BufferQueueTest, BufferQueueOfOneIsSupported)
 {
     std::unique_ptr<mc::BufferQueue> q;
     ASSERT_NO_THROW(q = std::move(
@@ -232,7 +232,7 @@
     EXPECT_NO_THROW(next_request->release_buffer());
 }
 
-TEST_F(BufferQueueTest, buffer_queue_of_one_supports_resizing)
+TEST_F(BufferQueueTest, BufferQueueOfOneSupportsResizing)
 {
     mc::BufferQueue q(1, allocator, basic_properties, policy_factory);
 
@@ -257,20 +257,20 @@
     EXPECT_NO_THROW(q.compositor_release(q.compositor_acquire(this)));
 }
 
-TEST_F(BufferQueueTest, framedropping_is_disabled_by_default)
+TEST_F(BufferQueueTest, FramedroppingIsDisabledByDefault)
 {
     mc::BufferQueue bundle(2, allocator, basic_properties, policy_factory);
     EXPECT_THAT(bundle.framedropping_allowed(), Eq(false));
 }
 
-TEST_F(BufferQueueTest, throws_when_creating_with_invalid_num_buffers)
+TEST_F(BufferQueueTest, ThrowsWhenCreatingWithInvalidNumBuffers)
 {
     EXPECT_THROW(mc::BufferQueue a(0, allocator, basic_properties, policy_factory), std::logic_error);
     EXPECT_THROW(mc::BufferQueue a(-1, allocator, basic_properties, policy_factory), std::logic_error);
     EXPECT_THROW(mc::BufferQueue a(-10, allocator, basic_properties, policy_factory), std::logic_error);
 }
 
-TEST_F(BufferQueueTest, client_can_acquire_and_release_buffer)
+TEST_F(BufferQueueTest, ClientCanAcquireAndReleaseBuffer)
 {
     for (int nbuffers = 1; nbuffers <= max_nbuffers_to_test; ++nbuffers)
     {
@@ -282,7 +282,7 @@
     }
 }
 
-TEST_F(BufferQueueTest, client_can_acquire_buffers)
+TEST_F(BufferQueueTest, ClientCanAcquireBuffers)
 {
     for (int nbuffers = 2; nbuffers <= max_nbuffers_to_test; ++nbuffers)
     {
@@ -299,7 +299,7 @@
 }
 
 /* Regression test for LP: #1315302 */
-TEST_F(BufferQueueTest, clients_can_have_multiple_pending_completions)
+TEST_F(BufferQueueTest, ClientsCanHaveMultiplePendingCompletions)
 {
     int const nbuffers = 3;
     mc::BufferQueue q(nbuffers, allocator, basic_properties, policy_factory);
@@ -330,7 +330,7 @@
     handle2->release_buffer();
 }
 
-TEST_F(BufferQueueTest, compositor_acquires_frames_in_order_for_synchronous_client)
+TEST_F(BufferQueueTest, CompositorAcquiresFramesInOrderForSynchronousClient)
 {
     for (int nbuffers = 2; nbuffers <= max_nbuffers_to_test; ++nbuffers)
     {
@@ -359,7 +359,7 @@
     }
 }
 
-TEST_F(BufferQueueTest, framedropping_clients_never_block)
+TEST_F(BufferQueueTest, FramedroppingClientsNeverBlock)
 {
     for (int nbuffers = 2; nbuffers <= max_nbuffers_to_test; ++nbuffers)
     {
@@ -376,7 +376,7 @@
 }
 
 /* Regression test for LP: #1210042 */
-TEST_F(BufferQueueTest, clients_dont_recycle_startup_buffer)
+TEST_F(BufferQueueTest, ClientsDontRecycleStartupBuffer)
 {
     mc::BufferQueue q(3, allocator, basic_properties, policy_factory);
 
@@ -394,7 +394,7 @@
     q.compositor_release(comp_buffer);
 }
 
-TEST_F(BufferQueueTest, throws_on_out_of_order_client_release)
+TEST_F(BufferQueueTest, ThrowsOnOutOfOrderClientRelease)
 {
     for (int nbuffers = 3; nbuffers <= max_nbuffers_to_test; ++nbuffers)
     {
@@ -414,7 +414,7 @@
     }
 }
 
-TEST_F(BufferQueueTest, async_client_cycles_through_all_buffers)
+TEST_F(BufferQueueTest, AsyncClientCyclesThroughAllBuffers)
 {
     for (int nbuffers = 2; nbuffers <= max_nbuffers_to_test; ++nbuffers)
     {
@@ -449,7 +449,7 @@
     }
 }
 
-TEST_F(BufferQueueTest, compositor_can_acquire_and_release)
+TEST_F(BufferQueueTest, CompositorCanAcquireAndRelease)
 {
     for (int nbuffers = 1; nbuffers <= max_nbuffers_to_test; ++nbuffers)
     {
@@ -467,7 +467,7 @@
     }
 }
 
-TEST_F(BufferQueueTest, multiple_compositors_are_in_sync)
+TEST_F(BufferQueueTest, MultipleCompositorsAreInSync)
 {
     for (int nbuffers = 1; nbuffers <= max_nbuffers_to_test; ++nbuffers)
     {
@@ -489,7 +489,7 @@
     }
 }
 
-TEST_F(BufferQueueTest, compositor_acquires_frames_in_order)
+TEST_F(BufferQueueTest, CompositorAcquiresFramesInOrder)
 {
     for (int nbuffers = 2; nbuffers <= max_nbuffers_to_test; ++nbuffers)
     {
@@ -523,7 +523,7 @@
     }
 }
 
-TEST_F(BufferQueueTest, compositor_acquire_never_blocks_when_there_are_no_ready_buffers)
+TEST_F(BufferQueueTest, CompositorAcquireNeverBlocksWhenThereAreNoReadyBuffers)
 {
     for (int nbuffers = 1; nbuffers <= max_nbuffers_to_test; ++nbuffers)
     {
@@ -537,7 +537,7 @@
     }
 }
 
-TEST_F(BufferQueueTest, compositor_can_always_acquire_buffer)
+TEST_F(BufferQueueTest, CompositorCanAlwaysAcquireBuffer)
 {
     for (int nbuffers = 2; nbuffers <= max_nbuffers_to_test; ++nbuffers)
     {
@@ -575,7 +575,7 @@
     }
 }
 
-TEST_F(BufferQueueTest, compositor_acquire_recycles_latest_ready_buffer)
+TEST_F(BufferQueueTest, CompositorAcquireRecyclesLatestReadyBuffer)
 {
     for (int nbuffers = 1; nbuffers <= max_nbuffers_to_test; ++nbuffers)
     {
@@ -604,7 +604,7 @@
     }
 }
 
-TEST_F(BufferQueueTest, compositor_release_verifies_parameter)
+TEST_F(BufferQueueTest, CompositorReleaseVerifiesParameter)
 {
     for (int nbuffers = 1; nbuffers <= max_nbuffers_to_test; ++nbuffers)
     {
@@ -621,7 +621,7 @@
 }
 
 /* Regression test for LP#1270964 */
-TEST_F(BufferQueueTest, compositor_client_interleaved)
+TEST_F(BufferQueueTest, CompositorClientInterleaved)
 {
     mc::BufferQueue q(3, allocator, basic_properties, policy_factory);
 
@@ -643,7 +643,7 @@
     q.compositor_release(compositor_buffer);
 }
 
-TEST_F(BufferQueueTest, overlapping_compositors_get_different_frames)
+TEST_F(BufferQueueTest, OverlappingCompositorsGetDifferentFrames)
 {
     // This test simulates bypass behaviour
     for (int nbuffers = 2; nbuffers <= max_nbuffers_to_test; ++nbuffers)
@@ -681,7 +681,7 @@
     }
 }
 
-TEST_F(BufferQueueTest, snapshot_acquire_basic)
+TEST_F(BufferQueueTest, SnapshotAcquireBasic)
 {
     for (int nbuffers = 1; nbuffers <= max_nbuffers_to_test; ++nbuffers)
     {
@@ -695,7 +695,7 @@
     }
 }
 
-TEST_F(BufferQueueTest, callbacks_cant_happen_after_shutdown)
+TEST_F(BufferQueueTest, CallbacksCantHappenAfterShutdown)
 {
     mc::BufferQueue q(1, allocator, basic_properties, policy_factory);
 
@@ -704,7 +704,7 @@
     ASSERT_FALSE(client->has_acquired_buffer());
 }
 
-TEST_F(BufferQueueTest, callbacks_cant_happen_after_shutdown_with_snapshots)
+TEST_F(BufferQueueTest, CallbacksCantHappenAfterShutdownWithSnapshots)
 {
     mc::BufferQueue q(1, allocator, basic_properties, policy_factory);
 
@@ -716,7 +716,7 @@
     ASSERT_FALSE(client->has_acquired_buffer());
 }
 
-TEST_F(BufferQueueTest, snapshot_acquire_never_blocks)
+TEST_F(BufferQueueTest, SnapshotAcquireNeverBlocks)
 {
     for (int nbuffers = 1; nbuffers <= max_nbuffers_to_test; ++nbuffers)
     {
@@ -732,7 +732,7 @@
     }
 }
 
-TEST_F(BufferQueueTest, snapshot_release_verifies_parameter)
+TEST_F(BufferQueueTest, SnapshotReleaseVerifiesParameter)
 {
     for (int nbuffers = 2; nbuffers <= max_nbuffers_to_test; ++nbuffers)
     {
@@ -756,7 +756,7 @@
     }
 }
 
-TEST_F(BufferQueueTest, stress)
+TEST_F(BufferQueueTest, Stress)
 {
     for (int nbuffers = 2; nbuffers <= max_nbuffers_to_test; ++nbuffers)
     {
@@ -789,7 +789,7 @@
     }
 }
 
-TEST_F(BufferQueueTest, framedropping_clients_get_all_buffers)
+TEST_F(BufferQueueTest, FramedroppingClientsGetAllBuffers)
 {
     for (int nbuffers = 2; nbuffers <= max_nbuffers_to_test; ++nbuffers)
     {
@@ -810,7 +810,7 @@
     }
 }
 
-TEST_F(BufferQueueTest, waiting_clients_unblock_on_shutdown)
+TEST_F(BufferQueueTest, WaitingClientsUnblockOnShutdown)
 {
     for (int nbuffers = 2; nbuffers <= max_nbuffers_to_test; ++nbuffers)
     {
@@ -836,7 +836,7 @@
     }
 }
 
-TEST_F(BufferQueueTest, client_framerate_matches_compositor)
+TEST_F(BufferQueueTest, ClientFramerateMatchesCompositor)
 {
     for (int nbuffers = 2; nbuffers <= 3; nbuffers++)
     {
@@ -889,7 +889,7 @@
 }
 
 /* Regression test LP: #1241369 / LP: #1241371 */
-TEST_F(BufferQueueTest, slow_client_framerate_matches_compositor)
+TEST_F(BufferQueueTest, SlowClientFramerateMatchesCompositor)
 {
     /* BufferQueue can only satify this for nbuffers >= 3
      * since a client can only own up to nbuffers - 1 at any one time
@@ -950,7 +950,7 @@
     }
 }
 
-TEST_F(BufferQueueTest, resize_affects_client_acquires_immediately)
+TEST_F(BufferQueueTest, ResizeAffectsClientAcquiresImmediately)
 {
     for (int nbuffers = 1; nbuffers <= max_nbuffers_to_test; ++nbuffers)
     {
@@ -985,7 +985,7 @@
 }
 }
 
-TEST_F(BufferQueueTest, compositor_acquires_resized_frames)
+TEST_F(BufferQueueTest, CompositorAcquiresResizedFrames)
 {
     for (int nbuffers = 1; nbuffers <= max_nbuffers_to_test; ++nbuffers)
     {
@@ -1050,7 +1050,7 @@
     }
 }
 
-TEST_F(BufferQueueTest, uncomposited_client_swaps_when_policy_triggered)
+TEST_F(BufferQueueTest, UncompositedClientSwapsWhenPolicyTriggered)
 {
     for (int nbuffers = 2;
          nbuffers <= max_nbuffers_to_test;
@@ -1077,7 +1077,7 @@
     }
 }
 
-TEST_F(BufferQueueTest, partially_composited_client_swaps_when_policy_triggered)
+TEST_F(BufferQueueTest, PartiallyCompositedClientSwapsWhenPolicyTriggered)
 {
     for (int nbuffers = 2;
          nbuffers <= max_nbuffers_to_test;
@@ -1117,7 +1117,7 @@
     }
 }
 
-TEST_F(BufferQueueTest, with_single_buffer_compositor_acquires_resized_frames_eventually)
+TEST_F(BufferQueueTest, WithSingleBufferCompositorAcquiresResizedFramesEventually)
 {
     int const nbuffers{1};
     geom::Size const new_size{123,456};
@@ -1138,7 +1138,7 @@
     q.compositor_release(buf);
 }
 
-TEST_F(BufferQueueTest, double_buffered_client_is_not_blocked_prematurely)
+TEST_F(BufferQueueTest, DoubleBufferedClientIsNotBlockedPrematurely)
 {  // Regression test for LP: #1319765
     using namespace testing;
 
@@ -1161,7 +1161,7 @@
     handle->release_buffer();
 }
 
-TEST_F(BufferQueueTest, composite_on_demand_never_deadlocks_with_2_buffers)
+TEST_F(BufferQueueTest, CompositeOnDemandNeverDeadlocksWith_2Buffers)
 {  // Extended regression test for LP: #1319765
     using namespace testing;
 
@@ -1201,7 +1201,7 @@
 }
 
 /* Regression test for LP: #1306464 */
-TEST_F(BufferQueueTest, framedropping_client_acquire_does_not_block_when_no_available_buffers)
+TEST_F(BufferQueueTest, FramedroppingClientAcquireDoesNotBlockWhenNoAvailableBuffers)
 {
     using namespace testing;
 
@@ -1249,7 +1249,7 @@
     EXPECT_THAT(handle->has_acquired_buffer(), Eq(true));
 }
 
-TEST_F(BufferQueueTest, compositor_never_owns_client_buffers)
+TEST_F(BufferQueueTest, CompositorNeverOwnsClientBuffers)
 {
     static std::chrono::nanoseconds const time_for_client_to_acquire{1};
 
@@ -1307,7 +1307,7 @@
     }
 }
 
-TEST_F(BufferQueueTest, client_never_owns_compositor_buffers)
+TEST_F(BufferQueueTest, ClientNeverOwnsCompositorBuffers)
 {
     for (int nbuffers = 2; nbuffers <= max_nbuffers_to_test; ++nbuffers)
     {
@@ -1343,7 +1343,7 @@
  * http://code.launchpad.net/~albaguirre/mir/
  * alternative-switching-bundle-implementation/+merge/216606/comments/517048
  */
-TEST_F(BufferQueueTest, buffers_are_not_lost)
+TEST_F(BufferQueueTest, BuffersAreNotLost)
 {
     for (int nbuffers = 3; nbuffers <= max_nbuffers_to_test; ++nbuffers)
     {
@@ -1404,7 +1404,7 @@
 }
 
 /* FIXME (enabling this optimization breaks timing tests) */
-TEST_F(BufferQueueTest, DISABLED_synchronous_clients_only_get_two_real_buffers)
+TEST_F(BufferQueueTest, DISABLED_SynchronousClientsOnlyGetTwoRealBuffers)
 {
     for (int nbuffers = 2; nbuffers <= max_nbuffers_to_test; ++nbuffers)
     {
@@ -1446,7 +1446,7 @@
  * just before returning the acquired_buffer at the end of
  * BufferQueue::compositor_acquire().
  */
-TEST_F(BufferQueueTest, DISABLED_lp_1317801_regression_test)
+TEST_F(BufferQueueTest, DISABLED_Lp_1317801RegressionTest)
 {
     int const nbuffers = 3;
     mc::BufferQueue q(nbuffers, allocator, basic_properties, policy_factory);
@@ -1467,7 +1467,7 @@
     q.compositor_release(b);
 }
 
-TEST_F(BufferQueueTest, first_user_is_recorded)
+TEST_F(BufferQueueTest, FirstUserIsRecorded)
 {
     for (int nbuffers = 1; nbuffers <= max_nbuffers_to_test; ++nbuffers)
     {
@@ -1479,7 +1479,7 @@
     }
 }
 
-TEST_F(BufferQueueTest, gives_compositor_a_valid_buffer_after_dropping_old_buffers_without_clients)
+TEST_F(BufferQueueTest, GivesCompositorAValidBufferAfterDroppingOldBuffersWithoutClients)
 {
     int const nbuffers = 3;
     mc::BufferQueue q(nbuffers, allocator, basic_properties, policy_factory);
@@ -1490,7 +1490,7 @@
     ASSERT_THAT(comp, Ne(nullptr));
 }
 
-TEST_F(BufferQueueTest, gives_compositor_the_newest_buffer_after_dropping_old_buffers)
+TEST_F(BufferQueueTest, GivesCompositorTheNewestBufferAfterDroppingOldBuffers)
 {
     int const nbuffers = 3;
     mc::BufferQueue q(nbuffers, allocator, basic_properties, policy_factory);
@@ -1513,7 +1513,7 @@
     ASSERT_THAT(comp->id(), Eq(handle2->id()));
 }
 
-TEST_F(BufferQueueTest, gives_new_compositor_the_newest_buffer_after_dropping_old_buffers)
+TEST_F(BufferQueueTest, GivesNewCompositorTheNewestBufferAfterDroppingOldBuffers)
 {
     int const nbuffers = 3;
     void const* const new_compositor_id{&nbuffers};

=== modified file 'tests/unit-tests/compositor/test_buffer_stream.cpp'
--- tests/unit-tests/compositor/test_buffer_stream.cpp	2014-10-29 06:21:10 +0000
+++ tests/unit-tests/compositor/test_buffer_stream.cpp	2014-11-24 02:31:01 +0000
@@ -49,7 +49,7 @@
     std::shared_ptr<mtd::MockBufferBundle> mock_bundle;
 };
 
-TEST_F(BufferStreamTest, size_query)
+TEST_F(BufferStreamTest, SizeQuery)
 {
     geom::Size size{4, 5};
     mg::BufferProperties properties {size, mir_pixel_format_abgr_8888, mg::BufferUsage::hardware};
@@ -62,7 +62,7 @@
     EXPECT_EQ(size, returned_size);
 }
 
-TEST_F(BufferStreamTest, pixel_format_query)
+TEST_F(BufferStreamTest, PixelFormatQuery)
 {
     MirPixelFormat format{mir_pixel_format_abgr_8888};
     mg::BufferProperties properties {geom::Size{4, 5}, format, mg::BufferUsage::hardware};
@@ -75,7 +75,7 @@
     EXPECT_EQ(format, returned_pf);
 }
 
-TEST_F(BufferStreamTest, force_requests_to_complete)
+TEST_F(BufferStreamTest, ForceRequestsToComplete)
 {
     EXPECT_CALL(*mock_bundle, force_requests_to_complete())
         .Times(2);  // Once explcit, once on destruction
@@ -84,7 +84,7 @@
     buffer_stream.force_requests_to_complete();
 }
 
-TEST_F(BufferStreamTest, requests_are_completed_before_destruction)
+TEST_F(BufferStreamTest, RequestsAreCompletedBeforeDestruction)
 {
     EXPECT_CALL(*mock_bundle, force_requests_to_complete())
         .Times(1);
@@ -92,37 +92,37 @@
     mc::BufferStreamSurfaces buffer_stream(mock_bundle);
 }
 
-TEST_F(BufferStreamTest, get_buffer_for_compositor_handles_resources)
-{
-    using namespace testing;
-
-    EXPECT_CALL(*mock_bundle, compositor_acquire(_))
-        .Times(1)
-        .WillOnce(Return(mock_buffer));
-    EXPECT_CALL(*mock_bundle, compositor_release(_))
-        .Times(1);
-
-    mc::BufferStreamSurfaces buffer_stream(mock_bundle);
-
-    buffer_stream.lock_compositor_buffer(0);
-}
-
-TEST_F(BufferStreamTest, get_buffer_for_compositor_can_lock)
-{
-    using namespace testing;
-
-    EXPECT_CALL(*mock_bundle, compositor_acquire(_))
-        .Times(1)
-        .WillOnce(Return(mock_buffer));
-    EXPECT_CALL(*mock_bundle, compositor_release(_))
-        .Times(1);
-
-    mc::BufferStreamSurfaces buffer_stream(mock_bundle);
-
-    buffer_stream.lock_compositor_buffer(0);
-}
-
-TEST_F(BufferStreamTest, get_buffer_for_client_releases_resources)
+TEST_F(BufferStreamTest, GetBufferForCompositorHandlesResources)
+{
+    using namespace testing;
+
+    EXPECT_CALL(*mock_bundle, compositor_acquire(_))
+        .Times(1)
+        .WillOnce(Return(mock_buffer));
+    EXPECT_CALL(*mock_bundle, compositor_release(_))
+        .Times(1);
+
+    mc::BufferStreamSurfaces buffer_stream(mock_bundle);
+
+    buffer_stream.lock_compositor_buffer(0);
+}
+
+TEST_F(BufferStreamTest, GetBufferForCompositorCanLock)
+{
+    using namespace testing;
+
+    EXPECT_CALL(*mock_bundle, compositor_acquire(_))
+        .Times(1)
+        .WillOnce(Return(mock_buffer));
+    EXPECT_CALL(*mock_bundle, compositor_release(_))
+        .Times(1);
+
+    mc::BufferStreamSurfaces buffer_stream(mock_bundle);
+
+    buffer_stream.lock_compositor_buffer(0);
+}
+
+TEST_F(BufferStreamTest, GetBufferForClientReleasesResources)
 {
     std::mutex mutex;
     std::condition_variable cv;
@@ -172,7 +172,7 @@
     }
 }
 
-TEST_F(BufferStreamTest, allow_framedropping_device)
+TEST_F(BufferStreamTest, AllowFramedroppingDevice)
 {
     EXPECT_CALL(*mock_bundle, allow_framedropping(true))
         .Times(1);
@@ -181,7 +181,7 @@
     buffer_stream.allow_framedropping(true);
 }
 
-TEST_F(BufferStreamTest, resizes_bundle)
+TEST_F(BufferStreamTest, ResizesBundle)
 {
     geom::Size const new_size{66, 77};
 

=== modified file 'tests/unit-tests/compositor/test_compositing_screencast.cpp'
--- tests/unit-tests/compositor/test_compositing_screencast.cpp	2014-10-29 06:21:10 +0000
+++ tests/unit-tests/compositor/test_compositing_screencast.cpp	2014-11-24 02:31:01 +0000
@@ -194,7 +194,7 @@
 
 }
 
-TEST_F(CompositingScreencastTest, produces_different_session_ids)
+TEST_F(CompositingScreencastTest, ProducesDifferentSessionIds)
 {
     std::unordered_set<mf::ScreencastSessionId> session_ids;
 
@@ -207,7 +207,7 @@
     }
 }
 
-TEST_F(CompositingScreencastTest, throws_on_creation_with_invalid_params)
+TEST_F(CompositingScreencastTest, ThrowsOnCreationWithInvalidParams)
 {
     std::unordered_set<mf::ScreencastSessionId> session_ids;
     geom::Size invalid_size{0, 0};
@@ -218,20 +218,20 @@
     EXPECT_THROW(screencast.create_session(default_region, default_size, mir_pixel_format_invalid), std::runtime_error);
 }
 
-TEST_F(CompositingScreencastTest, throws_on_capture_with_invalid_session_id)
+TEST_F(CompositingScreencastTest, ThrowsOnCaptureWithInvalidSessionId)
 {
     mf::ScreencastSessionId const invalid_session_id{10};
     EXPECT_THROW(screencast.capture(invalid_session_id), std::logic_error);
 }
 
-TEST_F(CompositingScreencastTest, throws_on_capture_with_destroyed_session_id)
+TEST_F(CompositingScreencastTest, ThrowsOnCaptureWithDestroyedSessionId)
 {
     auto session_id = screencast.create_session(default_region, default_size, default_pixel_format);
     screencast.destroy_session(session_id);
     EXPECT_THROW(screencast.capture(session_id), std::logic_error);
 }
 
-TEST_F(CompositingScreencastTest, captures_by_compositing_with_provided_region)
+TEST_F(CompositingScreencastTest, CapturesByCompositingWithProvidedRegion)
 {
     using namespace testing;
 
@@ -259,7 +259,7 @@
     screencast_local.capture(session_id);
 }
 
-TEST_F(CompositingScreencastTest, allocates_and_uses_buffer_with_provided_size)
+TEST_F(CompositingScreencastTest, AllocatesAndUsesBufferWithProvidedSize)
 {
     using namespace testing;
 
@@ -283,7 +283,7 @@
     ASSERT_EQ(&stub_buffer, buffer.get());
 }
 
-TEST_F(CompositingScreencastTest, uses_one_buffer_per_session)
+TEST_F(CompositingScreencastTest, UsesOneBufferPerSession)
 {
     using namespace testing;
 
@@ -314,7 +314,7 @@
     ASSERT_EQ(&stub_buffer2, buffer2.get());
 }
 
-TEST_F(CompositingScreencastTest, registers_and_unregisters_from_scene)
+TEST_F(CompositingScreencastTest, RegistersAndUnregistersFromScene)
 {
     using namespace testing;
     NiceMock<mtd::MockScene> mock_scene;

=== modified file 'tests/unit-tests/compositor/test_default_display_buffer_compositor.cpp'
--- tests/unit-tests/compositor/test_default_display_buffer_compositor.cpp	2014-11-16 09:50:19 +0000
+++ tests/unit-tests/compositor/test_default_display_buffer_compositor.cpp	2014-11-24 02:31:01 +0000
@@ -113,7 +113,7 @@
 };
 }
 
-TEST_F(DefaultDisplayBufferCompositor, render)
+TEST_F(DefaultDisplayBufferCompositor, Render)
 {
     using namespace testing;
     EXPECT_CALL(mock_renderer, render(IsEmpty()))
@@ -132,7 +132,7 @@
     compositor.composite(make_scene_elements({}));
 }
 
-TEST_F(DefaultDisplayBufferCompositor, skips_scene_that_should_not_be_rendered)
+TEST_F(DefaultDisplayBufferCompositor, SkipsSceneThatShouldNotBeRendered)
 {
     using namespace testing;
     
@@ -188,7 +188,7 @@
     }));
 }
 
-TEST_F(DefaultDisplayBufferCompositor, optimization_skips_composition)
+TEST_F(DefaultDisplayBufferCompositor, OptimizationSkipsComposition)
 {
     using namespace testing;
     auto report = std::make_shared<mtd::MockCompositorReport>();
@@ -214,7 +214,7 @@
     compositor.composite(make_scene_elements({}));
 }
 
-TEST_F(DefaultDisplayBufferCompositor, calls_renderer_in_sequence)
+TEST_F(DefaultDisplayBufferCompositor, CallsRendererInSequence)
 {
     using namespace testing;
     Sequence render_seq;
@@ -243,7 +243,7 @@
     }));
 }
 
-TEST_F(DefaultDisplayBufferCompositor, optimization_toggles_seamlessly)
+TEST_F(DefaultDisplayBufferCompositor, OptimizationTogglesSeamlessly)
 {
     using namespace testing;
     ON_CALL(display_buffer, view_area())
@@ -298,7 +298,7 @@
     fullscreen->set_buffer({});  // Avoid GMock complaining about false leaks
 }
 
-TEST_F(DefaultDisplayBufferCompositor, occluded_surfaces_are_not_rendered)
+TEST_F(DefaultDisplayBufferCompositor, OccludedSurfacesAreNotRendered)
 {
     using namespace testing;
     EXPECT_CALL(display_buffer, view_area())
@@ -356,7 +356,7 @@
 };