test_queries.py modified

Author: MihsehKong

tests/test_queries.py

@@ -67,8 +67,23 @@ def test_query_datetime (datalevel, datetime, capsys):
 
     assert os.path.exists(outpath), \
         f'Result not downloaded to file [{outpath:s}]'
-    assert (filecmp.cmp (outpath, datapath, shallow=False))
+    
+    if (datalevel == 'l0'):
+        assert (filecmp.cmp (outpath, datapath, shallow=False))
+
+    elif (datalevel == 'l1'):
+        astropytbl = None
+        astropytbl = Table.read (outpath, format='ascii.ipac')
+        assert (astropytbl is not None), \
+            "f{outpath:s} cannot be read by astropy"
+
+        astropytbl_truth = None
+        astropytbl_truth = Table.read (datapath, format='ascii.ipac')
+        assert (astropytbl_truth  is not None), \
+            "f{datapath:s} cannot be read by astropy"
 
+        assert (len(astropytbl) == len(astropytbl_truth)), \
+            f"Number of records in {outpath:s} is incorrect"
 
 #
 #    test query_position method for all datalevel; 
@@ -97,7 +112,20 @@ def test_query_position (datalevel, pos, capsys):
 
     assert os.path.exists(outpath), \
         f'Result not downloaded to file [{outpath:s}]'
-    assert (filecmp.cmp (outpath, datapath, shallow=False))
+    #assert (filecmp.cmp (outpath, datapath, shallow=False))
+
+    astropytbl = None
+    astropytbl = Table.read (outpath, format='ascii.ipac')
+    assert (astropytbl is not None), \
+        "f{outpath:s} cannot be read by astropy"
+
+    astropytbl_truth = None
+    astropytbl_truth = Table.read (datapath, format='ascii.ipac')
+    assert (astropytbl_truth  is not None), \
+        "f{datapath:s} cannot be read by astropy"
+
+    assert (len(astropytbl) >= len(astropytbl_truth)), \
+        f"Number of records in {outpath:s} is incorrect"
 
 
 #
@@ -116,7 +144,20 @@ def test_query_object():
 
     assert os.path.exists(outpath), \
         f'Result not downloaded to file [{outpath:s}]'
-    assert (filecmp.cmp (outpath, datapath, shallow=False))
+    #assert (filecmp.cmp (outpath, datapath, shallow=False))
+
+    astropytbl = None
+    astropytbl = Table.read (outpath, format='ascii.ipac')
+    assert (astropytbl is not None), \
+        "f{outpath:s} cannot be read by astropy"
+
+    astropytbl_truth = None
+    astropytbl_truth = Table.read (datapath, format='ascii.ipac')
+    assert (astropytbl_truth  is not None), \
+        "f{datapath:s} cannot be read by astropy"
+
+    assert (len(astropytbl) >= len(astropytbl_truth)), \
+        f"Number of records in {outpath:s} is incorrect"
 
 
 #
@@ -135,7 +176,20 @@ def test_query_qobject():
 
     assert os.path.exists(outpath), \
         f'Result not downloaded to file [{outpath:s}]'
-    assert (filecmp.cmp (outpath, datapath, shallow=False))
+    #assert (filecmp.cmp (outpath, datapath, shallow=False))
+
+    astropytbl = None
+    astropytbl = Table.read (outpath, format='ascii.ipac')
+    assert (astropytbl is not None), \
+        "f{outpath:s} cannot be read by astropy"
+
+    astropytbl_truth = None
+    astropytbl_truth = Table.read (datapath, format='ascii.ipac')
+    assert (astropytbl_truth  is not None), \
+        "f{datapath:s} cannot be read by astropy"
+
+    assert (len(astropytbl) >= len(astropytbl_truth)), \
+        f"Number of records in {outpath:s} is incorrect"
 
 #
 #    test query_program method using l1 data
@@ -147,13 +201,26 @@ def test_query_program():
 
     Neid.query_program ('l1', \
         '2021A-2014', \
-        cookiepath='./neidtestcookie.txt', \
+        cookiepath='./neidadmincookie.txt', \
         format='ipac', \
         outpath=outpath)
 
     assert os.path.exists(outpath), \
         f'Result not downloaded to file [{outpath:s}]'
-    assert (filecmp.cmp (outpath, datapath, shallow=False))
+    #assert (filecmp.cmp (outpath, datapath, shallow=False))
+
+    astropytbl = None
+    astropytbl = Table.read (outpath, format='ascii.ipac')
+    assert (astropytbl is not None), \
+        "f{outpath:s} cannot be read by astropy"
+
+    astropytbl_truth = None
+    astropytbl_truth = Table.read (datapath, format='ascii.ipac')
+    assert (astropytbl_truth  is not None), \
+        "f{datapath:s} cannot be read by astropy"
+
+    assert (len(astropytbl) >= len(astropytbl_truth)), \
+        f"Number of records in {outpath:s} is incorrect"
 
 
 #
@@ -196,7 +263,20 @@ def test_qeury_adql():
 
     assert os.path.exists(outpath), \
         f'Result not downloaded to file [{outpath:s}]'
-    assert (filecmp.cmp (outpath, datapath, shallow=False))
+    #assert (filecmp.cmp (outpath, datapath, shallow=False))
+
+    astropytbl = None
+    astropytbl = Table.read (outpath, format='ascii.ipac')
+    assert (astropytbl is not None), \
+        "f{outpath:s} cannot be read by astropy"
+
+    astropytbl_truth = None
+    astropytbl_truth = Table.read (datapath, format='ascii.ipac')
+    assert (astropytbl_truth  is not None), \
+        "f{datapath:s} cannot be read by astropy"
+
+    assert (len(astropytbl) >= len(astropytbl_truth)), \
+        f"Number of records in {outpath:s} is incorrect"
 
 #
 #    test query_adql method: