Skip to content

Commit f5aa034

Browse files
jaymedinabsipocz
authored andcommitted
simpler assertions for test_catalogs_query_object
1 parent 9d8a20e commit f5aa034

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

astroquery/mast/tests/test_mast_remote.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -430,27 +430,27 @@ def test_catalogs_query_object(self):
430430
radius=".02 deg",
431431
catalog="TIC")
432432
assert isinstance(result, Table)
433-
assert result[np.where(result['ID'] == '189844449')]
433+
assert '189844449' in result['ID']
434434

435435
result = mast.Catalogs.query_object("M10",
436436
radius=.001,
437437
catalog="HSC",
438438
magtype=1)
439439
assert isinstance(result, Table)
440-
assert result[np.where(result['MatchID']) == '60112519']
440+
assert '60112519' in result['MatchID']
441441

442442
result = mast.Catalogs.query_object("M10",
443443
radius=.001,
444444
catalog="panstarrs",
445445
table="mean")
446446
assert isinstance(result, Table)
447-
assert result[np.where(result['objName'] == 'PSO J254.2872-04.0991')]
447+
assert 'PSO J254.2872-04.0991' in result['objName']
448448

449449
result = mast.Catalogs.query_object("M101",
450450
radius=1,
451451
catalog="diskdetective")
452452
assert isinstance(result, Table)
453-
assert result[np.where(result['designation'] == 'J140758.82+534902.4')]
453+
assert 'J140758.82+534902.4' in result['designation']
454454

455455
result = mast.Catalogs.query_object("M10",
456456
radius=0.01,
@@ -465,7 +465,7 @@ def test_catalogs_query_object(self):
465465
radius=0.01,
466466
catalog="ctl")
467467
assert isinstance(result, Table)
468-
assert result[np.where(result['ID'] == '441662144')]
468+
assert '441662144' in result['ID']
469469

470470
def test_catalogs_query_criteria_async(self):
471471
# without position
@@ -519,48 +519,48 @@ def test_catalogs_query_criteria(self):
519519
Bmag=[30, 50],
520520
objType="STAR")
521521
assert isinstance(result, Table)
522-
assert result[np.where(result['ID'] == '81609218')]
522+
assert '81609218' in result['ID']
523523

524524
result = mast.Catalogs.query_criteria(catalog="ctl",
525525
Tmag=[10.5, 11],
526526
POSflag="2mass")
527527
assert isinstance(result, Table)
528-
assert result[np.where(result['ID'] == '291067184')]
528+
assert '291067184' in result['ID']
529529

530530
result = mast.Catalogs.query_criteria(catalog="DiskDetective",
531531
state=["inactive", "disabled"],
532532
oval=[8, 10],
533533
multi=[3, 7])
534534
assert isinstance(result, Table)
535-
assert result[np.where(result['designation'] == 'J003920.04-300132.4')]
535+
assert 'J003920.04-300132.4' in result['designation']
536536

537537
# with position
538538
result = mast.Catalogs.query_criteria(catalog="Tic",
539539
objectname="M10", objType="EXTENDED")
540540
assert isinstance(result, Table)
541-
assert result[np.where(result['ID'] == '10000732589')]
541+
assert '10000732589' in result['ID']
542542

543543
result = mast.Catalogs.query_criteria(objectname='TIC 291067184',
544544
catalog="ctl",
545545
Tmag=[10.5, 11],
546546
POSflag="2mass")
547547
assert isinstance(result, Table)
548-
assert result[np.where(result['Tmag']) == 10.893]
548+
assert 10.893 in result['Tmag']
549549

550550
result = mast.Catalogs.query_criteria(catalog="DiskDetective",
551551
objectname="M10",
552552
radius=2,
553553
state="complete")
554554
assert isinstance(result, Table)
555-
assert result[np.where(result['designation'] == 'J165628.40-054630.8')]
555+
assert 'J165628.40-054630.8' in result['designation']
556556

557557
result = mast.Catalogs.query_criteria(catalog="panstarrs",
558558
objectname="M10",
559559
radius=.01,
560560
qualityFlag=32,
561561
zoneID=10306)
562562
assert isinstance(result, Table)
563-
assert result[np.where(result['objName'] == 'PSO J254.2861-04.1091')]
563+
assert 'PSO J254.2861-04.1091' in result['objName']
564564

565565
def test_catalogs_query_hsc_matchid_async(self):
566566
catalogData = mast.Catalogs.query_object("M10",

0 commit comments

Comments
 (0)