← Back to branch summary

~andreas-pokorny/mir/unregitser-fd-handler

~andreas-pokorny/mir/unregitser-fd-handler

« back to all changes in this revision

Viewing changes to tests/unit-tests/test_asio_main_loop.cpp

Committer: Tarmac
Author(s): Andreas Pokorny
Date: 2014-05-19 22:10:04 UTC
mfrom: (1604.4.14 drop-dynamic-ptr-cast-in-input-configuration)
Revision ID: tarmac-20140519221004-xyppxjtupj6yctg0

Removing InputDispatcherConfiguration and the by-pass of the InputTranslator using a dynamic cast that was only necessary until lp~andreas-pokorny:extended-input-dispatcher lands

The contents of the former InputDispatcherConfiguration have been moved to DefaultServerConfiguration. En passent the nested input relay was dropped too. The mir::input::InputDispatcher interface is now used directly. Note: Event filtering still works like before.

Approved by PS Jenkins bot, Alexandros Frantzis, Alan Griffiths, Chris Halse Rogers.

files added:
include/test/mir_test_doubles/stub_input_enumerator.h

src/server/input/android/common_input_thread.cpp

src/server/input/android/common_input_thread.h

src/server/input/null_input_dispatcher.cpp

src/server/input/null_input_dispatcher.h

src/server/input/null_input_targeter.cpp

src/server/input/null_input_targeter.h

files removed:
include/server/mir/input/input_dispatcher_configuration.h

include/test/mir_test_doubles/null_event_filter.h

src/server/input/android/input_dispatcher_configuration.cpp

src/server/input/android/input_dispatcher_configuration.h

src/server/input/nested_input_relay.cpp

src/server/input/nested_input_relay.h

src/server/input/null_input_dispatcher_configuration.cpp

src/server/input/null_input_dispatcher_configuration.h

files modified:
3rd_party/android-input/android/frameworks/base/services/input/InputDispatcher.cpp

3rd_party/android-input/android/frameworks/base/services/input/InputDispatcher.h

include/server/mir/default_server_configuration.h

include/server/mir/input/android/default_android_input_configuration.h

include/server/mir/input/input_configuration.h

include/server/mir/server_configuration.h

include/test/mir_test/fake_event_hub_input_configuration.h

include/test/mir_test_framework/input_testing_server_configuration.h

include/test/mir_test_framework/stubbed_server_configuration.h

src/server/display_server.cpp

src/server/graphics/default_configuration.cpp

src/server/graphics/nested/nested_display.cpp

src/server/graphics/nested/nested_display.h

src/server/graphics/nested/nested_output.cpp

src/server/graphics/nested/nested_output.h

src/server/graphics/nested/nested_platform.cpp

src/server/graphics/nested/nested_platform.h

src/server/input/CMakeLists.txt

src/server/input/android/CMakeLists.txt

src/server/input/android/android_input_registrar.cpp

src/server/input/android/android_input_registrar.h

src/server/input/android/android_input_target_enumerator.cpp

src/server/input/android/android_input_target_enumerator.h

src/server/input/android/default_android_input_configuration.cpp

src/server/input/default_configuration.cpp

src/server/input/nested_input_configuration.cpp

src/server/input/nested_input_configuration.h

tests/acceptance-tests/test_custom_input_dispatcher.cpp

tests/acceptance-tests/test_server_shutdown.cpp

tests/integration-tests/input/android/test_android_cursor_listener.cpp

tests/integration-tests/input/android/test_android_input_manager.cpp

tests/integration-tests/input/test_nested_input.cpp

tests/integration-tests/session_management.cpp

tests/mir_test_doubles/fake_event_hub_input_configuration.cpp

tests/mir_test_framework/input_testing_server_options.cpp

tests/mir_test_framework/stubbed_server_configuration.cpp

tests/unit-tests/graphics/nested/test_nested_display.cpp

tests/unit-tests/graphics/nested/test_nested_platform.cpp

tests/unit-tests/input/android/test_android_input_registrar.cpp

tests/unit-tests/test_asio_main_loop.cpp

Show diffs side-by-side

added added

removed removed

tests/unit-tests/test_asio_main_loop.cpp

341

341

342

342

{

343

343

std::unique_lock<decltype(checkpoint_mutex)> lock(checkpoint_mutex);

344

ASSERT_TRUE(checkpoint.wait_for(lock, std::chrono::milliseconds{10}, [&hit_checkpoint]() { return hit_checkpoint; }));

344

ASSERT_TRUE(checkpoint.wait_for(lock, std::chrono::milliseconds{100}, [&hit_checkpoint]() { return hit_checkpoint; }));

345

345

}

346

346

347

347

auto alarm = ml.notify_in(std::chrono::milliseconds{10}, [this]

349

349

wait.notify_ready();

350

350

});

351

351

352

EXPECT_NO_THROW(wait.wait_until_ready(std::chrono::milliseconds{50}));

352

EXPECT_NO_THROW(wait.wait_until_ready(std::chrono::milliseconds{500}));

353

353

354

354

ml.stop();

355

355

// Main loop should be stopped now

Older »