From ebcc9130c7d02eed9ee48acb9f78aa5e5f1a6c26 Mon Sep 17 00:00:00 2001 From: John Krauss Date: Mon, 23 May 2016 11:10:29 -0400 Subject: [PATCH] restore accidentally commented tests --- scripts/autotest.py | 48 ++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 25 deletions(-) diff --git a/scripts/autotest.py b/scripts/autotest.py index f19e866..e103adb 100644 --- a/scripts/autotest.py +++ b/scripts/autotest.py @@ -65,8 +65,6 @@ def default_point(column_id): @parameterized(MEASURE_COLUMNS) def test_measure_points(column_id): - if not column_id.startswith('es.ine'): - return resp = query(''' SELECT * FROM {schema}OBS_GetMeasure({point}, '{column_id}') '''.format(column_id=column_id, @@ -77,26 +75,26 @@ SELECT * FROM {schema}OBS_GetMeasure({point}, '{column_id}') assert_equal(1, len(rows)) assert_is_not_none(rows[0].values()[0]) -#@parameterized(CATEGORY_COLUMNS) -#def test_category_points(column_id): -# resp = query(''' -#SELECT * FROM {schema}OBS_GetCategory({point}, '{column_id}') -# '''.format(column_id=column_id, -# schema='cdb_observatory.' if USE_SCHEMA else '', -# point=default_point(column_id))) -# assert_equal(resp.status_code, 200) -# rows = resp.json()['rows'] -# assert_equal(1, len(rows)) -# assert_is_not_none(rows[0].values()[0]) -# -#@parameterized(BOUNDARY_COLUMNS) -#def test_boundary_points(column_id): -# resp = query(''' -#SELECT * FROM {schema}OBS_GetBoundary({point}, '{column_id}') -# '''.format(column_id=column_id, -# schema='cdb_observatory.' if USE_SCHEMA else '', -# point=default_point(column_id))) -# assert_equal(resp.status_code, 200) -# rows = resp.json()['rows'] -# assert_equal(1, len(rows)) -# assert_is_not_none(rows[0].values()[0]) +@parameterized(CATEGORY_COLUMNS) +def test_category_points(column_id): + resp = query(''' +SELECT * FROM {schema}OBS_GetCategory({point}, '{column_id}') + '''.format(column_id=column_id, + schema='cdb_observatory.' if USE_SCHEMA else '', + point=default_point(column_id))) + assert_equal(resp.status_code, 200) + rows = resp.json()['rows'] + assert_equal(1, len(rows)) + assert_is_not_none(rows[0].values()[0]) + +@parameterized(BOUNDARY_COLUMNS) +def test_boundary_points(column_id): + resp = query(''' +SELECT * FROM {schema}OBS_GetBoundary({point}, '{column_id}') + '''.format(column_id=column_id, + schema='cdb_observatory.' if USE_SCHEMA else '', + point=default_point(column_id))) + assert_equal(resp.status_code, 200) + rows = resp.json()['rows'] + assert_equal(1, len(rows)) + assert_is_not_none(rows[0].values()[0])