From 2f9f9c25dc11a8849702f2ef8acefefcb8466a9e Mon Sep 17 00:00:00 2001 From: Nick Bowler Date: Wed, 22 Jan 2014 20:14:16 -0500 Subject: [PATCH] tests: Add info on what each MOO2 image is actually testing. Each MOO2 test image was selected to test a particular feature of the image decoder. That information was in the old regress.zsh script but for some reason got dropped in the conversion. Add that information back as a TAP diagnostic line for each image. --- tests/moo2-logo.tap | 4 +++- tests/moo2-mainmenu.tap | 5 ++++- tests/moo2-monster.tap | 3 ++- tests/moo2-ships.tap | 3 ++- tests/moo2-starbg.tap | 3 ++- 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/tests/moo2-logo.tap b/tests/moo2-logo.tap index 64524bf..da43d57 100755 --- a/tests/moo2-logo.tap +++ b/tests/moo2-logo.tap @@ -2,7 +2,7 @@ # # 2ooM: The Master of Orion II Reverse Engineering Project # Test correct decoding of various images in logo.lbx -# Copyright © 2013 Nick Bowler +# Copyright © 2013-2014 Nick Bowler # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -27,10 +27,12 @@ plan_ 7 command_ok_ "unpacking logo.lbx" $LBXTOOL -xf "$MOO2DATA/logo.lbx" +diag_ "Test image with transparency and embedded palette" command_ok_ "decoding logo.lbx.000" \ $LBXIMG -F pam --output-prefix test0 -df logo.lbx.000 dx_check_pam_md5 "test0.000.pam" e51c564aa638dc62dd1fd79e6f6cc375 +diag_ "Test image with animation and embedded palette" command_ok_ "decoding logo.lbx.001" \ $LBXIMG -F pam --output-prefix test1 -df logo.lbx.001 dx_check_pam_md5 "test1.000.pam" 13a60ede277eebe8fec69f03c5cb5843 diff --git a/tests/moo2-mainmenu.tap b/tests/moo2-mainmenu.tap index 168c815..59a42f3 100755 --- a/tests/moo2-mainmenu.tap +++ b/tests/moo2-mainmenu.tap @@ -2,7 +2,7 @@ # # 2ooM: The Master of Orion II Reverse Engineering Project # Test correct decoding of various images in mainmenu.lbx -# Copyright © 2013 Nick Bowler +# Copyright © 2013-2014 Nick Bowler # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -28,15 +28,18 @@ plan_ 10 command_ok_ "unpacking fonts.lbx" $LBXTOOL -xf "$MOO2DATA/fonts.lbx" command_ok_ "unpacking mainmenu.lbx" $LBXTOOL -xf "$MOO2DATA/mainmenu.lbx" +diag_ "Test image with embedded palette" command_ok_ "decoding mainmenu.lbx.021" \ $LBXIMG -F pam --output-prefix test0 -df mainmenu.lbx.021 dx_check_pam_md5 "test0.000.pam" 848e33a0addc6e9acdc4fee6cbd56639 +diag_ "Test image with external palette" command_ok_ "decoding mainmenu.lbx.007" \ $LBXIMG -F pam --output-prefix test1 --palette fonts.lbx.006 \ -df mainmenu.lbx.007 dx_check_pam_md5 "test1.000.pam" f301ffcc1a2faa3a0aa68514784012ec +diag_ "Test image with animation and external palette" command_ok_ "decoding mainmenu.lbx.000" \ $LBXIMG -F pam --output-prefix test2 --palette fonts.lbx.006 \ -df mainmenu.lbx.000 diff --git a/tests/moo2-monster.tap b/tests/moo2-monster.tap index 337daab..f0155c6 100755 --- a/tests/moo2-monster.tap +++ b/tests/moo2-monster.tap @@ -2,7 +2,7 @@ # # 2ooM: The Master of Orion II Reverse Engineering Project # Test correct decoding of various images in monster.lbx -# Copyright © 2013 Nick Bowler +# Copyright © 2013-2014 Nick Bowler # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -28,6 +28,7 @@ plan_ 6 command_ok_ "unpacking fonts.lbx" $LBXTOOL -xf "$MOO2DATA/fonts.lbx" command_ok_ "unpacking monster.lbx" $LBXTOOL -xf "$MOO2DATA/monster.lbx" +diag_ "Test image with animation, transparency and non-zero chunk size" command_ok_ "decoding monster.lbx.007" \ $LBXIMG -F pam --output-prefix test0 --palette fonts.lbx.004 \ -df monster.lbx.007 --override monster.lbx.014 diff --git a/tests/moo2-ships.tap b/tests/moo2-ships.tap index 7a64d88..b923862 100755 --- a/tests/moo2-ships.tap +++ b/tests/moo2-ships.tap @@ -2,7 +2,7 @@ # # 2ooM: The Master of Orion II Reverse Engineering Project # Test correct decoding of various images in ships.lbx -# Copyright © 2013 Nick Bowler +# Copyright © 2013-2014 Nick Bowler # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -28,6 +28,7 @@ plan_ 4 command_ok_ "unpacking fonts.lbx" $LBXTOOL -xf "$MOO2DATA/fonts.lbx" command_ok_ "unpacking ships.lbx" $LBXTOOL -xf "$MOO2DATA/ships.lbx" +diag_ "Test image with external palette and override" command_ok_ "decoding ships.lbx.042" \ $LBXIMG -F pam --output-prefix test0 --palette fonts.lbx.012 \ -df ships.lbx.042 --override ships.lbx.049 diff --git a/tests/moo2-starbg.tap b/tests/moo2-starbg.tap index bb33372..107f170 100755 --- a/tests/moo2-starbg.tap +++ b/tests/moo2-starbg.tap @@ -2,7 +2,7 @@ # # 2ooM: The Master of Orion II Reverse Engineering Project # Test correct decoding of various images in starbg.lbx -# Copyright © 2013 Nick Bowler +# Copyright © 2013-2014 Nick Bowler # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -28,6 +28,7 @@ plan_ 4 command_ok_ "unpacking fonts.lbx" $LBXTOOL -xf "$MOO2DATA/fonts.lbx" command_ok_ "unpacking starbg.lbx" $LBXTOOL -xf "$MOO2DATA/starbg.lbx" +diag_ "Test image with raw flag" command_ok_ "decoding starbg.lbx.009" \ $LBXIMG -F pam --output-prefix test0 --palette fonts.lbx.005 \ -df starbg.lbx.009 -- 2.43.0