Skip to content

Commit b352ca3

Browse files
keflavichkeflavich
committed
add local tests and cleanup some testing
1 parent c574cb1 commit b352ca3

File tree

6 files changed

+378
-32
lines changed

6 files changed

+378
-32
lines changed

‎astroquery/higal/core.py‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,11 @@ def _args_to_payload(self, coords=None, name=None, radius=10*u.arcmin,
105105

106106
if not hasattr(self, '_session_id'):
107107
# set up session: get cookies
108-
initial_response = self._request('GET', self.URL, cache=False,
109-
timeout=self.TIMEOUT)
110-
initial_response.raise_for_status()
108+
# (save _initial_response for later debugging)
109+
self._initial_response = self._request('GET', self.URL,
110+
cache=False,
111+
timeout=self.TIMEOUT)
112+
self._initial_response.raise_for_status()
111113

112114
# multiple cookies are returned
113115
self._session_id = self._session.cookies.values()[1]

‎astroquery/higal/tests/data/frontpage.html‎

Lines changed: 316 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,316 @@
1+
2+
3+
4+
5+
6+
7+
8+
9+
10+
11+
<!DOCTYPE html>
12+
<html>
13+
14+
15+
16+
17+
<head>
18+
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
19+
<title>Hi-GAL Catalogs and Image Server</title>
20+
21+
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css">
22+
<!--<link rel="stylesheet" href="css/bootstrap-3.3.5.css">-->
23+
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js"></script>
24+
<script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-select/1.6.2/js/bootstrap-select.min.js"></script>
25+
26+
<script type='text/javascript' src='js/jquery-1.9.1.js'></script>
27+
<script src="js/jquery.fileDownload.js" type="text/javascript"></script>
28+
29+
<script type='text/javascript' src='js/validationFormCommon.js'></script>
30+
<script type='text/javascript' src='js/validationFormHiGAL.js'></script>
31+
<script type="text/javascript" src="js/jquery.validate-1.11.1.js"></script>
32+
<script type="text/javascript" src="js/jquery.form.js"></script>
33+
<script type="text/javascript" src="js/jquery.autocomplete.js"></script>
34+
<script type="text/javascript" src="js/ajaxautocomplete.js"></script>
35+
<script type="text/javascript" src="js/jquery-ui-1.10.2.js"></script>
36+
<script type="text/javascript" src="js/jquery.ui.waitbutton.js"></script>
37+
38+
<style type="text/css">
39+
form label { width: 250px; }
40+
form label.error,
41+
</style>
42+
43+
<link href="css/jquery-ui.css" rel="stylesheet" type="text/css" />
44+
<!--<link href="/commons/css/screen.css" rel="stylesheet" type="text/css" />-->
45+
<link href="css/mmc.css" rel="stylesheet" type="text/css" />
46+
<link href="css/jquery.ui.waitbutton.css" rel="stylesheet" type="text/css" />
47+
</head>
48+
<body>
49+
50+
<div class="panel panel-default">
51+
<div class="panel-heading">
52+
53+
54+
55+
56+
57+
58+
59+
60+
61+
62+
<table class="pageHeader" width="100%">
63+
<tr>
64+
<td valign="top" rowspan="2">
65+
66+
67+
68+
69+
70+
<img src="images/logo_higal_header.png" alt="logo_higal_header.png"/>
71+
72+
73+
74+
</td>
75+
<td valign="top" rowspan="2">
76+
77+
</td>
78+
79+
80+
81+
82+
83+
84+
85+
86+
87+
88+
89+
<td align="left" valign="top">
90+
Version 1.0.2
91+
</td>
92+
93+
94+
95+
</tr>
96+
97+
98+
99+
<tr>
100+
<td align="left" valign="bottom">
101+
<table>
102+
103+
104+
</table>
105+
</td>
106+
</tr>
107+
108+
</table>
109+
</div>
110+
111+
</div>
112+
<br>
113+
114+
<div class="container-fluid">
115+
<form id="searchForm" method="POST">
116+
<table class="tableSearch">
117+
<tr>
118+
<td colspan="2" class="tdGradientTitle">Hi-GAL Catalogs and Image Server</td>
119+
</tr>
120+
<tr>
121+
122+
<td rowspan="3" class="tdDownload" style=" padding-left: 10px;padding-right: 10px;">
123+
<button id="exportCatalog">
124+
<span class="ui-button-text">Export Selected Catalogs</span>
125+
</button>
126+
</td>
127+
128+
<td align="center">
129+
<br>
130+
<b>Coordinates/Object:</b>
131+
<input type="text" style="width: 20em"
132+
title="HMS (HH MM SS.ss) dms ([-]dd mm ss.ss) or deg (decimal) deg (decimal)"
133+
pattern="^\s*(?:([+]?[0-9]{1,2}\s+[0-9]{1,2}\s+[0-9]{1,2}(?:\.[0-9]+)?)\s+([+-]?[0-9]{1,2}\s+[0-9]{1,2}\s+[0-9]{1,2}(?:\.[0-9]+)?))\s*$|^\s*(?:([+]?[0-9]{1,2}:[0-9]{1,2}:[0-9]{1,2}(?:\.[0-9]+)?)\s+([+-]?[0-9]{1,2}:[0-9]{1,2}:[0-9]{1,2}(?:\.[0-9]+)?))\s*$|^\s*(?:([+]?[0-9]{1,3}(?:\.[0-9]+)?)\s+([+-]?[0-9]{1,2}(?:\.[0-9]+)?))\s*$"
134+
placeholder="HMS dms or deg deg" name="coordobjc" id="coordobjc">
135+
<div id="divPop" style="z-index:500;position:absolute;display:none">
136+
<p style="color: #990000; font-weight: bold">Interrogating Name server ....<br><img border='0' src='images/ajax-loader-red.gif'></p>
137+
</div>
138+
<input id="coordsTypeRADEC" name="coordsType" value="RADEC" type="radio" checked="checked" style="width: 2em;">RA DEC
139+
<input id="coordsTypeLB" name="coordsType" value="LB" type="radio" style="width: 2em;">L B
140+
<br><br>
141+
<b>Name Resolver:</b>
142+
<input type="checkbox" name="NameResolverLOCAL" id="NameResolverLOCAL" value="LOCAL" checked="true" style="width: 2em;">Local
143+
<input onclick="$('input#coordobjc').autocomplete('search');" type="checkbox" name="NameResolverSIMBAD" id="NameResolverSIMBAD" value="SIMBAD" style="width: 2em;">SIMBAD
144+
<input onclick="$('input#coordobjc').autocomplete('search');" type="checkbox" name="NameResolverNED" id="NameResolverNED" value="NED" style="width: 2em;">NED
145+
<br><br>
146+
147+
<!-- <input type="checkbox" style="width: 1em;" name="global_radius_ck" id="global_radius_ck" style="">-->
148+
&nbsp;<b>Radius: </b>
149+
<select id='radius' name='radius' maxlength='2'>
150+
<option>degrees</option>
151+
<option selected=''>arcmin</option>
152+
<option>arcsec</option>
153+
</select>
154+
<input type="text" id="radiusInput" value="10" name="radiusInput">
155+
&nbsp;(Arcmin max 30)
156+
157+
<br><br>
158+
</td>
159+
</tr>
160+
161+
<tr>
162+
163+
164+
<td><!--lista cataloghi-->
165+
<table id="tableCatalogs" style="width: 100%;">
166+
167+
<tr>
168+
<td>
169+
170+
<input type="checkbox" style="width: 1em;" checked="checked" value="Available Catalogs" id="AvailableCatalogs">
171+
<span>Available Catalogs</span>
172+
</td>
173+
</tr>
174+
175+
<tr>
176+
<td>
177+
<div style="width: 100%; padding-left: 10px; display: block;" id="catalogToShow">
178+
179+
180+
181+
182+
183+
184+
<br>
185+
<fieldset id="fieldset-HIGAL">
186+
<legend class="legendBlue">
187+
<input type="checkbox" id="HIGAL" name="HIGAL" checked="checked" value="HIGAL" style="width: 1em;">
188+
<b>HIGAL:&nbsp;</b>
189+
</legend>
190+
<div id="DIV-HIGAL">
191+
192+
193+
194+
195+
196+
197+
198+
199+
200+
201+
202+
203+
<div style="padding-right: 1em;float: left; white-space: nowrap; display:inline; clear: none">
204+
<input type="checkbox" style="width: 1em;" name="catalog" checked="checked" value="4047">
205+
<input type="hidden" name="catalog_radius_4047" id="catalog_radius_4047" value="1.0">
206+
<!--<span onclick="showProperties(this, '4047')" style="cursor: pointer;" title="Click to modify search radius"><b>HIGAL_BLUE</b></span>&nbsp;&nbsp;&nbsp;-->
207+
<b>HIGAL_BLUE</b>&nbsp;&nbsp;&nbsp;
208+
</div>
209+
210+
211+
212+
213+
214+
215+
216+
217+
<div style="padding-right: 1em;float: left; white-space: nowrap; display:inline; clear: none">
218+
<input type="checkbox" style="width: 1em;" name="catalog" checked="checked" value="4051">
219+
<input type="hidden" name="catalog_radius_4051" id="catalog_radius_4051" value="1.0">
220+
<!--<span onclick="showProperties(this, '4051')" style="cursor: pointer;" title="Click to modify search radius"><b>HIGAL_RED</b></span>&nbsp;&nbsp;&nbsp;-->
221+
<b>HIGAL_RED</b>&nbsp;&nbsp;&nbsp;
222+
</div>
223+
224+
225+
226+
227+
228+
229+
230+
231+
<div style="padding-right: 1em;float: left; white-space: nowrap; display:inline; clear: none">
232+
<input type="checkbox" style="width: 1em;" name="catalog" checked="checked" value="4050">
233+
<input type="hidden" name="catalog_radius_4050" id="catalog_radius_4050" value="1.0">
234+
<!--<span onclick="showProperties(this, '4050')" style="cursor: pointer;" title="Click to modify search radius"><b>HIGAL_PSW</b></span>&nbsp;&nbsp;&nbsp;-->
235+
<b>HIGAL_PSW</b>&nbsp;&nbsp;&nbsp;
236+
</div>
237+
238+
239+
240+
241+
242+
243+
244+
245+
<div style="padding-right: 1em;float: left; white-space: nowrap; display:inline; clear: none">
246+
<input type="checkbox" style="width: 1em;" name="catalog" checked="checked" value="4049">
247+
<input type="hidden" name="catalog_radius_4049" id="catalog_radius_4049" value="1.0">
248+
<!--<span onclick="showProperties(this, '4049')" style="cursor: pointer;" title="Click to modify search radius"><b>HIGAL_PMW</b></span>&nbsp;&nbsp;&nbsp;-->
249+
<b>HIGAL_PMW</b>&nbsp;&nbsp;&nbsp;
250+
</div>
251+
252+
253+
254+
255+
256+
257+
258+
259+
<div style="padding-right: 1em;float: left; white-space: nowrap; display:inline; clear: none">
260+
<input type="checkbox" style="width: 1em;" name="catalog" checked="checked" value="4048">
261+
<input type="hidden" name="catalog_radius_4048" id="catalog_radius_4048" value="1.0">
262+
<!--<span onclick="showProperties(this, '4048')" style="cursor: pointer;" title="Click to modify search radius"><b>HIGAL_PLW</b></span>&nbsp;&nbsp;&nbsp;-->
263+
<b>HIGAL_PLW</b>&nbsp;&nbsp;&nbsp;
264+
</div>
265+
266+
267+
268+
269+
</div>
270+
</fieldset>
271+
272+
273+
274+
275+
</div>
276+
</td>
277+
</tr>
278+
279+
</table>
280+
281+
</tr>
282+
<tr>
283+
<td>
284+
<!-- <input type="submit" value="Search">-->
285+
<!-- <input type="submit" value="Download">-->
286+
<br>
287+
<input type="submit" value="Search">
288+
<br>&nbsp;
289+
<input id="RA" type="hidden" name="RA">
290+
<input id="DEC" type="hidden" name="DEC">
291+
<input id="radius_all" type="hidden" name="radius_all" value="10">
292+
<input id="size" type="hidden" name="size" value="1">
293+
<input id="resolution" type="hidden" name="resolution" value="1">
294+
<input id="sourceString" type="hidden" name="sourceString" value="">
295+
<input type="hidden" value="2CD87511CC41CE7BDF8862363952EDBB" name="sessionId" id="sessionId">
296+
297+
</td>
298+
</tr>
299+
300+
</table>
301+
<div id="errors" align="center"></div>
302+
<ul id="prop" class="ulProperties">
303+
<li> Radius: <input type="text" id="propApp" value="">&nbsp;&nbsp;
304+
<input type="button" value="Save" class="saveButton" onclick="saveClose()">
305+
<input type="hidden" id="editId" name="editId" value="">
306+
</li>
307+
</ul>
308+
</form>
309+
</div>
310+
<br><br>
311+
<footer class="container-fluid">
312+
<p>&copy; SSDC</p>
313+
</footer>
314+
</body>
315+
316+
</html>

‎astroquery/higal/tests/data/g49.html‎

Lines changed: 1 addition & 0 deletions
Large diffs are not rendered by default.

‎astroquery/higal/tests/setup_package.py‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,7 @@
44
import os
55

66

7-
# setup paths to the test data
8-
# can specify a single file or a list of files
97
def get_package_data():
10-
paths = [os.path.join('data', '*.dat'),
11-
os.path.join('data', '*.xml'),
12-
] # etc, add other extensions
13-
# you can also enlist files individually by names
14-
# finally construct and return a dict for the sub module
15-
return {'astroquery.template_module.tests': paths}
8+
paths = [os.path.join('data', '*.html'),
9+
]
10+
return {'astroquery.higal.tests': paths}

0 commit comments

Comments
 (0)