@@ -18,17 +18,6 @@ fn parameters(test_case: &TestCase) -> Vec<(String, String)> {
1818 ]
1919}
2020
21- fn check_status_code ( code : StatusCode ) -> Result < ( ) > {
22- match code {
23- StatusCode :: OK => Ok ( ( ) ) ,
24- _ => Err ( anyhow ! (
25- "Expected status code to be {} but got {}" ,
26- StatusCode :: OK ,
27- code
28- ) ) ,
29- }
30- }
31-
3221#[ derive( Debug ) ]
3322pub struct TimedSearchResults {
3423 pub results : Result < SearchResults > ,
@@ -45,13 +34,24 @@ impl TimedSearchResults {
4534
4635 fn search_results ( response : Result < Response > ) -> Result < SearchResults > {
4736 let response = response?;
48- check_status_code ( response. status ( ) ) ?;
37+ Self :: check_status_code ( response. status ( ) ) ?;
4938 let json = Self :: json ( response) ?;
5039 let response = serde_json:: from_str :: < SearchResponse > ( json. as_str ( ) )
5140 . context ( "Could not parse JSON response" ) ?;
5241 Ok ( SearchResults :: new ( response) )
5342 }
5443
44+ fn check_status_code ( code : StatusCode ) -> Result < ( ) > {
45+ match code {
46+ StatusCode :: OK => Ok ( ( ) ) ,
47+ _ => Err ( anyhow ! (
48+ "Expected status code to be {} but got {}" ,
49+ StatusCode :: OK ,
50+ code
51+ ) ) ,
52+ }
53+ }
54+
5555 fn json ( response : Response ) -> Result < String > {
5656 response
5757 . text ( )
@@ -134,12 +134,12 @@ mod tests {
134134
135135 #[ test]
136136 fn check_status_code_when_ok ( ) {
137- assert ! ( check_status_code( StatusCode :: OK ) . is_ok( ) )
137+ assert ! ( TimedSearchResults :: check_status_code( StatusCode :: OK ) . is_ok( ) )
138138 }
139139
140140 #[ test]
141141 fn check_status_code_when_error ( ) {
142- let message = check_status_code ( StatusCode :: INTERNAL_SERVER_ERROR )
142+ let message = TimedSearchResults :: check_status_code ( StatusCode :: INTERNAL_SERVER_ERROR )
143143 . unwrap_err ( )
144144 . to_string ( ) ;
145145
0 commit comments