From 90560d7194f3e451ddab9d4033c98d2e6aec977b Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Sun, 23 Aug 2015 10:19:23 -0700 Subject: 2062 --- html/050scenario.cc.html | 261 +++++++++++++++++++++++++++++------------------ 1 file changed, 160 insertions(+), 101 deletions(-) (limited to 'html/050scenario.cc.html') diff --git a/html/050scenario.cc.html b/html/050scenario.cc.html index f2b7c24f..db392a7c 100644 --- a/html/050scenario.cc.html +++ b/html/050scenario.cc.html @@ -13,17 +13,16 @@ pre { white-space: pre-wrap; font-family: monospace; color: #eeeeee; background-color: #080808; } body { font-family: monospace; color: #eeeeee; background-color: #080808; } * { font-size: 1.05em; } -.traceContains { color: #008000; } -.SalientComment { color: #00ffff; } -.Constant { color: #00a0a0; } .cSpecial { color: #008000; } +.SalientComment { color: #00ffff; } +.Identifier { color: #804000; } .traceAbsent { color: #c00000; } -.Normal { color: #eeeeee; background-color: #080808; padding-bottom: 1px; } .Comment { color: #9090ff; } .Delimiter { color: #a04060; } .Special { color: #ff6060; } -.Identifier { color: #804000; } .CommentedCode { color: #6c6c6c; } +.Constant { color: #00a0a0; } +.traceContains { color: #008000; } --> @@ -74,23 +73,23 @@ scenario foo [ scenario foo [ run [ 1:number <- copy 13 - trace [a], [a b c] + trace 1, [a], [a b c] ] memory-should-contain [ 1 <- 13 ] trace-should-contain [ - a: a b c + a: a b c ] - trace-should-not-contain [ - a: x y z + trace-should-not-contain [ + a: x y z ] ] //:: Core data structure :(before "End Types") -struct scenario { +struct scenario { string name; string to_run; }; @@ -102,7 +101,7 @@ vector<scenario> Scenarios; //: Simply store the text of the scenario. :(before "End Command Handlers") -else if (command == "scenario") { +else if (command == "scenario") { Scenarios.push_back(parse_scenario(in)); } @@ -135,7 +134,7 @@ scenario foo [ :(scenario read_scenario_with_bracket_in_comment_in_nested_string) scenario foo [ - 1:address:array:character <- new [# not a comment] + 1:address:array:character <- new [# not a comment] ] +run: 1:address:array:character <- new [# not a comment] @@ -143,35 +142,35 @@ scenario foo [ //: Treat the text of the scenario as a regular series of instructions. :(before "End Tests") -time_t mu_time; time(&mu_time); +time_t mu_time; time(&mu_time); cerr << "\nMu tests: " << ctime(&mu_time); -for (long long int i = 0; i < SIZE(Scenarios); ++i) { +for (long long int i = 0; i < SIZE(Scenarios); ++i) { //? cerr << Passed << '\n'; //? 1 -//? cerr << i << ": " << Scenarios.at(i).name << '\n'; //? 6 +//? cerr << i << ": " << Scenarios.at(i).name << '\n'; //? 7 run_mu_scenario(Scenarios.at(i)); - if (Passed) cerr << "."; + if (Passed) cerr << "."; } //: Convenience: run a single named scenario. :(after "Test Runs") -for (long long int i = 0; i < SIZE(Scenarios); ++i) { - if (Scenarios.at(i).name == argv[argc-1]) { +for (long long int i = 0; i < SIZE(Scenarios); ++i) { + if (Scenarios.at(i).name == argv[argc-1]) { run_mu_scenario(Scenarios.at(i)); - if (Passed) cerr << ".\n"; + if (Passed) cerr << ".\n"; return 0; } } :(before "End Globals") -const scenario* Current_scenario = NULL; +const scenario* Current_scenario = NULL; :(code) -void run_mu_scenario(const scenario& s) { +void run_mu_scenario(const scenario& s) { Current_scenario = &s; - bool not_already_inside_test = !Trace_stream; + bool not_already_inside_test = !Trace_stream; //? cerr << s.name << '\n'; //? 12 - if (not_already_inside_test) { + if (not_already_inside_test) { Trace_file = s.name; - Trace_stream = new trace_stream; + Trace_stream = new trace_stream; setup(); } assert(Routines.empty()); @@ -179,12 +178,12 @@ cerr << "\n(tmp.at(0)); transform_all(); run(tmp.front()); - if (not_already_inside_test && Trace_stream) { + if (not_already_inside_test && Trace_stream) { teardown(); ofstream fout((Trace_dir+Trace_file).c_str()); fout << Trace_stream->readable_contents(""); fout.close(); - delete Trace_stream; + delete Trace_stream; Trace_stream = NULL; Trace_file = ""; } @@ -207,7 +206,7 @@ recipe scenario-foo [ +warn: redefining recipe scenario-foo :(after "bool warn_on_redefine(const string& recipe_name)") -if (recipe_name.find("scenario-") == 0) return true; +if (recipe_name.find("scenario-") == 0) return true; //:: The special instructions we want to support inside scenarios. //: In a compiler for the mu VM these will require more work. @@ -228,7 +227,7 @@ RUN, :(before "End Primitive Recipe Numbers") Recipe_ordinal["run"] = RUN; :(before "End Primitive Recipe Implementations") -case RUN: { +case RUN: { //? cout << "recipe " << current_instruction().ingredients.at(0).name << '\n'; //? 1 ostringstream tmp; tmp << "recipe run" << Next_recipe_ordinal << " [ " << current_instruction().ingredients.at(0).name << " ]"; @@ -244,7 +243,7 @@ Recipe_ordinal["run"] = RUN// Some variables for fake resources always get special addresses in // scenarios. :(code) -void bind_special_scenario_names(recipe_ordinal r) { +void bind_special_scenario_names(recipe_ordinal r) { // Special Scenario Variable Names(r) // End Special Scenario Variable Names(r) } @@ -265,7 +264,7 @@ recipe main [ //: Also includes some special support for checking strings. :(before "End Globals") -bool Scenario_testing_scenario = false; +bool Scenario_testing_scenario = false; :(before "End Setup") Scenario_testing_scenario = false; @@ -285,44 +284,44 @@ MEMORY_SHOULD_CONTAIN, :(before "End Primitive Recipe Numbers") Recipe_ordinal["memory-should-contain"] = MEMORY_SHOULD_CONTAIN; :(before "End Primitive Recipe Implementations") -case MEMORY_SHOULD_CONTAIN: { - if (!Passed) break; +case MEMORY_SHOULD_CONTAIN: { + if (!Passed) break; //? cout << current_instruction().ingredients.at(0).name << '\n'; //? 1 check_memory(current_instruction().ingredients.at(0).name); break; } :(code) -void check_memory(const string& s) { +void check_memory(const string& s) { istringstream in(s); in >> std::noskipws; - set<long long int> locations_checked; - while (true) { + set<long long int> locations_checked; + while (true) { skip_whitespace_and_comments(in); - if (in.eof()) break; + if (in.eof()) break; string lhs = next_word(in); - if (!is_integer(lhs)) { + if (!is_integer(lhs)) { check_type(lhs, in); continue; } - int address = to_integer(lhs); + int address = to_integer(lhs); skip_whitespace_and_comments(in); string _assign; in >> _assign; assert(_assign == "<-"); skip_whitespace_and_comments(in); - int value = 0; in >> value; - if (locations_checked.find(address) != locations_checked.end()) + int value = 0; in >> value; + if (locations_checked.find(address) != locations_checked.end()) raise << "duplicate expectation for location " << address << '\n' << end(); trace(Primitive_recipe_depth, "run") << "checking location " << address << end(); - if (Memory[address] != value) { - if (Current_scenario && !Scenario_testing_scenario) { + if (Memory[address] != value) { + if (Current_scenario && !Scenario_testing_scenario) { // genuine test in a mu file raise << "\nF - " << Current_scenario->name << ": expected location " << address << " to contain " << value << " but saw " << Memory[address] << '\n' << end(); } - else { + else { // just testing scenario support raise << "expected location " << address << " to contain " << value << " but saw " << Memory[address] << '\n' << end(); } - if (!Scenario_testing_scenario) { + if (!Scenario_testing_scenario) { Passed = false; ++Num_failures; } @@ -332,16 +331,16 @@ Recipe_ordinal["memory-should-contain"] } } -void check_type(const string& lhs, istream& in) { +void check_type(const string& lhs, istream& in) { reagent x(lhs); - if (x.properties.at(0).second.at(0) == "string") { + if (x.properties.at(0).second.at(0) == "string") { x.set_value(to_integer(x.name)); skip_whitespace_and_comments(in); string _assign = next_word(in); assert(_assign == "<-"); skip_whitespace_and_comments(in); string literal = next_word(in); - long long int address = x.value; + long long int address = x.value; // exclude quoting brackets assert(*literal.begin() == '['); literal.erase(literal.begin()); assert(*--literal.end() == ']'); literal.erase(--literal.end()); @@ -351,32 +350,32 @@ Recipe_ordinal["memory-should-contain"] raise << "don't know how to check memory for " << lhs << '\n' << end(); } -void check_string(long long int address, const string& literal) { +void check_string(long long int address, const string& literal) { trace(Primitive_recipe_depth, "run") << "checking string length at " << address << end(); - if (Memory[address] != SIZE(literal)) { - if (Current_scenario && !Scenario_testing_scenario) + if (Memory[address] != SIZE(literal)) { + if (Current_scenario && !Scenario_testing_scenario) raise << "\nF - " << Current_scenario->name << ": expected location " << address << " to contain length " << SIZE(literal) << " of string [" << literal << "] but saw " << Memory[address] << '\n' << end(); - else + else raise << "expected location " << address << " to contain length " << SIZE(literal) << " of string [" << literal << "] but saw " << Memory[address] << '\n' << end(); - if (!Scenario_testing_scenario) { + if (!Scenario_testing_scenario) { Passed = false; ++Num_failures; } return; } ++address; // now skip length - for (long long int i = 0; i < SIZE(literal); ++i) { + for (long long int i = 0; i < SIZE(literal); ++i) { trace(Primitive_recipe_depth, "run") << "checking location " << address+i << end(); - if (Memory[address+i] != literal.at(i)) { - if (Current_scenario && !Scenario_testing_scenario) { + if (Memory[address+i] != literal.at(i)) { + if (Current_scenario && !Scenario_testing_scenario) { // genuine test in a mu file raise << "\nF - " << Current_scenario->name << ": expected location " << (address+i) << " to contain " << literal.at(i) << " but saw " << Memory[address+i] << '\n' << end(); } - else { + else { // just testing scenario support raise << "expected location " << (address+i) << " to contain " << literal.at(i) << " but saw " << Memory[address+i] << '\n' << end(); } - if (!Scenario_testing_scenario) { + if (!Scenario_testing_scenario) { Passed = false; ++Num_failures; } @@ -436,19 +435,19 @@ recipe main [ % Hide_warnings = true; recipe main [ trace-should-contain [ - a: b - a: d + a: b + a: d ] ] -+warn: missing [b] in trace layer a ++warn: missing [b] in trace with label a :(before "End Primitive Recipe Declarations") TRACE_SHOULD_CONTAIN, :(before "End Primitive Recipe Numbers") Recipe_ordinal["trace-should-contain"] = TRACE_SHOULD_CONTAIN; :(before "End Primitive Recipe Implementations") -case TRACE_SHOULD_CONTAIN: { - if (!Passed) break; +case TRACE_SHOULD_CONTAIN: { + if (!Passed) break; check_trace(current_instruction().ingredients.at(0).name); break; } @@ -456,37 +455,37 @@ Recipe_ordinal["trace-should-contain"] = :(code) // simplified version of check_trace_contents() that emits warnings rather // than just printing to stderr -bool check_trace(const string& expected) { +bool check_trace(const string& expected) { //? cerr << "AAA " << expected << '\n'; //? 1 Trace_stream->newline(); vector<trace_line> expected_lines = parse_trace(expected); //? cerr << "BBB " << SIZE(expected_lines) << '\n'; //? 1 - if (expected_lines.empty()) return true; - long long int curr_expected_line = 0; - for (vector<trace_line>::iterator p = Trace_stream->past_lines.begin(); p != Trace_stream->past_lines.end(); ++p) { - if (expected_lines.at(curr_expected_line).label != p->label) continue; - if (expected_lines.at(curr_expected_line).contents != trim(p->contents)) continue; + if (expected_lines.empty()) return true; + long long int curr_expected_line = 0; + for (vector<trace_line>::iterator p = Trace_stream->past_lines.begin(); p != Trace_stream->past_lines.end(); ++p) { + if (expected_lines.at(curr_expected_line).label != p->label) continue; + if (expected_lines.at(curr_expected_line).contents != trim(p->contents)) continue; // match ++curr_expected_line; - if (curr_expected_line == SIZE(expected_lines)) { + if (curr_expected_line == SIZE(expected_lines)) { //? cerr << "ZZZ\n"; //? 1 return true; } } raise << "missing [" << expected_lines.at(curr_expected_line).contents << "] " - << "in trace layer " << expected_lines.at(curr_expected_line).label << '\n' << end(); + << "in trace with label " << expected_lines.at(curr_expected_line).label << '\n' << end(); Passed = false; return false; } -vector<trace_line> parse_trace(const string& expected) { +vector<trace_line> parse_trace(const string& expected) { vector<string> buf = split(expected, "\n"); vector<trace_line> result; - for (long long int i = 0; i < SIZE(buf); ++i) { + for (long long int i = 0; i < SIZE(buf); ++i) { buf.at(i) = trim(buf.at(i)); - if (buf.at(i).empty()) continue; - long long int delim = buf.at(i).find(": "); + if (buf.at(i).empty()) continue; + long long int delim = buf.at(i).find(": "); result.push_back(trace_line(trim(buf.at(i).substr(0, delim)), trim(buf.at(i).substr(delim+2)))); } return result; @@ -497,27 +496,27 @@ vector<trace_line> parse_trace(% Hide_warnings = true; recipe main [ run [ - trace [a], [b] + trace 1, [a], [b] ] trace-should-contain [ - a: b - a: d + a: b + a: d ] ] -+warn: missing [d] in trace layer a ++warn: missing [d] in trace with label a :(scenario trace_check_passes_silently) % Scenario_testing_scenario = true; % Hide_warnings = true; recipe main [ run [ - trace [a], [b] + trace 1, [a], [b] ] trace-should-contain [ - a: b + a: b ] ] --warn: missing [b] in trace layer a +-warn: missing [b] in trace with label a $warn: 0 //: 'trace-should-not-contain' is like the '-' lines in our scenarios so far @@ -529,21 +528,21 @@ $warn: 0 % Hide_warnings = true; recipe main [ run [ - trace [a], [b] + trace 1, [a], [b] ] - trace-should-not-contain [ - a: b + trace-should-not-contain [ + a: b ] ] -+warn: unexpected [b] in trace layer a ++warn: unexpected [b] in trace with label a :(before "End Primitive Recipe Declarations") TRACE_SHOULD_NOT_CONTAIN, :(before "End Primitive Recipe Numbers") Recipe_ordinal["trace-should-not-contain"] = TRACE_SHOULD_NOT_CONTAIN; :(before "End Primitive Recipe Implementations") -case TRACE_SHOULD_NOT_CONTAIN: { - if (!Passed) break; +case TRACE_SHOULD_NOT_CONTAIN: { + if (!Passed) break; check_trace_missing(current_instruction().ingredients.at(0).name); break; } @@ -551,12 +550,12 @@ Recipe_ordinal["trace-should-not-contain":(code) // simplified version of check_trace_contents() that emits warnings rather // than just printing to stderr -bool check_trace_missing(const string& in) { +bool check_trace_missing(const string& in) { Trace_stream->newline(); vector<trace_line> lines = parse_trace(in); - for (long long int i = 0; i < SIZE(lines); ++i) { - if (trace_count(lines.at(i).label, lines.at(i).contents) != 0) { - raise << "unexpected [" << lines.at(i).contents << "] in trace layer " << lines.at(i).label << '\n' << end(); + for (long long int i = 0; i < SIZE(lines); ++i) { + if (trace_count(lines.at(i).label, lines.at(i).contents) != 0) { + raise << "unexpected [" << lines.at(i).contents << "] in trace with label " << lines.at(i).label << '\n' << end(); Passed = false; return false; } @@ -568,11 +567,11 @@ Recipe_ordinal["trace-should-not-contain"% Scenario_testing_scenario = true; % Hide_warnings = true; recipe main [ - trace-should-not-contain [ - a: b + trace-should-not-contain [ + a: b ] ] --warn: unexpected [b] in trace layer a +-warn: unexpected [b] in trace with label a $warn: 0 :(scenario trace_negative_check_warns_on_any_unexpected_line) @@ -580,25 +579,85 @@ $warn: 0 % Hide_warnings = true; recipe main [ run [ - trace [a], [d] + trace 1, [a], [d] + ] + trace-should-not-contain [ + a: b + a: d + ] +] ++warn: unexpected [d] in trace with label a + +:(scenario trace_count_check) +recipe main [ + run [ + trace 1, [a], [foo] ] - trace-should-not-contain [ - a: b - a: d + check-trace-count-for-label 1, [a] +] + +:(before "End Primitive Recipe Declarations") +CHECK_TRACE_COUNT_FOR_LABEL, +:(before "End Primitive Recipe Numbers") +Recipe_ordinal["check-trace-count-for-label"] = CHECK_TRACE_COUNT_FOR_LABEL; +:(before "End Primitive Recipe Implementations") +case CHECK_TRACE_COUNT_FOR_LABEL: { + if (!Passed) break; + if (SIZE(current_instruction().ingredients) != 2) { + raise << current_recipe_name() << ": 'check-trace-for-label' requires exactly two ingredients, but got '" << current_instruction().to_string() << "'\n" << end(); + break; + } + if (!scalar(ingredients.at(0))) { + raise << current_recipe_name() << ": first ingredient of 'check-trace-for-label' should be a number (count), but got " << current_instruction().ingredients.at(0).original_string << '\n' << end(); + break; + } + long long int expected_count = ingredients.at(0).at(0); + if (!is_literal_string(current_instruction().ingredients.at(1))) { + raise << current_recipe_name() << ": second ingredient of 'check-trace-for-label' should be a literal string (label), but got " << current_instruction().ingredients.at(1).original_string << '\n' << end(); + break; + } + string label = current_instruction().ingredients.at(1).name; + long long int count = trace_count(label); + if (count != expected_count) { + if (Current_scenario && !Scenario_testing_scenario) { + // genuine test in a mu file + raise << "\nF - " << Current_scenario->name << ": " << current_recipe_name() << ": expected " << expected_count << " lines in trace with label " << label << " in trace: "; + DUMP(label); + raise; + } + else { + // just testing scenario support + raise << current_recipe_name() << ": expected " << expected_count << " lines in trace with label " << label << " in trace\n" << end(); + } + if (!Scenario_testing_scenario) { + Passed = false; + ++Num_failures; + } + } + break; +} + +:(scenario trace_count_check_2) +% Scenario_testing_scenario = true; +% Hide_warnings = true; +recipe main [ + run [ + trace 1, [a], [foo] ] + check-trace-count-for-label 2, [a] ] -+warn: unexpected [d] in trace layer a ++warn: main: expected 2 lines in trace with label a in trace //: Minor detail: ignore 'system' calls in scenarios, since anything we do //: with them is by definition impossible to test through mu. :(after "case _SYSTEM:") - if (Current_scenario) break; + if (Current_scenario) break; //:: Helpers :(code) // just for the scenarios running scenarios in C++ layers -void run_mu_scenario(const string& form) { +void run_mu_scenario(const string& form) { //? cerr << form << '\n'; //? 1 istringstream in(form); in >> std::noskipws; -- cgit 1.4.1-2-gfad0