Unit tests: fixup Fixes to display state transitions

Fux unit tests after fb80620 (Fixes to display state transitions).
sailfishos · Nov 14, 2013 · d548f70 · d548f70
1 parent 8f660b0
commit d548f70
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/tests/ut/ut_display_filter.c b/tests/ut/ut_display_filter.c
@@ -189,8 +189,9 @@ START_TEST (ut_check_display_state_filter)
 
 	ck_assert_int_eq(GPOINTER_TO_INT(input2_filtered),
 			 data[_i].expected_output);
-	ck_assert_int_eq(GPOINTER_TO_INT(display_state_pipe.cached_data),
-			 data[_i].expected_output);
+	// The ugly hack has been commented out in display_state_filter()
+	//ck_assert_int_eq(GPOINTER_TO_INT(display_state_pipe.cached_data),
+	//		 data[_i].expected_output);
 }
 END_TEST
 

diff --git a/tests/ut/ut_display_stm.c b/tests/ut/ut_display_stm.c
@@ -300,8 +300,8 @@ START_TEST (ut_check_on_to_off_no_lipstick)
 	ck_assert_int_eq(stub__wakelock_suspend_allowed_wanted,
 			 UT_TRISTATE_UNDEF);
 
-	ck_assert_int_eq(dstate, STM_STAY_POWER_ON);
-	ck_assert_int_eq(stm_curr, MCE_DISPLAY_ON);
+	ck_assert_int_eq(dstate, STM_STAY_LOGICAL_OFF);
+	ck_assert_int_eq(stm_curr, MCE_DISPLAY_OFF);
 	ck_assert(!stub__wakelock_locked("mce_display_on"));
 }
 END_TEST
@@ -500,6 +500,7 @@ START_TEST (ut_check_disable_suspend_while_off)
 	dstate = STM_STAY_POWER_OFF;
 
 	stm_lipstick_on_dbus = true;
+	stm_enable_rendering_needed = false;
 	waitfb.thread = (pthread_t)-1;
 	waitfb.suspended = true;
 	renderer_ui_state = RENDERER_DISABLED;