From 6fcf4195e17c624a0fa6c7e1d6d5754855d613bd Mon Sep 17 00:00:00 2001 From: Joseph Lenox Date: Sat, 24 Nov 2018 13:11:03 -0600 Subject: [PATCH] Fix endline whitespace. --- src/test/GUI/test_cli.cpp | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/src/test/GUI/test_cli.cpp b/src/test/GUI/test_cli.cpp index 36862de9f..12c95a980 100644 --- a/src/test/GUI/test_cli.cpp +++ b/src/test/GUI/test_cli.cpp @@ -34,7 +34,7 @@ char** to_cstr_array(std::vector in, char** argv) { int i = 0; for (auto& str : in) { argv[i] = new char[str.size()]; - strcpy(argv[i], str.c_str()); + strcpy(argv[i], str.c_str()); i++; } return argv; @@ -54,7 +54,7 @@ SCENARIO( "CLI Export Arguments", "[!mayfail]") { in_args.emplace_back(testfile("test_cli/20mmbox.stl"s)); GIVEN( "Default configuration and a simple 3D model" ) { - WHEN ( "[ ACTION ] is export-gcode with long option") { + WHEN ( "[ ACTION ] is export-gcode with long option") { in_args.emplace(in_args.cend()-1, "--export-gcode"); CLI().run(in_args.size(), to_cstr_array(in_args, args_cli)); THEN ("GCode file is created.") { @@ -63,7 +63,7 @@ SCENARIO( "CLI Export Arguments", "[!mayfail]") { clean_array(in_args.size(), args_cli); clean_file("test_cli/20mmbox", "gcode"); } - WHEN ( "[ ACTION ] is export-gcode with short option") { + WHEN ( "[ ACTION ] is export-gcode with short option") { in_args.emplace(in_args.cend()-1, "-g"); CLI().run(in_args.size(), to_cstr_array(in_args, args_cli)); THEN ("GCode file is created.") { @@ -72,7 +72,7 @@ SCENARIO( "CLI Export Arguments", "[!mayfail]") { clean_array(in_args.size(), args_cli); clean_file("test_cli/20mmbox", "gcode"); } - WHEN ( "[ ACTION ] is export-obj") { + WHEN ( "[ ACTION ] is export-obj") { in_args.emplace(in_args.cend()-1, "--export-obj"); CLI().run(in_args.size(), to_cstr_array(in_args, args_cli)); THEN ("OBJ file is created.") { @@ -81,7 +81,7 @@ SCENARIO( "CLI Export Arguments", "[!mayfail]") { clean_array(in_args.size(), args_cli); clean_file("test_cli/20mmbox", "obj"); } - WHEN ( "[ ACTION ] is export-pov") { + WHEN ( "[ ACTION ] is export-pov") { in_args.emplace(in_args.cend()-1, "--export-pov"); CLI().run(in_args.size(), to_cstr_array(in_args, args_cli)); THEN ("POV file is created.") { @@ -90,7 +90,7 @@ SCENARIO( "CLI Export Arguments", "[!mayfail]") { clean_array(in_args.size(), args_cli); clean_file("test_cli/20mmbox", "pov"); } - WHEN ( "[ ACTION ] is export-amf") { + WHEN ( "[ ACTION ] is export-amf") { in_args.emplace(in_args.cend()-1, "--export-amf"); CLI().run(in_args.size(), to_cstr_array(in_args, args_cli)); THEN ("AMF file is created.") { @@ -99,7 +99,7 @@ SCENARIO( "CLI Export Arguments", "[!mayfail]") { clean_array(in_args.size(), args_cli); clean_file("test_cli/20mmbox", "amf"); } - WHEN ( "[ ACTION ] is export-3mf") { + WHEN ( "[ ACTION ] is export-3mf") { in_args.emplace(in_args.cend()-1, "--export-3mf"); CLI().run(in_args.size(), to_cstr_array(in_args, args_cli)); THEN ("3MF file is created.") { @@ -108,7 +108,7 @@ SCENARIO( "CLI Export Arguments", "[!mayfail]") { clean_array(in_args.size(), args_cli); clean_file("test_cli/20mmbox", "3mf"); } - WHEN ( "[ ACTION ] is export-svg") { + WHEN ( "[ ACTION ] is export-svg") { in_args.emplace(in_args.cend()-1, "--export-svg"); CLI().run(in_args.size(), to_cstr_array(in_args, args_cli)); THEN ("SVG files are created.") { @@ -125,7 +125,7 @@ SCENARIO( "CLI Export Arguments", "[!mayfail]") { clean_file("test_cli/20mmbox_3", "svg", true); clean_file("test_cli/20mmbox_4", "svg", true); } - WHEN ( "[ ACTION ] is export-sla-svg") { + WHEN ( "[ ACTION ] is export-sla-svg") { in_args.emplace(in_args.cend()-1, "--export-sla-svg"); CLI().run(in_args.size(), to_cstr_array(in_args, args_cli)); THEN ("SVG files are created.") { @@ -142,7 +142,7 @@ SCENARIO( "CLI Export Arguments", "[!mayfail]") { clean_file("test_cli/20mmbox_3", "svg", true); clean_file("test_cli/20mmbox_4", "svg", true); } - WHEN ( "[ ACTION ] is sla") { + WHEN ( "[ ACTION ] is sla") { in_args.emplace(in_args.cend()-1, "--sla"); CLI().run(in_args.size(), to_cstr_array(in_args, args_cli)); THEN ("SVG file is created.") { @@ -151,7 +151,7 @@ SCENARIO( "CLI Export Arguments", "[!mayfail]") { clean_array(in_args.size(), args_cli); clean_file("test_cli/20mmbox", "svg", true); } - WHEN ( "[ ACTION ] is sla and --output-file-format is output_[padded_layer_num].svg") { + WHEN ( "[ ACTION ] is sla and --output-file-format is output_[padded_layer_num].svg") { in_args.emplace(in_args.cend()-1, "--sla"); in_args.emplace(in_args.cend()-1, "--output-file-format output_[padded_layer_num].svg"); in_args.emplace(in_args.cend()-1, "--layer-height 5"); @@ -170,7 +170,7 @@ SCENARIO( "CLI Export Arguments", "[!mayfail]") { clean_file("test_cli/output_3", "svg", true); clean_file("test_cli/output_4", "svg", true); } - WHEN ( "[ ACTION ] is save") { + WHEN ( "[ ACTION ] is save") { in_args.emplace(in_args.cend()-1, "--save"); in_args.emplace(in_args.cend()-1, testfile("cfg.ini")); CLI().run(in_args.size(), to_cstr_array(in_args, args_cli)); @@ -180,7 +180,7 @@ SCENARIO( "CLI Export Arguments", "[!mayfail]") { clean_array(in_args.size(), args_cli); clean_file("cfg", "ini"); } - WHEN ( "[ ACTION ] is export-stl and --output option is specified") { + WHEN ( "[ ACTION ] is export-stl and --output option is specified") { in_args.emplace(in_args.cend()-1, "--export-stl"); in_args.emplace(in_args.cend()-1, "--output"); in_args.emplace(in_args.cend()-1, testfile("output.stl")); @@ -203,7 +203,11 @@ SCENARIO("CLI Transform arguments", "[!shouldfail]") { in_args.emplace_back(testfile("test_cli/20mmbox.stl"s)); WHEN("Tests are implemented for CLI model transform") { THEN ("Tests should not fail :D") { - REQUIRE(false); + REQUIRE(false); + } + } +} + } } }