Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-25 12:23:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Report expand errors better in fish tests

Browse source 
Print the expected and actual results if an error occurs.
This commit is contained in:
Kevin Ballard 2014-09-25 19:45:54 -07:00
parent fb8eb22e56
commit 7935b86cb2
1 changed files with 52 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

86
fish_tests.cpp
View file

@ -1310,58 +1310,76 @@ static bool expand_test(const wchar_t *in, expand_flags_t flags, ...)
{
std::vector<completion_t> output;
va_list va;
size_t i=0;
bool res=true;
wchar_t *arg;
parse_error_list_t errors;
if (expand_string(in, output, flags, NULL))
if (expand_string(in, output, flags, &errors) == EXPAND_ERROR)
{
if (errors.empty())
{
err(L"Bug: Parse error reported but no error text found.");
}
else
{
err(L"%ls", errors.at(0).describe(wcstring(in)).c_str());
}
return false;
}
}
#if 0
printf("input: %ls\n", in);
for (size_t idx=0; idx < output.size(); idx++)
{
printf("%ls\n", output.at(idx).completion.c_str());
}
#endif
wcstring_list_t expected;
va_start(va, flags);
while ((arg=va_arg(va, wchar_t *))!= 0)
{
if (output.size() == i)
{
res=false;
break;
}
if (output.at(i).completion != arg)
{
res=false;
break;
}
i++;
if (!res)
{
// empty the rest of the args
while(va_arg(va, wchar_t *) != 0);
break;
}
expected.push_back(wcstring(arg));
}
va_end(va);
if (output.size() != i)
wcstring_list_t::const_iterator exp_it = expected.begin(), exp_end = expected.end();
std::vector<completion_t>::const_iterator out_it = output.begin(), out_end = output.end();
for (; exp_it != exp_end || out_it != out_end; ++exp_it, ++out_it)
{
res = false;
if (exp_it == exp_end || out_it == out_end)
{
// sizes don't match
res = false;
break;
}
if (out_it->completion != *exp_it)
{
res = false;
break;
}
}
if (!res)
{
if ((arg = va_arg(va, wchar_t *)) != 0)
{
err(arg);
wcstring msg = L"Expected [";
bool first = true;
for (wcstring_list_t::const_iterator it = expected.begin(), end = expected.end(); it != end; ++it)
{
if (!first) msg += L", ";
first = false;
msg += '"';
msg += *it;
msg += '"';
}
msg += L"], found [";
first = true;
for (std::vector<completion_t>::const_iterator it = output.begin(), end = output.end(); it != end; ++it)
{
if (!first) msg += L", ";
first = false;
msg += '"';
msg += it->completion;
msg += '"';
}
msg += L"]";
err(L"%ls\n%ls", arg, msg.c_str());
}
}