From bab6f348db7e2b8d22be538887f99509f2f81cb7 Mon Sep 17 00:00:00 2001
From: jgaff <jgaff@uchicago.edu>
Date: Mon, 8 Jan 2018 10:44:49 -0600
Subject: [PATCH] Test improvements, increment version

---
 setup.py            |  2 +-
 tests/test_forge.py | 38 +++++++++++++++++++++++++++-----------
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/setup.py b/setup.py
index ed0d029..fd1d7ca 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@
 
 setup(
     name='mdf_forge',
-    version='0.5.0',
+    version='0.5.1',
     packages=['mdf_forge'],
     description='Materials Data Facility python package',
     long_description=("Forge is the Materials Data Facility Python package"
diff --git a/tests/test_forge.py b/tests/test_forge.py
index 0f59963..c0cd15c 100644
--- a/tests/test_forge.py
+++ b/tests/test_forge.py
@@ -170,6 +170,11 @@ def test_query_aggregate(capsys):
     out, err = capsys.readouterr()
     assert "Error: No query" in out
 
+    # Error on no index
+    assert q.aggregate(q="abc") == []
+    out, err = capsys.readouterr()
+    assert "Error: No index specified" in out
+
     # Basic aggregation
     res1 = q.aggregate("mdf.source_name:nist_xps_db", index="mdf")
     assert len(res1) > 10000
@@ -181,6 +186,10 @@ def test_query_aggregate(capsys):
     assert len(res2) > 10000
     assert len(res2) > len(res1)
 
+    # Unnecessary aggregation fallback to .search()
+    # Check success in Coveralls
+    assert len(q.aggregate("mdf.source_name:hopv")) < 10000
+
 
 def test_query_chaining():
     q = forge.Query(query_search_client)
@@ -552,25 +561,32 @@ def test_forge_match_tags():
     assert f.match_tags("") == f
 
 
-def test_forge_match_years(capfd):
+def test_forge_match_years(capsys):
     # One year of data/results
     f = forge.Forge(index="mdf")
-    years1 = "2015"
-    res1 = f.match_years(years1).search(limit=10)
+    res1 = f.match_years("2015").search()
     assert res1 != []
     assert check_field(res1, "mdf.year", 2015) == 0
 
     # Multiple years
-    years2 = ["2015", 2011]
-    res2 = f.match_years(years2).search()
+    res2 = f.match_years(years=["2015", 2011]).search()
     assert check_field(res2, "mdf.year", 2011) == 2
 
     # Wrong input
-    years3 = ["20x5"]
-    f.match_years(years3).search()
-    out, err = capfd.readouterr()
+    f.match_years(["20x5"]).search()
+    out, err = capsys.readouterr()
     assert "Invalid year: '20x5'" in out
 
+    f.match_years(start="20x5").search()
+    out, err = capsys.readouterr()
+    assert "Invalid start year: '20x5'" in out
+
+    f.match_years(stop="20x5").search()
+    out, err = capsys.readouterr()
+    assert "Invalid stop year: '20x5'" in out
+
+    assert f.match_years() == f
+
     # Test range
     res4 = f.match_years(start=2015, stop=2015, inclusive=True).search()
     assert check_field(res4, "mdf.year", 2015) == 0
@@ -611,7 +627,7 @@ def test_forge_search(capsys):
     assert "Error: No query" in out
 
     # Return info if requested
-    res2 = f.search(q="Al", info=False)
+    res2 = f.search(q="Al", info=False, index="mdf")
     assert isinstance(res2, list)
     assert isinstance(res2[0], dict)
 
@@ -737,7 +753,7 @@ def test_forge_aggregate():
     # And respects the reset_query arg
     f = forge.Forge(index="mdf")
     f.match_field("mdf.source_name", "nist_xps_db")
-    res1 = f.aggregate(reset_query=False)
+    res1 = f.aggregate(reset_query=False, index="mdf")
     assert len(res1) > 10000
     assert check_field(res1, "mdf.source_name", "nist_xps_db") == 0
     res2 = f.aggregate()
@@ -867,7 +883,7 @@ def test_forge_show_fields():
     f = forge.Forge(index="mdf")
     res1 = f.show_fields()
     assert "mdf" in res1.keys()
-    res2 = f.show_fields("mdf")
+    res2 = f.show_fields(block="mdf", index="mdf")
     assert "mdf.mdf_id" in res2.keys()