From a802f0cedc7b5580d746f46ae62fcf8074ae3c49 Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Thu, 2 Mar 2017 04:41:24 -0800 Subject: 3749 --- html/082scenario_screen.cc.html | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'html/082scenario_screen.cc.html') diff --git a/html/082scenario_screen.cc.html b/html/082scenario_screen.cc.html index 78485464..a4fb9b03 100644 --- a/html/082scenario_screen.cc.html +++ b/html/082scenario_screen.cc.html @@ -224,10 +224,10 @@ if ('onhashchange' in window) { 161 if (curr.name == "assume-screen") { 162 curr.name = "new-fake-screen"; 163 if (!curr.products.empty()) { -164 raise << result.name << ": 'assume-screen' has no products\n" << end(); +164 raise << result.name << ": 'assume-screen' has no products\n" << end(); 165 } 166 else if (!starts_with(result.name, "scenario_")) { -167 raise << result.name << ": 'assume-screen' can't be called here, only in scenarios\n" << end(); +167 raise << result.name << ": 'assume-screen' can't be called here, only in scenarios\n" << end(); 168 } 169 else { 170 assert(curr.products.empty()); @@ -251,11 +251,11 @@ if ('onhashchange' in window) { 188 :(before "End Primitive Recipe Checks") 189 case SCREEN_SHOULD_CONTAIN: { 190 if (SIZE(inst.ingredients) != 1) { -191 raise << maybe(get(Recipe, r).name) << "'screen-should-contain' requires exactly one ingredient, but got '" << inst.original_string << "'\n" << end(); +191 raise << maybe(get(Recipe, r).name) << "'screen-should-contain' requires exactly one ingredient, but got '" << inst.original_string << "'\n" << end(); 192 break; 193 } 194 if (!is_literal_text(inst.ingredients.at(0))) { -195 raise << maybe(get(Recipe, r).name) << "first ingredient of 'screen-should-contain' should be a literal string, but got '" << inst.ingredients.at(0).original_string << "'\n" << end(); +195 raise << maybe(get(Recipe, r).name) << "first ingredient of 'screen-should-contain' should be a literal string, but got '" << inst.ingredients.at(0).original_string << "'\n" << end(); 196 break; 197 } 198 break; @@ -275,15 +275,15 @@ if ('onhashchange' in window) { 212 :(before "End Primitive Recipe Checks") 213 case SCREEN_SHOULD_CONTAIN_IN_COLOR: { 214 if (SIZE(inst.ingredients) != 2) { -215 raise << maybe(get(Recipe, r).name) << "'screen-should-contain-in-color' requires exactly two ingredients, but got '" << inst.original_string << "'\n" << end(); +215 raise << maybe(get(Recipe, r).name) << "'screen-should-contain-in-color' requires exactly two ingredients, but got '" << inst.original_string << "'\n" << end(); 216 break; 217 } 218 if (!is_mu_number(inst.ingredients.at(0))) { -219 raise << maybe(get(Recipe, r).name) << "first ingredient of 'screen-should-contain-in-color' should be a number (color code), but got '" << inst.ingredients.at(0).original_string << "'\n" << end(); +219 raise << maybe(get(Recipe, r).name) << "first ingredient of 'screen-should-contain-in-color' should be a number (color code), but got '" << inst.ingredients.at(0).original_string << "'\n" << end(); 220 break; 221 } 222 if (!is_literal_text(inst.ingredients.at(1))) { -223 raise << maybe(get(Recipe, r).name) << "second ingredient of 'screen-should-contain-in-color' should be a literal string, but got '" << inst.ingredients.at(1).original_string << "'\n" << end(); +223 raise << maybe(get(Recipe, r).name) << "second ingredient of 'screen-should-contain-in-color' should be a literal string, but got '" << inst.ingredients.at(1).original_string << "'\n" << end(); 224 break; 225 } 226 break; @@ -329,7 +329,7 @@ if ('onhashchange' in window) { 266 cursor.skip_whitespace_and_comments(); 267 if (cursor.at_end()) break; 268 if (cursor.get() != '.') { -269 raise << Current_scenario->name << ": each row of the expected screen should start with a '.'\n" << end(); +269 raise << Current_scenario->name << ": each row of the expected screen should start with a '.'\n" << end(); 270 if (!Scenario_testing_scenario) Passed = false; 271 return; 272 } @@ -346,12 +346,12 @@ if ('onhashchange' in window) { 283 // contents match but color is off 284 if (Current_scenario && !Scenario_testing_scenario) { 285 // genuine test in a .mu file -286 raise << "\nF - " << Current_scenario->name << ": expected screen location (" << row << ", " << column << ", address " << addr << ", value " << no_scientific(get_or_insert(Memory, addr)) << ") to be in color " << color << " instead of " << no_scientific(get_or_insert(Memory, addr+cell_color_offset)) << "\n" << end(); +286 raise << "\nF - " << Current_scenario->name << ": expected screen location (" << row << ", " << column << ", address " << addr << ", value " << no_scientific(get_or_insert(Memory, addr)) << ") to be in color " << color << " instead of " << no_scientific(get_or_insert(Memory, addr+cell_color_offset)) << "\n" << end(); 287 dump_screen(); 288 } 289 else { 290 // just testing check_screen -291 raise << "expected screen location (" << row << ", " << column << ") to be in color " << color << " instead of " << no_scientific(get_or_insert(Memory, addr+cell_color_offset)) << '\n' << end(); +291 raise << "expected screen location (" << row << ", " << column << ") to be in color " << color << " instead of " << no_scientific(get_or_insert(Memory, addr+cell_color_offset)) << '\n' << end(); 292 } 293 if (!Scenario_testing_scenario) Passed = false; 294 return; @@ -374,25 +374,25 @@ if ('onhashchange' in window) { 311 if (color != -1) color_phrase << " in color " << color; 312 if (Current_scenario && !Scenario_testing_scenario) { 313 // genuine test in a .mu file -314 raise << "\nF - " << Current_scenario->name << ": expected screen location (" << row << ", " << column << ") to contain " << curr << expected_pretty << color_phrase.str() << " instead of " << no_scientific(get_or_insert(Memory, addr)) << actual_pretty << '\n' << end(); +314 raise << "\nF - " << Current_scenario->name << ": expected screen location (" << row << ", " << column << ") to contain " << curr << expected_pretty << color_phrase.str() << " instead of " << no_scientific(get_or_insert(Memory, addr)) << actual_pretty << '\n' << end(); 315 dump_screen(); 316 } 317 else { 318 // just testing check_screen -319 raise << "expected screen location (" << row << ", " << column << ") to contain " << curr << expected_pretty << color_phrase.str() << " instead of " << no_scientific(get_or_insert(Memory, addr)) << actual_pretty << '\n' << end(); +319 raise << "expected screen location (" << row << ", " << column << ") to contain " << curr << expected_pretty << color_phrase.str() << " instead of " << no_scientific(get_or_insert(Memory, addr)) << actual_pretty << '\n' << end(); 320 } 321 if (!Scenario_testing_scenario) Passed = false; 322 return; 323 } 324 if (cursor.get() != '.') { -325 raise << Current_scenario->name << ": row " << row << " of the expected screen is too long\n" << end(); +325 raise << Current_scenario->name << ": row " << row << " of the expected screen is too long\n" << end(); 326 if (!Scenario_testing_scenario) Passed = false; 327 return; 328 } 329 } 330 cursor.skip_whitespace_and_comments(); 331 if (!cursor.at_end()) { -332 raise << Current_scenario->name << ": expected screen has too many rows\n" << end(); +332 raise << Current_scenario->name << ": expected screen has too many rows\n" << end(); 333 Passed = false; 334 } 335 } @@ -402,7 +402,7 @@ if ('onhashchange' in window) { 339 bool raw_string_stream::at_end() const { 340 if (index >= max) return true; 341 if (tb_utf8_char_length(buf[index]) > max-index) { -342 raise << "unicode string seems corrupted at index "<< index << " character " << static_cast<int>(buf[index]) << '\n' << end(); +342 raise << "unicode string seems corrupted at index "<< index << " character " << static_cast<int>(buf[index]) << '\n' << end(); 343 return true; 344 } 345 return false; -- cgit 1.4.1-2-gfad0