7694 - baremetal: asserting bg color in tests
This commit is contained in:
Kartik Agaram
parent
8f34dfd1e0
commit
1d7aae96f0
|
|
@ -84,8 +84,11 @@ fn draw-grapheme screen: (addr screen), g: grapheme, x: int, y: int, color: int,
|
|||
var g2/edx: grapheme <- copy g
|
||||
copy-to *dest-grapheme, g2
|
||||
var dest-color/eax: (addr int) <- get dest-cell, color
|
||||
var color2/edx: grapheme <- copy color
|
||||
copy-to *dest-color, color2
|
||||
var src-color/edx: int <- copy color
|
||||
copy-to *dest-color, src-color
|
||||
dest-color <- get dest-cell, background-color
|
||||
src-color <- copy background-color
|
||||
copy-to *dest-color, src-color
|
||||
}
|
||||
|
||||
fn screen-cell-index screen-on-stack: (addr screen), x: int, y: int -> _/ecx: int {
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
# Tab characters (that translate into multiple screen cells) not supported.
|
||||
|
||||
fn check-screen-row screen: (addr screen), y: int, expected: (addr array byte), msg: (addr array byte) {
|
||||
check-screen-row-from screen, y, 0/row, expected, msg
|
||||
check-screen-row-from screen, y, 0/y, expected, msg
|
||||
}
|
||||
|
||||
fn check-screen-row-from screen-on-stack: (addr screen), x: int, y: int, expected: (addr array byte), msg: (addr array byte) {
|
||||
|
|
@ -150,19 +150,112 @@ fn check-screen-row-in-color-from screen-on-stack: (addr screen), fg: int, y: in
|
|||
}
|
||||
}
|
||||
|
||||
fn check-screen-row-in-background-color screen: (addr screen), bg: int, y: int, expected: (addr array byte), msg: (addr array byte) {
|
||||
check-screen-row-in-background-color-from screen, bg, y, 0/x, expected, msg
|
||||
}
|
||||
|
||||
fn check-screen-row-in-background-color-from screen-on-stack: (addr screen), bg: int, y: int, x: int, expected: (addr array byte), msg: (addr array byte) {
|
||||
var screen/esi: (addr screen) <- copy screen-on-stack
|
||||
var idx/ecx: int <- screen-cell-index screen, y, x
|
||||
# compare 'expected' with the screen contents starting at 'idx', grapheme by grapheme
|
||||
var e: (stream byte 0x100)
|
||||
var e-addr/edx: (addr stream byte) <- address e
|
||||
write e-addr, expected
|
||||
{
|
||||
var done?/eax: boolean <- stream-empty? e-addr
|
||||
compare done?, 0
|
||||
break-if-!=
|
||||
var _g/eax: grapheme <- screen-grapheme-at-idx screen, idx
|
||||
var g/ebx: grapheme <- copy _g
|
||||
var _expected-grapheme/eax: grapheme <- read-grapheme e-addr
|
||||
var expected-grapheme/edi: grapheme <- copy _expected-grapheme
|
||||
$check-screen-row-in-background-color-from:compare-cells: {
|
||||
# if expected-grapheme is space, null grapheme is also ok
|
||||
{
|
||||
compare expected-grapheme, 0x20
|
||||
break-if-!=
|
||||
compare g, 0
|
||||
break-if-= $check-screen-row-in-background-color-from:compare-cells
|
||||
}
|
||||
# if expected-grapheme is space, a different background-color is ok
|
||||
{
|
||||
compare expected-grapheme, 0x20
|
||||
break-if-!=
|
||||
var background-color/eax: int <- screen-background-color-at-idx screen, idx
|
||||
compare background-color, bg
|
||||
break-if-!= $check-screen-row-in-background-color-from:compare-cells
|
||||
}
|
||||
# compare graphemes
|
||||
$check-screen-row-in-background-color-from:compare-graphemes: {
|
||||
# if (g == expected-grapheme) print "."
|
||||
compare g, expected-grapheme
|
||||
{
|
||||
break-if-!=
|
||||
draw-text-wrapping-right-then-down-from-cursor-over-full-screen 0/screen, ".", 3/fg/cyan, 0/bg
|
||||
break $check-screen-row-in-background-color-from:compare-graphemes
|
||||
}
|
||||
# otherwise print an error
|
||||
count-test-failure
|
||||
draw-text-wrapping-right-then-down-from-cursor-over-full-screen 0/screen, msg, 3/fg/cyan, 0/bg
|
||||
draw-text-wrapping-right-then-down-from-cursor-over-full-screen 0/screen, ": expected '", 3/fg/cyan, 0/bg
|
||||
draw-grapheme-at-cursor 0/screen, expected-grapheme, 3/cyan, 0/bg
|
||||
move-cursor-rightward-and-downward 0/screen, 0/xmin, 0x80/xmax=screen-width
|
||||
draw-text-wrapping-right-then-down-from-cursor-over-full-screen 0/screen, "' at (", 3/fg/cyan, 0/bg
|
||||
draw-int32-hex-wrapping-right-then-down-from-cursor-over-full-screen 0/screen, x, 3/fg/cyan, 0/bg
|
||||
draw-text-wrapping-right-then-down-from-cursor-over-full-screen 0/screen, ", ", 3/fg/cyan, 0/bg
|
||||
draw-int32-hex-wrapping-right-then-down-from-cursor-over-full-screen 0/screen, y, 3/fg/cyan, 0/bg
|
||||
draw-text-wrapping-right-then-down-from-cursor-over-full-screen 0/screen, ") but observed '", 3/fg/cyan, 0/bg
|
||||
draw-grapheme-at-cursor 0/screen, g, 3/cyan, 0/bg
|
||||
move-cursor-rightward-and-downward 0/screen, 0/xmin, 0x80/xmax=screen-width
|
||||
draw-text-wrapping-right-then-down-from-cursor-over-full-screen 0/screen, "'", 3/fg/cyan, 0/bg
|
||||
}
|
||||
$check-screen-row-in-background-color-from:compare-background-colors: {
|
||||
var background-color/eax: int <- screen-background-color-at-idx screen, idx
|
||||
compare bg, background-color
|
||||
{
|
||||
break-if-!=
|
||||
draw-text-wrapping-right-then-down-from-cursor-over-full-screen 0/screen, ".", 3/fg/cyan, 0/bg
|
||||
break $check-screen-row-in-background-color-from:compare-background-colors
|
||||
}
|
||||
# otherwise print an error
|
||||
count-test-failure
|
||||
draw-text-wrapping-right-then-down-from-cursor-over-full-screen 0/screen, msg, 3/fg/cyan, 0/bg
|
||||
draw-text-wrapping-right-then-down-from-cursor-over-full-screen 0/screen, ": expected '", 3/fg/cyan, 0/bg
|
||||
draw-grapheme-at-cursor 0/screen, expected-grapheme, 3/cyan, 0/bg
|
||||
move-cursor-rightward-and-downward 0/screen, 0/xmin, 0x80/xmax=screen-width
|
||||
draw-text-wrapping-right-then-down-from-cursor-over-full-screen 0/screen, "' at (", 3/fg/cyan, 0/bg
|
||||
draw-int32-hex-wrapping-right-then-down-from-cursor-over-full-screen 0/screen, x, 3/fg/cyan, 0/bg
|
||||
draw-text-wrapping-right-then-down-from-cursor-over-full-screen 0/screen, ", ", 3/fg/cyan, 0/bg
|
||||
draw-int32-hex-wrapping-right-then-down-from-cursor-over-full-screen 0/screen, y, 3/fg/cyan, 0/bg
|
||||
draw-text-wrapping-right-then-down-from-cursor-over-full-screen 0/screen, ") in background-color ", 3/fg/cyan, 0/bg
|
||||
draw-int32-hex-wrapping-right-then-down-from-cursor-over-full-screen 0/screen, bg, 3/fg/cyan, 0/bg
|
||||
draw-text-wrapping-right-then-down-from-cursor-over-full-screen 0/screen, " but observed background-color ", 3/fg/cyan, 0/bg
|
||||
draw-int32-hex-wrapping-right-then-down-from-cursor-over-full-screen 0/screen, background-color, 3/fg/cyan, 0/bg
|
||||
}
|
||||
}
|
||||
idx <- increment
|
||||
increment x
|
||||
loop
|
||||
}
|
||||
}
|
||||
|
||||
fn test-draw-single-grapheme {
|
||||
var screen-on-stack: screen
|
||||
var screen/esi: (addr screen) <- address screen-on-stack
|
||||
initialize-screen screen, 5, 4
|
||||
var c/eax: grapheme <- copy 0x61/a
|
||||
draw-grapheme screen, c, 0/x, 0/y, 1/color, 0/bg
|
||||
check-screen-row screen, 0/row, "a", "F - test-draw-single-grapheme" # top-left corner of the screen
|
||||
draw-grapheme screen, c, 0/x, 0/y, 1/fg, 2/bg
|
||||
check-screen-row screen, 0/y, "a", "F - test-draw-single-grapheme" # top-left corner of the screen
|
||||
check-screen-row-in-color screen, 1/fg, 0/y, "a", "F - test-draw-single-grapheme-fg"
|
||||
check-screen-row-in-background-color screen, 2/bg, 0/y, "a", "F - test-draw-single-grapheme-bg"
|
||||
}
|
||||
|
||||
fn test-draw-multiple-graphemes {
|
||||
var screen-on-stack: screen
|
||||
var screen/esi: (addr screen) <- address screen-on-stack
|
||||
initialize-screen screen, 0x10/rows, 4/cols
|
||||
draw-text-wrapping-right-then-down-from-cursor-over-full-screen screen, "Hello, 世界", 1/fg, 0/bg
|
||||
check-screen-row screen, 0/screen, "Hello, 世界", "F - test-draw-multiple-graphemes"
|
||||
draw-text-wrapping-right-then-down-from-cursor-over-full-screen screen, "Hello, 世界", 1/fg, 2/bg
|
||||
check-screen-row screen, 0/y, "Hello, 世界", "F - test-draw-multiple-graphemes"
|
||||
check-screen-row-in-color screen, 1/fg, 0/y, "Hello, 世界", "F - test-draw-multiple-graphemes-fg"
|
||||
check-screen-row-in-background-color screen, 2/bg, 0/y, "Hello, 世界", "F - test-draw-multiple-graphemes-bg"
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue