Merge remote-tracking branch 'johnny/master'

1 files changed, 38 insertions, 8 deletions

diff --git a/test/controller-test.c b/test/controller-test.c
index fb13000..c271756 100644
--- a/test/controller-test.c
+++ b/test/controller-test.c
@@ -1,3 +1,33 @@
+/*
+ * Copyright (c) 2021, Johnny Richard
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * 3. Neither the name of the copyright holder nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
 #define MUNIT_ENABLE_ASSERT_ALIASES
 #include "controller.h"
 #include <munit/munit.h>
@@ -17,11 +47,11 @@ press_and_release_up(const MunitParameter params[], void* fixture)
 
     SDL_Event event = an_event(SDL_KEYDOWN, SDLK_UP);
     controller_update(&ctrl, &event);
-    assert_true(ctrl.up);
+    assert_true(controller_is_up_pressed(&ctrl));
 
     event = an_event(SDL_KEYUP, SDLK_UP);
     controller_update(&ctrl, &event);
-    assert_false(ctrl.up);
+    assert_false(controller_is_up_pressed(&ctrl));
     return MUNIT_OK;
 }
 
@@ -32,11 +62,11 @@ press_and_release_down(const MunitParameter params[], void* fixture)
 
     SDL_Event event = an_event(SDL_KEYDOWN, SDLK_DOWN);
     controller_update(&ctrl, &event);
-    assert_true(ctrl.down);
+    assert_true(controller_is_down_pressed(&ctrl));
 
     event = an_event(SDL_KEYUP, SDLK_DOWN);
     controller_update(&ctrl, &event);
-    assert_false(ctrl.down);
+    assert_false(controller_is_down_pressed(&ctrl));
     return MUNIT_OK;
 }
 
@@ -47,11 +77,11 @@ press_and_release_right(const MunitParameter params[], void* fixture)
 
     SDL_Event event = an_event(SDL_KEYDOWN, SDLK_RIGHT);
     controller_update(&ctrl, &event);
-    assert_true(ctrl.right);
+    assert_true(controller_is_right_pressed(&ctrl));
 
     event = an_event(SDL_KEYUP, SDLK_RIGHT);
     controller_update(&ctrl, &event);
-    assert_false(ctrl.right);
+    assert_false(controller_is_right_pressed(&ctrl));
     return MUNIT_OK;
 }
 
@@ -62,11 +92,11 @@ press_and_release_left(const MunitParameter params[], void* fixture)
 
     SDL_Event event = an_event(SDL_KEYDOWN, SDLK_LEFT);
     controller_update(&ctrl, &event);
-    assert_true(ctrl.left);
+    assert_true(controller_is_left_pressed(&ctrl));
 
     event = an_event(SDL_KEYUP, SDLK_LEFT);
     controller_update(&ctrl, &event);
-    assert_false(ctrl.left);
+    assert_false(controller_is_left_pressed(&ctrl));
     return MUNIT_OK;
 }