From 94fec62ba519e3e846e02327a3ece0e6bcaa016b Mon Sep 17 00:00:00 2001 From: David Robillard Date: Wed, 11 Jan 2023 11:10:19 -0500 Subject: Spread tests around the screen This makes it unlikely for tests to be completely obscured, which should hopefully make things a bit more consistent and reliable, especially when running all of the tests in parallel. It also makes things a bit less visually confusing. --- test/test_cairo.c | 3 ++- test/test_gl.c | 3 ++- test/test_gl_free_unrealized.c | 3 ++- test/test_gl_hints.c | 3 ++- test/test_local_copy_paste.c | 3 ++- test/test_realize.c | 3 ++- test/test_redisplay.c | 3 ++- test/test_remote_copy_paste.c | 4 ++-- test/test_show_hide.c | 3 ++- test/test_size.c | 7 ++++--- test/test_stub.c | 3 ++- test/test_stub_hints.c | 3 ++- test/test_timer.c | 3 ++- test/test_update.c | 3 ++- test/test_view.c | 3 ++- test/test_vulkan.c | 3 ++- 16 files changed, 34 insertions(+), 19 deletions(-) (limited to 'test') diff --git a/test/test_cairo.c b/test/test_cairo.c index 70f0f11..c64a9eb 100644 --- a/test/test_cairo.c +++ b/test/test_cairo.c @@ -65,7 +65,8 @@ main(int argc, char** argv) puglSetHandle(test.view, &test); puglSetBackend(test.view, puglCairoBackend()); puglSetEventFunc(test.view, onEvent); - puglSetSizeHint(test.view, PUGL_DEFAULT_SIZE, 512, 512); + puglSetSizeHint(test.view, PUGL_DEFAULT_SIZE, 256, 256); + puglSetPosition(test.view, 128, 896); puglShow(test.view, PUGL_SHOW_RAISE); // Drive event loop until the view gets exposed diff --git a/test/test_gl.c b/test/test_gl.c index 6b28619..a53854a 100644 --- a/test/test_gl.c +++ b/test/test_gl.c @@ -84,7 +84,8 @@ main(int argc, char** argv) puglSetHandle(test.view, &test); puglSetBackend(test.view, puglGlBackend()); puglSetEventFunc(test.view, onEvent); - puglSetSizeHint(test.view, PUGL_DEFAULT_SIZE, 512, 512); + puglSetSizeHint(test.view, PUGL_DEFAULT_SIZE, 256, 256); + puglSetPosition(test.view, 384, 896); puglShow(test.view, PUGL_SHOW_RAISE); // Enter OpenGL context as if setting things up diff --git a/test/test_gl_free_unrealized.c b/test/test_gl_free_unrealized.c index 04a23db..2f59395 100644 --- a/test/test_gl_free_unrealized.c +++ b/test/test_gl_free_unrealized.c @@ -49,7 +49,8 @@ main(int argc, char** argv) puglSetBackend(test.view, puglGlBackend()); puglSetHandle(test.view, &test); puglSetEventFunc(test.view, onEvent); - puglSetSizeHint(test.view, PUGL_DEFAULT_SIZE, 512, 512); + puglSetSizeHint(test.view, PUGL_DEFAULT_SIZE, 256, 256); + puglSetPosition(test.view, 640, 896); assert(!puglGetVisible(test.view)); diff --git a/test/test_gl_hints.c b/test/test_gl_hints.c index 9a0b168..e0114ff 100644 --- a/test/test_gl_hints.c +++ b/test/test_gl_hints.c @@ -34,7 +34,8 @@ main(void) puglSetWindowTitle(view, "Pugl OpenGL Hints Test"); puglSetBackend(view, puglGlBackend()); puglSetEventFunc(view, onEvent); - puglSetSizeHint(view, PUGL_DEFAULT_SIZE, 512, 512); + puglSetSizeHint(view, PUGL_DEFAULT_SIZE, 256, 256); + puglSetPosition(view, 128, 128); // Check invalid cases assert(puglSetViewHint(view, PUGL_CONTEXT_API, PUGL_DONT_CARE) == diff --git a/test/test_local_copy_paste.c b/test/test_local_copy_paste.c index 4a42652..5918418 100644 --- a/test/test_local_copy_paste.c +++ b/test/test_local_copy_paste.c @@ -132,7 +132,8 @@ main(int argc, char** argv) puglSetBackend(app.view, puglStubBackend()); puglSetHandle(app.view, &app); puglSetEventFunc(app.view, onEvent); - puglSetSizeHint(app.view, PUGL_DEFAULT_SIZE, 512, 512); + puglSetSizeHint(app.view, PUGL_DEFAULT_SIZE, 256, 256); + puglSetPosition(app.view, 384, 128); // Create and show window assert(!puglRealize(app.view)); diff --git a/test/test_realize.c b/test/test_realize.c index 4bdafae..fcf106e 100644 --- a/test/test_realize.c +++ b/test/test_realize.c @@ -72,7 +72,8 @@ main(int argc, char** argv) puglSetBackend(test.view, puglStubBackend()); assert(puglRealize(test.view) == PUGL_BAD_CONFIGURATION); - puglSetSizeHint(test.view, PUGL_DEFAULT_SIZE, 512, 512); + puglSetSizeHint(test.view, PUGL_DEFAULT_SIZE, 256, 256); + puglSetPosition(test.view, 640, 128); // Create initially invisible window assert(!puglRealize(test.view)); diff --git a/test/test_redisplay.c b/test/test_redisplay.c index 0b5e5f0..fe3bc6b 100644 --- a/test/test_redisplay.c +++ b/test/test_redisplay.c @@ -113,7 +113,8 @@ main(int argc, char** argv) puglSetBackend(test.view, puglStubBackend()); puglSetHandle(test.view, &test); puglSetEventFunc(test.view, onEvent); - puglSetSizeHint(test.view, PUGL_DEFAULT_SIZE, 512, 512); + puglSetSizeHint(test.view, PUGL_DEFAULT_SIZE, 256, 256); + puglSetPosition(test.view, 896, 128); // Create and show window assert(!puglRealize(test.view)); diff --git a/test/test_remote_copy_paste.c b/test/test_remote_copy_paste.c index e1cb0c9..2fe55fe 100644 --- a/test/test_remote_copy_paste.c +++ b/test/test_remote_copy_paste.c @@ -148,7 +148,7 @@ main(int argc, char** argv) puglSetHandle(app.copierView, &app); puglSetEventFunc(app.copierView, onCopierEvent); puglSetSizeHint(app.copierView, PUGL_DEFAULT_SIZE, 256, 256); - puglSetPosition(app.copierView, 128, 128); + puglSetPosition(app.copierView, 640, 896); // Set up paster view app.pasterView = puglNewView(app.world); @@ -158,7 +158,7 @@ main(int argc, char** argv) puglSetHandle(app.pasterView, &app); puglSetEventFunc(app.pasterView, onPasterEvent); puglSetSizeHint(app.pasterView, PUGL_DEFAULT_SIZE, 256, 256); - puglSetPosition(app.pasterView, 512, 512); + puglSetPosition(app.pasterView, 896, 896); // Create and show both views assert(!puglShow(app.copierView, PUGL_SHOW_RAISE)); diff --git a/test/test_show_hide.c b/test/test_show_hide.c index 7b410f4..2709daf 100644 --- a/test/test_show_hide.c +++ b/test/test_show_hide.c @@ -114,7 +114,8 @@ main(int argc, char** argv) puglSetBackend(test.view, puglStubBackend()); puglSetHandle(test.view, &test); puglSetEventFunc(test.view, onEvent); - puglSetSizeHint(test.view, PUGL_DEFAULT_SIZE, 512, 512); + puglSetSizeHint(test.view, PUGL_DEFAULT_SIZE, 256, 256); + puglSetPosition(test.view, 128, 384); // Create initially invisible window assert(!puglRealize(test.view)); diff --git a/test/test_size.c b/test/test_size.c index 895b4d0..3c58619 100644 --- a/test/test_size.c +++ b/test/test_size.c @@ -65,9 +65,9 @@ onEvent(PuglView* view, const PuglEvent* event) int main(int argc, char** argv) { - static const PuglSpan minSize = 256; - static const PuglSpan defaultSize = 512; - static const PuglSpan maxSize = 1024; + static const PuglSpan minSize = 128; + static const PuglSpan defaultSize = 256; + static const PuglSpan maxSize = 512; PuglTest test = {puglNewWorld(PUGL_PROGRAM, 0), NULL, @@ -88,6 +88,7 @@ main(int argc, char** argv) puglSetSizeHint(test.view, PUGL_MAX_SIZE, maxSize, maxSize); puglSetSizeHint(test.view, PUGL_MIN_ASPECT, 1, 1); puglSetSizeHint(test.view, PUGL_MAX_ASPECT, 1, 1); + puglSetPosition(test.view, 384, 384); // Create and show window assert(!puglRealize(test.view)); diff --git a/test/test_stub.c b/test/test_stub.c index 26affbe..2badfb2 100644 --- a/test/test_stub.c +++ b/test/test_stub.c @@ -51,7 +51,8 @@ main(int argc, char** argv) puglSetHandle(test.view, &test); puglSetBackend(test.view, puglStubBackend()); puglSetEventFunc(test.view, onEvent); - puglSetSizeHint(test.view, PUGL_DEFAULT_SIZE, 512, 512); + puglSetSizeHint(test.view, PUGL_DEFAULT_SIZE, 256, 256); + puglSetPosition(test.view, 384, 896); puglShow(test.view, PUGL_SHOW_RAISE); // Drive event loop until the view gets exposed diff --git a/test/test_stub_hints.c b/test/test_stub_hints.c index 09205b3..b59c590 100644 --- a/test/test_stub_hints.c +++ b/test/test_stub_hints.c @@ -34,7 +34,8 @@ main(void) puglSetWindowTitle(view, "Pugl Stub Hints Test"); puglSetBackend(view, puglStubBackend()); puglSetEventFunc(view, onEvent); - puglSetSizeHint(view, PUGL_DEFAULT_SIZE, 512, 512); + puglSetSizeHint(view, PUGL_DEFAULT_SIZE, 256, 256); + puglSetPosition(view, 640, 384); // Check invalid cases assert(puglSetViewHint(view, (PuglViewHint)-1, 0) == PUGL_BAD_PARAMETER); diff --git a/test/test_timer.c b/test/test_timer.c index cda5be9..8400843 100644 --- a/test/test_timer.c +++ b/test/test_timer.c @@ -111,7 +111,8 @@ main(int argc, char** argv) puglSetBackend(test.view, puglStubBackend()); puglSetHandle(test.view, &test); puglSetEventFunc(test.view, onEvent); - puglSetSizeHint(test.view, PUGL_DEFAULT_SIZE, 512, 512); + puglSetSizeHint(test.view, PUGL_DEFAULT_SIZE, 256, 256); + puglSetPosition(test.view, 896, 384); // Create and show window assert(!puglRealize(test.view)); diff --git a/test/test_update.c b/test/test_update.c index 26abd51..1fc10d1 100644 --- a/test/test_update.c +++ b/test/test_update.c @@ -89,7 +89,8 @@ main(int argc, char** argv) puglSetBackend(test.view, puglStubBackend()); puglSetHandle(test.view, &test); puglSetEventFunc(test.view, onEvent); - puglSetSizeHint(test.view, PUGL_DEFAULT_SIZE, 512, 512); + puglSetSizeHint(test.view, PUGL_DEFAULT_SIZE, 256, 256); + puglSetPosition(test.view, 128, 640); // Create and show window assert(!puglRealize(test.view)); diff --git a/test/test_view.c b/test/test_view.c index ad51794..e329a93 100644 --- a/test/test_view.c +++ b/test/test_view.c @@ -71,7 +71,8 @@ main(int argc, char** argv) puglSetBackend(test.view, puglStubBackend()); puglSetHandle(test.view, &test); puglSetEventFunc(test.view, onEvent); - puglSetSizeHint(test.view, PUGL_DEFAULT_SIZE, 512, 512); + puglSetSizeHint(test.view, PUGL_DEFAULT_SIZE, 256, 256); + puglSetPosition(test.view, 384, 640); // Create and show window assert(!puglRealize(test.view)); diff --git a/test/test_vulkan.c b/test/test_vulkan.c index 44eabf0..ec7732d 100644 --- a/test/test_vulkan.c +++ b/test/test_vulkan.c @@ -171,7 +171,8 @@ main(int argc, char** argv) puglSetHandle(test.view, &test); puglSetBackend(test.view, puglVulkanBackend()); puglSetEventFunc(test.view, onEvent); - puglSetSizeHint(test.view, PUGL_DEFAULT_SIZE, 512, 512); + puglSetSizeHint(test.view, PUGL_DEFAULT_SIZE, 256, 256); + puglSetPosition(test.view, 640, 640); assert(!puglRealize(test.view)); // Create Vulkan surface for window -- cgit v1.2.1