Move tests and data to dedicated directory

Also tweaked the export command to report correctly.

3 files changed, 7 insertions, 7 deletions

diff --git a/src/vgstash_cli.py b/src/vgstash_cli.py
index 72a751a..17fd301 100644
--- a/src/vgstash_cli.py
+++ b/src/vgstash_cli.py
@@ -270,5 +270,5 @@ def export_file(format, filepath):
         with open(filepath, "w") as fp:
             yaml.dump(game_set, fp, default_flow_style=False,
                              indent=4, allow_unicode=True)
-        click.echo("Successfully exported 6 games to {}.".format(os.path.join(os.getcwd(), "test_export.yml")))
+        click.echo("Successfully exported {} games to {}.".format(len(game_set), filepath))
 
diff --git a/src/vgstash/test_vgstash.py b/tests/test_vgstash.py
index 74f3c43..74f3c43 100644
--- a/src/vgstash/test_vgstash.py
+++ b/tests/test_vgstash.py
diff --git a/src/vgstash/test_vgstash_cli.py b/tests/test_vgstash_cli.py
index 098c39e..f81d119 100644
--- a/src/vgstash/test_vgstash_cli.py
+++ b/tests/test_vgstash_cli.py
@@ -219,11 +219,11 @@ def test_notes_edit():
 
 def test_import_file_yaml():
     runner = CliRunner()
-    result = runner.invoke(vgstash_cli.cli, ["import", "test_import.yml"])
+    result = runner.invoke(vgstash_cli.cli, ["import", "tests/data/test_import.yml"])
     if verbose:
         print(result.output)
     assert result.exit_code == 0
-    assert result.output == "Successfully imported 2 games from {}.\n".format(os.path.join(os.getcwd(), "test_import.yml"))
+    assert result.output == "Successfully imported 2 games from {}.\n".format(os.path.join(os.getcwd(), "tests/data/test_import.yml"))
 
     # List the results to make sure they match what the editor has.
     list_runner = CliRunner()
@@ -235,11 +235,11 @@ def test_import_file_yaml():
 
 def test_import_file_yaml_update():
     runner = CliRunner()
-    result = runner.invoke(vgstash_cli.cli, ["import", "test_import.yml", "-u"])
+    result = runner.invoke(vgstash_cli.cli, ["import", "tests/data/test_import.yml", "-u"])
     if verbose:
         print(result.output)
     assert result.exit_code == 0
-    assert result.output == "Successfully imported 3 games from {}.\n".format(os.path.join(os.getcwd(), "test_import.yml"))
+    assert result.output == "Successfully imported 3 games from {}.\n".format(os.path.join(os.getcwd(), "tests/data/test_import.yml"))
 
     # List the results to make sure they match what the editor has.
     list_runner = CliRunner()
@@ -251,8 +251,8 @@ def test_import_file_yaml_update():
 
 def test_export_file_yaml():
     runner = CliRunner()
-    result = runner.invoke(vgstash_cli.cli, ["export", "-f", "yaml", "test_export.yml"])
+    result = runner.invoke(vgstash_cli.cli, ["export", "-f", "yaml", "tests/data/test_export.yml"])
     if verbose:
         print(result.output)
     assert result.exit_code == 0
-    assert result.output == "Successfully exported 6 games to {}.\n".format(os.path.join(os.getcwd(), "test_export.yml"))
+    assert result.output == "Successfully exported 6 games to {}.\n".format(os.path.join(os.getcwd(), "tests/data/test_export.yml"))