diff --git a/src/pg/test/sql/40_observatory_utility_test.sql b/src/pg/test/sql/40_observatory_utility_test.sql index c7985cd..05d4ba1 100644 --- a/src/pg/test/sql/40_observatory_utility_test.sql +++ b/src/pg/test/sql/40_observatory_utility_test.sql @@ -10,7 +10,7 @@ SELECT ST_SetSRID(ST_Point(-74.0059, 40.7128), 4326), 'us.census.tiger.census_tract', '2014' - ); + ) = 'obs_fc050f0b8673cfe3c6aa1040f749eb40975691b7' As _obs_geomtable_with_returned_table; -- get null for unknown geometry_id -- should give back null @@ -18,7 +18,7 @@ SELECT cdb_observatory._OBS_GeomTable( ST_SetSRID(ST_Point(-74.0059, 40.7128), 4326), 'us.census.tiger.nonexistant_id' -- not in catalog - ); + ) IS NULL _obs_geomtable_with_null_response; -- future test: give back nulls when geometry doesn't intersect -- SELECT @@ -38,10 +38,11 @@ SELECT array_agg(a) expected from cdb_observatory._OBS_GetColumnData( 'us.census.tiger.census_tract', Array['us.census.tiger.census_tract_geoid', 'us.census.acs.B01003001'], - '2009 - 2013') a + '2010 - 2014') a ) -select (expected)[1]::text = '{"colname":"geoid","tablename":"obs_d34555209878e8c4b37cf0b2b3d072ff129ec470","aggregate":null,"name":"US Census Tracts Geoids","type":"Text","description":null,"boundary_id":"us.census.tiger.census_tract"}' as test_get_obs_column_with_geoid_and_census_1, - (expected)[2]::text = '{"colname":"geoid","tablename":"obs_ab038198aaab3f3cb055758638ee4de28ad70146","aggregate":null,"name":"US Census Tracts Geoids","type":"Text","description":null,"boundary_id":"us.census.tiger.census_tract"}' as test_get_obs_column_with_geoid_and_census_2 +select + (expected)[1]::text = '{"colname":"geoid","tablename":"obs_1746e37b7cd28cb131971ea4187d42d71f09c5f3","aggregate":null,"name":"US Census Tracts Geoids","type":"Text","description":null,"boundary_id":"us.census.tiger.census_tract"}' as test_get_obs_column_with_geoid_and_census_1, + (expected)[2]::text = '{"colname":"geoid","tablename":"obs_b393b5b88c6adda634b2071a8005b03c551b609a","aggregate":null,"name":"US Census Tracts Geoids","type":"Text","description":null,"boundary_id":"us.census.tiger.census_tract"}' as test_get_obs_column_with_geoid_and_census_2 from result; -- should be null-valued @@ -50,7 +51,7 @@ SELECT array_agg(a) expected from cdb_observatory._OBS_GetColumnData( 'us.census.tiger.census_tract', Array['us.census.tiger.baloney'], - '2009 - 2013') a + '2010 - 2014') a ) select expected is null as OBS_GetColumnData_missing_measure from result; @@ -60,13 +61,13 @@ from result; SELECT cdb_observatory._OBS_BuildSnapshotQuery( Array['total_pop','male_pop','female_pop','median_age'] - ); + ) = 'SELECT vals[1] As total_pop, vals[2] As male_pop, vals[3] As female_pop, vals[4] As median_age' As _OBS_BuildSnapshotQuery_test_1; -- should give back: SELECT vals[1] As mandarin_orange SELECT cdb_observatory._OBS_BuildSnapshotQuery( Array['mandarin_orange'] - ); + ) = 'SELECT vals[1] As mandarin_orange' As _OBS_BuildSnapshotQuery_test_2; SELECT cdb_observatory._OBS_GetRelatedColumn( Array[ @@ -75,9 +76,9 @@ SELECT cdb_observatory._OBS_GetRelatedColumn( 'us.census.acs.B01001002' ], 'denominator' - ); + ) = '{es.ine.total_pop,NULL,us.census.acs.B01003001}' As _OBS_GetRelatedColumn_test; -- should give back a standardized measure name -SELECT cdb_observatory._OBS_StandardizeMeasureName('test 343 %% 2 qqq }}{{}}'); +SELECT cdb_observatory._OBS_StandardizeMeasureName('test 343 %% 2 qqq }}{{}}') = 'test_343_2_qqq' As _OBS_StandardizeMeasureName_test; \i test/fixtures/drop_fixtures.sql diff --git a/src/pg/test/sql/41_observatory_augmentation_test.sql b/src/pg/test/sql/41_observatory_augmentation_test.sql index 6c4762c..937721a 100644 --- a/src/pg/test/sql/41_observatory_augmentation_test.sql +++ b/src/pg/test/sql/41_observatory_augmentation_test.sql @@ -6,14 +6,9 @@ WITH result as( Select count(coalesce(OBS_GetDemographicSnapshot->>'value', 'foo')) expected_columns FROM cdb_observatory.OBS_GetDemographicSnapshot(cdb_observatory._TestPoint()) -) select expected_columns ='59' as OBS_GetDemographicSnapshot_test_no_returns +) select expected_columns = 52 as OBS_GetDemographicSnapshot_test_no_returns FROM result; --- --- names | vals --- --------------|------- --- median_income | 45122 - WITH result as ( SELECT _OBS_Get::text as expected FROM cdb_observatory._OBS_Get( @@ -103,8 +98,8 @@ SELECT cdb_observatory.OBS_GetSegmentSnapshot( cdb_observatory._TestPoint(), 'us.census.tiger.census_tract' )::text = - '{"segment_name":"Spielman-Singleton Segments: 10 Clusters","us.census.acs.B01003001_quantile":"0.234783783783784","us.census.acs.B01001002_quantile":"0.422405405405405","us.census.acs.B01001026_quantile":"0.0987567567567568","us.census.acs.B01002001_quantile":"0.0715","us.census.acs.B03002003_quantile":"0.295310810810811","us.census.acs.B03002004_quantile":"0.407189189189189","us.census.acs.B03002006_quantile":"0.625608108108108","us.census.acs.B03002012_quantile":"0.795202702702703","us.census.acs.B05001006_quantile":"0.703797297297297","us.census.acs.B08006001_quantile":"0.59227027027027","us.census.acs.B08006002_quantile":"0.0180540540540541","us.census.acs.B08006008_quantile":"0.993756756756757","us.census.acs.B08006009_quantile":"0.728162162162162","us.census.acs.B08006011_quantile":"0.995972972972973","us.census.acs.B08006015_quantile":"0.929135135135135","us.census.acs.B08006017_quantile":"0.625432432432432","us.census.acs.B09001001_quantile":"0.0386081081081081","us.census.acs.B11001001_quantile":"0.157121621621622","us.census.acs.B14001001_quantile":"0.241878378378378","us.census.acs.B14001002_quantile":"0.173783783783784","us.census.acs.B14001005_quantile":"0.0380675675675676","us.census.acs.B14001006_quantile":"0.0308108108108108","us.census.acs.B14001007_quantile":"0.0486216216216216","us.census.acs.B14001008_quantile":"0.479743243243243","us.census.acs.B15003001_quantile":"0.297675675675676","us.census.acs.B15003017_quantile":"0.190351351351351","us.census.acs.B15003022_quantile":"0.802513513513514","us.census.acs.B15003023_quantile":"0.757148648648649","us.census.acs.B16001001_quantile":"0.255405405405405","us.census.acs.B16001002_quantile":"0.196094594594595","us.census.acs.B16001003_quantile":"0.816851351351351","us.census.acs.B17001001_quantile":"0.252513513513514","us.census.acs.B17001002_quantile":"0.560054054054054","us.census.acs.B19013001_quantile":"0.777472972972973","us.census.acs.B19083001_quantile":"0.336932432432432","us.census.acs.B19301001_quantile":"0.655378378378378","us.census.acs.B25001001_quantile":"0.141810810810811","us.census.acs.B25002003_quantile":"0.362824324324324","us.census.acs.B25004002_quantile":"0.463837837837838","us.census.acs.B25004004_quantile":"0","us.census.acs.B25058001_quantile":"0.939040540540541","us.census.acs.B25071001_quantile":"0.419445945945946","us.census.acs.B25075001_quantile":"0.0387972972972973","us.census.acs.B25075025_quantile":"0"}' as test_point_segmentation; - + '{"segment_name":"Spielman-Singleton Segments: 10 Clusters","us.census.acs.B01003001_quantile":"0.3235","us.census.acs.B01001002_quantile":"0.494716216216216","us.census.acs.B01001026_quantile":"0.183756756756757","us.census.acs.B01002001_quantile":"0.0752837837837838","us.census.acs.B03002003_quantile":"0.293162162162162","us.census.acs.B03002004_quantile":"0.455527027027027","us.census.acs.B03002006_quantile":"0.656405405405405","us.census.acs.B03002012_quantile":"0.840081081081081","us.census.acs.B05001006_quantile":"0.727135135135135","us.census.acs.B08006001_quantile":"0.688635135135135","us.census.acs.B08006002_quantile":"0.0204459459459459","us.census.acs.B08006008_quantile":"0.679324324324324","us.census.acs.B08006009_quantile":"0.996716216216216","us.census.acs.B08006011_quantile":"0.967418918918919","us.census.acs.B08006015_quantile":"0.512945945945946","us.census.acs.B08006017_quantile":"0.0504864864864865","us.census.acs.B09001001_quantile":"0.192405405405405","us.census.acs.B11001001_quantile":"0.331702702702703","us.census.acs.B14001001_quantile":"0.296283783783784","us.census.acs.B14001002_quantile":"0.045472972972973","us.census.acs.B14001005_quantile":"0.0442702702702703","us.census.acs.B14001006_quantile":"0.0829054054054054","us.census.acs.B14001007_quantile":"0.701135135135135","us.census.acs.B14001008_quantile":"0.404527027027027","us.census.acs.B15003001_quantile":"0.191824324324324","us.census.acs.B15003017_quantile":"0.864162162162162","us.census.acs.B15003022_quantile":"0.754297297297297","us.census.acs.B15003023_quantile":"0.350054054054054","us.census.acs.B16001001_quantile":"0.217635135135135","us.census.acs.B16001002_quantile":"0.85972972972973","us.census.acs.B16001003_quantile":"0.342851351351351","us.census.acs.B17001001_quantile":"0.51204054054054","us.census.acs.B17001002_quantile":"0.813540540540541","us.census.acs.B19013001_quantile":"0.0948648648648649","us.census.acs.B19083001_quantile":"0.678351351351351","us.census.acs.B19301001_quantile":"0.146108108108108","us.census.acs.B25001001_quantile":"0.149067567567568","us.census.acs.B25002003_quantile":"0","us.census.acs.B25004002_quantile":"0","us.census.acs.B25004004_quantile":"0.944554054054054","us.census.acs.B25058001_quantile":"0.398040540540541","us.census.acs.B25071001_quantile":"0.0596081081081081","us.census.acs.B25075001_quantile":"0","us.census.acs.B25075025_quantile":null}' as test_point_segmentation; + -- segmentation around null island SELECT cdb_observatory.OBS_GetSegmentSnapshot( ST_SetSRID(ST_Point(0, 0), 4326), @@ -155,7 +150,7 @@ SELECT abs(OBS_GetMeasure_total_pop_point - 10923.093200390833950) / 10923.09320 -- Poly-based OBS_GetMeasure, default normalization (none) -- is result within 0.1% of expected -SELECT abs(OBS_GetMeasure_total_pop_polygon - 12327.3133495107) / 12327.3133495107 < 0.001 As OBS_GetMeasure_total_pop_polygon_test FROM +SELECT abs(OBS_GetMeasure_total_pop_polygon - 9833.47316573952) / 9833.47316573952 < 0.001 As OBS_GetMeasure_total_pop_polygon_test FROM cdb_observatory.OBS_GetMeasure( cdb_observatory._TestArea(), 'us.census.acs.B01003001' @@ -169,7 +164,7 @@ SELECT (abs(cdb_observatory.OBS_GetMeasure( -- Poly-based OBS_GetMeasure with denominator normalization SELECT abs(cdb_observatory.OBS_GetMeasure( cdb_observatory._TestArea(), - 'us.census.acs.B01001002', 'denominator') - 0.49026340444793965457) / 0.49026340444793965457 < 0.001 As OBS_GetMeasure_total_male_poly_denominator; + 'us.census.acs.B01001002', 'denominator') - 0.50597531462834994530) / 0.49026340444793965457 < 0.001 As OBS_GetMeasure_total_male_poly_denominator; -- Point-based OBS_GetCategory SELECT cdb_observatory.OBS_GetCategory( @@ -186,7 +181,7 @@ SELECT (abs(OBS_GetPopulation - 10923.093200390833950) / 10923.093200390833950) ) As m(OBS_GetPopulation); -- Poly-based OBS_GetPopulation, default normalization (none) -SELECT (abs(obs_getpopulation_polygon - 12327.3133495107) / 12327.3133495107) < 0.001 As obs_getpopulation_polygon_test +SELECT (abs(obs_getpopulation_polygon - 9833.47316573952) / 9833.47316573952) < 0.001 As obs_getpopulation_polygon_test FROM cdb_observatory.OBS_GetPopulation( cdb_observatory._TestArea() @@ -198,7 +193,7 @@ SELECT (abs(cdb_observatory.obs_getuscensusmeasure( -- Poly-based OBS_GetUSCensusMeasure, default normalization (none) SELECT (abs(cdb_observatory.obs_getuscensusmeasure( - cdb_observatory._testarea(), 'male population') - 6043.63061042765) / 6043.63061042765) < 0.001 As obs_getuscensusmeasure; + cdb_observatory._testarea(), 'male population') - 4975.49467892449) / 4975.49467892449) < 0.001 As obs_getuscensusmeasure; -- Point-based OBS_GetUSCensusCategory SELECT cdb_observatory.OBS_GetUSCensusCategory( diff --git a/src/pg/test/sql/42_observatory_exploration_test.sql b/src/pg/test/sql/42_observatory_exploration_test.sql index b0451bc..2890bad 100644 --- a/src/pg/test/sql/42_observatory_exploration_test.sql +++ b/src/pg/test/sql/42_observatory_exploration_test.sql @@ -9,7 +9,7 @@ -- _OBS_SearchTables tests SELECT - t.table_name As _OBS_SearchTables_tables_match, + t.table_name = 'obs_1babf5a26a1ecda5fb74963e88408f71d0364b81' As _OBS_SearchTables_tables_match, t.timespan = '2014' As _OBS_SearchTables_timespan_matches FROM cdb_observatory._OBS_SearchTables( 'us.census.tiger.county', @@ -24,8 +24,10 @@ FROM cdb_observatory._OBS_SearchTables( '1988' -- year before first tiger data was collected ) As t(table_name, timespan); -SELECT cdb_observatory.OBS_Search('total_pop'); +SELECT * +FROM cdb_observatory.OBS_Search('total_pop'); -SELECT * from cdb_observatory.OBS_GetAvailableBoundaries(cdb_observatory._TestPoint()); +SELECT * +FROM cdb_observatory.OBS_GetAvailableBoundaries(cdb_observatory._TestPoint()); \i test/fixtures/drop_fixtures.sql