Skip to content

Commit 362d5be

Browse files
committed
Remove unused code from a test class
Unused methods and attributes of `astroquery.utils.tap.conn.tests.DummyConnHandler.DummyConnHandler` have been removed. `get_last_request()` was used, but trivial to replace with an attribute lookup.
1 parent 90c5652 commit 362d5be

File tree

2 files changed

+5
-32
lines changed

2 files changed

+5
-32
lines changed

astroquery/utils/tap/conn/tests/DummyConnHandler.py

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ def __init__(self):
2727
self.fileExt = ".ext"
2828
self.defaultResponse = None
2929
self.responses = {}
30-
self.errorFileOutput = None
31-
self.errorReceivedResponse = None
3230
self.contentType = None
3331
self.verbose = None
3432
self.query = None
@@ -40,21 +38,6 @@ def set_default_response(self, defaultResponse):
4038
def get_default_response(self):
4139
return self.defaultResponse
4240

43-
def get_last_request(self):
44-
return self.request
45-
46-
def get_last_data(self):
47-
return self.data
48-
49-
def get_last_query(self):
50-
return self.query
51-
52-
def get_error_file_output(self):
53-
return self.errorFileOutput
54-
55-
def get_error_received_response(self):
56-
return self.errorReceivedResponse
57-
5841
def set_response(self, request, response):
5942
self.responses[str(request)] = response
6043

@@ -100,8 +83,6 @@ def __execute_post(self, subcontext=None, data=None,
10083
return self.__get_response(self.request)
10184

10285
def dump_to_file(self, fileOutput, response):
103-
self.errorFileOutput = fileOutput
104-
self.errorReceivedResponse = response
10586
print(f"DummyConnHandler - dump to file: file: '{fileOutput}', \
10687
response status: {response.status}, response msg: {response.reason}")
10788

@@ -148,9 +129,6 @@ def check_launch_response_status(self, response, debug,
148129
def get_suitable_extension(self, headers):
149130
return self.fileExt
150131

151-
def set_suitable_extension(self, ext):
152-
self.fileExt = ext
153-
154132
def get_suitable_extension_by_format(self, output_format):
155133
return self.fileExt
156134

astroquery/utils/tap/tests/test_tap.py

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -78,35 +78,30 @@ def test_load_tables_parameters():
7878

7979
# empty request
8080
tap.load_tables()
81-
request = connHandler.get_last_request()
82-
assert request == tableRequest
81+
assert connHandler.request == tableRequest
8382

8483
# flag only_names=false & share_accessible=false: equals to
8584
# empty request
8685
tap.load_tables(only_names=False, include_shared_tables=False)
87-
request = connHandler.get_last_request()
88-
assert request == tableRequest
86+
assert connHandler.request == tableRequest
8987

9088
# flag only_names
9189
tableRequest = "tables?only_tables=true"
9290
connHandler.set_response(tableRequest, responseLoadTable)
9391
tap.load_tables(only_names=True)
94-
request = connHandler.get_last_request()
95-
assert request == tableRequest
92+
assert connHandler.request == tableRequest
9693

9794
# flag share_accessible=true
9895
tableRequest = "tables?share_accessible=true"
9996
connHandler.set_response(tableRequest, responseLoadTable)
10097
tap.load_tables(include_shared_tables=True)
101-
request = connHandler.get_last_request()
102-
assert request == tableRequest
98+
assert connHandler.request == tableRequest
10399

104100
# flag only_names=true & share_accessible=true
105101
tableRequest = "tables?only_tables=true&share_accessible=true"
106102
connHandler.set_response(tableRequest, responseLoadTable)
107103
tap.load_tables(only_names=True, include_shared_tables=True)
108-
request = connHandler.get_last_request()
109-
assert request == tableRequest
104+
assert connHandler.request == tableRequest
110105

111106

112107
def test_load_table():

0 commit comments

Comments
 (0)