1. 11 8月, 2017 3 次提交
    • B
      Add actual error messages for the error messages · b2866766
      Benjamin Sago 提交于
      The annoying part is trying to format!() an OsStr.
      b2866766
    • B
      Integrate strict mode, use it to test file sizes · adaa36e1
      Benjamin Sago 提交于
      It’s a good test to be able to switch strict mode on in run.sh and not have it break anything! Now, the EXA_STRICT environment variable will toggle it on. We can even switch it off and see that it doesn’t error.
      adaa36e1
    • B
      Extract var_os and use the mock to test · dbebd60c
      Benjamin Sago 提交于
      Some of the deduce functions used to just blatantly call std::env::var_os and not care, introducing global state into a module that was otherwise nice and functional and self-contained. (Well, almost. There’s still terminal width.)
      
      Anyway, this made it hard to test, because we couldn’t test it fully with this global dependency in place. It *is* possible to work around this by actually setting the environment variables in the tests, but this way is more self-documenting.
      
      With this in place, we can start to unit test things like deriving the view by passing in what the $COLUMNS environment variable should be, and that’s one of the first things checked.
      
      src/options/mod.rs *almost* has all its tests moved to where they should be!
      dbebd60c
  2. 10 8月, 2017 6 次提交
    • B
      Only complain about long options in strict mode · 532ebbc5
      Benjamin Sago 提交于
      Fixes #152. It just puts the check behind a flag and moves the tests around.
      532ebbc5
    • B
      New macro for testing deduce errors · f389943b
      Benjamin Sago 提交于
      Sometimes, the type in the Ok part of the Result wouldn’t implement PartialEq, so the first macro (which uses assert_eq) won’t work. In these cases, this new macro can be used instead, which just unwraps the Err’s contents. In other cases, it can shave off a ) at the end of a few lines.
      f389943b
    • B
      Extract table columns into a struct · 6755ee6a
      Benjamin Sago 提交于
      The table Options struct is roughly half runtime configuration and half flags to select which columns to display The column fields might as well be in their own struct, and now that the ‘for_dir’ function doesn’t use SizeFormat, it can be moved to Columns.
      6755ee6a
    • B
      Move size format out of Column · e98c7650
      Benjamin Sago 提交于
      Way in the past, the size format was the only variable column; the others were all fixed. Now there are many configurable columns and this field was still hanging around. The code that does the rendering just gets the size format as an argument, and now it works the same way as the TimeFormat.
      e98c7650
    • B
      Make SizeFormat lenient, and add tests · 6b309d5c
      Benjamin Sago 提交于
      This changes the SizeFormat option parser from its old, strict-by-default behaviour (where passing both --bytes and --binary would be an error) to the new, use-the-last-argument behaviour (where passing --bytes --binary would use --binary because it came later).
      
      Doing this meant adding functionality to Matches so that it could return *which* argument matched. Previously, the order of --bytes and --binary didn’t matter, because they couldn’t both be present, but now it does.
      6b309d5c
    • B
      Document and test time formats · b2947ed5
      Benjamin Sago 提交于
      b2947ed5
  3. 09 8月, 2017 2 次提交
    • B
      Decouple assert_eq! and assert_parses · 0b87392f
      Benjamin Sago 提交于
      The assert_parses function was problematic because it insisted on using assert_eq! to check its contents. This won’t work for any type we want to test that doesn’t implement PartialEq, such as TimeFormat, which holds references to years and date strings and other such.
      
      To go about fixing this, the first step is to change that function so it only does the initial processing, rather than the assertion, which is now done outside of it in the test macros instead.
      0b87392f
    • B
      Be stricter in strict mode · ff497b52
      Benjamin Sago 提交于
      Now the code actually starts to use the Strictness flag that was added in the earlier commit! Well, the *code* doesn’t, but the tests do: the macros that create the test cases now have a parameter for which tests they should run. It’s usually ‘Both’ for both strict mode and default mode, but can be specified to only run in one, for when the results differ (usually when options override one another)
      
      The downside to strict mode is that, now, *any* call to `matches.has` or `matches.get` could fail, because an option could have been specified twice, and this is the place where those are checked for. This makes the code a little less ergonomic in places, but that’s what the ? operator is for. The only place this has really had an effect is in `Classify::deduce`, which used to just return a boolean but can now fail.
      
      In order to more thoroughly test the mode, some of the older parts of the code can now act more strict. For example, `TerminalColours::deduce` will now use the last-given option rather than searching for “colours” before “colors”.
      
      Help and Version continue doing their own thing.
      ff497b52
  4. 08 8月, 2017 2 次提交
    • B
      Make these tests less long · d97f603e
      Benjamin Sago 提交于
      d97f603e
    • B
      Thread Strictness through the parser · 00379cce
      Benjamin Sago 提交于
      The value is ignored, but this broke quite a lot of tests that assumed MatchedFlags had only one field.
      
      Parsing tests have to have OsStr flags because I couldn’t get that part working right, but in general, some tests now re-use common functionality too.
      00379cce
  5. 07 8月, 2017 7 次提交
  6. 06 8月, 2017 15 次提交
  7. 05 8月, 2017 5 次提交