Merge pull request #13 from kdorr/fix-test-coverage

Fix test coverage

Author: story645

.coveragerc

@@ -2,7 +2,6 @@
 branch = true
 source =
     mplaltair
-omit = *tests*
 
 [report]
 exclude_lines =

mplaltair/tests/test_convert.py

@@ -131,20 +131,17 @@ def test_convert_fill_fail():
 def test_quantitative_shape():
     chart = alt.Chart(df_quant).mark_point().encode(alt.Shape('shape'))
     mapping = convert(chart)
-    assert list(mapping['marker']) == list(df_quant['shape'].values)
 
 @pytest.mark.xfail(raises=NotImplementedError, reason="The marker argument in scatter() cannot take arrays")
 @pytest.mark.parametrize("column", ["years", "months", "days", "hrs", "combination"])
 def test_convert_shape_fail_temporal(column):
     chart = alt.Chart(df).mark_point().encode(alt.Shape(column))
     mapping = convert(chart)
-    assert list(mapping['s']) == list(mdates.date2num(df[column].values))
 
 @pytest.mark.xfail(raises=NotImplementedError, reason="Merge: the dtype for opacity isn't assumed to be quantitative")
 def test_quantitative_opacity_value():
     chart = alt.Chart(df_quant).mark_point().encode(opacity=alt.value(.5))
     mapping = convert(chart)
-    assert mapping['alpha'] == 0.5
 
 @pytest.mark.xfail(raises=NotImplementedError, reason="The alpha argument in scatter() cannot take arrays")
 def test_quantitative_opacity_array():
@@ -199,8 +196,6 @@ def test_quantitative_x_count_y():
     df_count = pd.DataFrame({"a": [1, 1, 2, 3, 5], "b": [1.4, 1.4, 2.9, 3.18, 5.3]})
     chart = alt.Chart(df_count).mark_point().encode(alt.X('a'), alt.Y('count()'))
     mapping = convert(chart)
-    assert list(mapping['x']) == list(df_count['a'].values)
-    assert list(mapping['y']) == list(df_count.groupby(['a']).count().values)
 
 @pytest.mark.xfail(raises=NotImplementedError, reason="specifying timeUnit is not supported yet")
 def test_timeUnit():

mplaltair/tests/test_data.py

@@ -41,25 +41,27 @@ def test_data_value_quantitative():
 
 
 @pytest.mark.parametrize("column", ['a', 'b', 'c'])
-@pytest.mark.xfail(raises=NotImplementedError)
-def test_data_aggregate_quantitative(column):
+def test_data_aggregate_quantitative_fail(column):
+    """"'Passes' if it raises a NotImplementedError"""
     chart = alt.Chart(df).mark_point().encode(alt.X(field=column, type='quantitative', aggregate='average'))
     for channel in chart.to_dict()['encoding']:
-        data = _data._locate_channel_data(chart, channel)
+        with pytest.raises(NotImplementedError):
+            data = _data._locate_channel_data(chart, channel)
 
 
-@pytest.mark.xfail(raises=NotImplementedError)
-def test_data_timeUnit_shorthand_temporal():
+def test_data_timeUnit_shorthand_temporal_fail():
     chart = alt.Chart(df).mark_point().encode(alt.X('month(combination):T'))
     for channel in chart.to_dict()['encoding']:
-        data = _data._locate_channel_data(chart, channel)
+        with pytest.raises(NotImplementedError):
+            data = _data._locate_channel_data(chart, channel)
 
 
-@pytest.mark.xfail(raises=NotImplementedError)
-def test_data_timeUnit_field_temporal():
+def test_data_timeUnit_field_temporal_fail():
+    """"'Passes' if it raises a NotImplementedError"""
     chart = alt.Chart(df).mark_point().encode(alt.X(field='combination', type='temporal', timeUnit='month'))
     for channel in chart.to_dict()['encoding']:
-        data = _data._locate_channel_data(chart, channel)
+        with pytest.raises(NotImplementedError):
+            data = _data._locate_channel_data(chart, channel)
 
 
 # _locate_channel_dtype() tests
@@ -74,9 +76,9 @@ def test_data_dtype(column, expected):
     assert dtype == expected
 
 
-@pytest.mark.xfail(raises=NotImplementedError)
 def test_data_dtype_fail():
+    """"'Passes' if it raises a NotImplementedError"""
     chart = alt.Chart(df).mark_point().encode(opacity=alt.value(.5))
     for channel in chart.to_dict()['encoding']:
-        dtype = _data._locate_channel_dtype(chart, channel)
-    assert dtype == 'quantitative'
+        with pytest.raises(NotImplementedError):
+            dtype = _data._locate_channel_dtype(chart, channel)