fix 2 failing java test

improve client declaration in the test

Author: jvmvik

src/test/java/serpapi/AppleAppStoreTest.java

@@ -20,17 +20,16 @@ public void search() throws SerpApiException {
     if(System.getenv("API_KEY") == null)
       return;
 
-    // set search context
+    // setup serpapi client
+    Map<String, String> auth = new HashMap<>();
+    auth.put("api_key", System.getenv("API_KEY"));
+    SerpApi client = new SerpApi(auth);
+
+    // run search
     Map<String, String> parameter = new HashMap<>();
     parameter.put("engine", "apple_app_store");
-    parameter.put("api_key", System.getenv("API_KEY"));
-
-    SerpApi serpapi = new SerpApi(parameter);
-
-    // set search parameter
-parameter.put("term", "coffee");
-
-    JsonObject results = serpapi.search(parameter);
+    parameter.put("term", "coffee");
+    JsonObject results = client.search(parameter);
     assertTrue(results.getAsJsonArray("organic_results").size() > 5);
   }
 

src/test/java/serpapi/BaiduTest.java

@@ -20,17 +20,16 @@ public void search() throws SerpApiException {
     if(System.getenv("API_KEY") == null)
       return;
 
-    // set search context
+    // setup serpapi client
+    Map<String, String> auth = new HashMap<>();
+    auth.put("api_key", System.getenv("API_KEY"));
+    SerpApi client = new SerpApi(auth);
+
+    // run search
     Map<String, String> parameter = new HashMap<>();
     parameter.put("engine", "baidu");
-    parameter.put("api_key", System.getenv("API_KEY"));
-
-    SerpApi serpapi = new SerpApi(parameter);
-
-    // set search parameter
-parameter.put("q", "coffee");
-
-    JsonObject results = serpapi.search(parameter);
+    parameter.put("q", "coffee");
+    JsonObject results = client.search(parameter);
     assertTrue(results.getAsJsonArray("organic_results").size() > 5);
   }
 

src/test/java/serpapi/BingTest.java

@@ -20,18 +20,17 @@ public void search() throws SerpApiException {
     if(System.getenv("API_KEY") == null)
       return;
 
-    // set search context
+    // setup serpapi client
+    Map<String, String> auth = new HashMap<>();
+    auth.put("api_key", System.getenv("API_KEY"));
+    SerpApi client = new SerpApi(auth);
+
+    // run search
     Map<String, String> parameter = new HashMap<>();
     parameter.put("engine", "bing");
-    parameter.put("api_key", System.getenv("API_KEY"));
-
-    SerpApi serpapi = new SerpApi(parameter);
-
-    // set search parameter
-parameter.put("q", "coffee");
-
-    JsonObject results = serpapi.search(parameter);
-    assertTrue(results.getAsJsonArray("organic_results").size() > 5);
+    parameter.put("q", "coffee");
+    JsonObject results = client.search(parameter);
+    assertTrue(results.getAsJsonArray("organic_results").size() > 1);
   }
 
 }

src/test/java/serpapi/DuckduckgoTest.java

@@ -20,17 +20,16 @@ public void search() throws SerpApiException {
     if(System.getenv("API_KEY") == null)
       return;
 
-    // set search context
+    // setup serpapi client
+    Map<String, String> auth = new HashMap<>();
+    auth.put("api_key", System.getenv("API_KEY"));
+    SerpApi client = new SerpApi(auth);
+
+    // run search
     Map<String, String> parameter = new HashMap<>();
     parameter.put("engine", "duckduckgo");
-    parameter.put("api_key", System.getenv("API_KEY"));
-
-    SerpApi serpapi = new SerpApi(parameter);
-
-    // set search parameter
-parameter.put("q", "coffee");
-
-    JsonObject results = serpapi.search(parameter);
+    parameter.put("q", "coffee");
+    JsonObject results = client.search(parameter);
     assertTrue(results.getAsJsonArray("organic_results").size() > 5);
   }
 

src/test/java/serpapi/EbayTest.java

@@ -20,17 +20,16 @@ public void search() throws SerpApiException {
     if(System.getenv("API_KEY") == null)
       return;
 
-    // set search context
+    // setup serpapi client
+    Map<String, String> auth = new HashMap<>();
+    auth.put("api_key", System.getenv("API_KEY"));
+    SerpApi client = new SerpApi(auth);
+
+    // run search
     Map<String, String> parameter = new HashMap<>();
     parameter.put("engine", "ebay");
-    parameter.put("api_key", System.getenv("API_KEY"));
-
-    SerpApi serpapi = new SerpApi(parameter);
-
-    // set search parameter
-parameter.put("_nkw", "coffee");
-
-    JsonObject results = serpapi.search(parameter);
+    parameter.put("_nkw", "coffee");
+    JsonObject results = client.search(parameter);
     assertTrue(results.getAsJsonArray("organic_results").size() > 5);
   }
 

src/test/java/serpapi/GoogleAutocompleteTest.java

@@ -20,17 +20,16 @@ public void search() throws SerpApiException {
     if(System.getenv("API_KEY") == null)
       return;
 
-    // set search context
+    // setup serpapi client
+    Map<String, String> auth = new HashMap<>();
+    auth.put("api_key", System.getenv("API_KEY"));
+    SerpApi client = new SerpApi(auth);
+
+    // run search
     Map<String, String> parameter = new HashMap<>();
     parameter.put("engine", "google_autocomplete");
-    parameter.put("api_key", System.getenv("API_KEY"));
-
-    SerpApi serpapi = new SerpApi(parameter);
-
-    // set search parameter
-parameter.put("q", "coffee");
-
-    JsonObject results = serpapi.search(parameter);
+    parameter.put("q", "coffee");
+    JsonObject results = client.search(parameter);
     assertTrue(results.getAsJsonArray("suggestions").size() > 5);
   }
 

src/test/java/serpapi/GoogleEventsTest.java

@@ -20,17 +20,16 @@ public void search() throws SerpApiException {
     if(System.getenv("API_KEY") == null)
       return;
 
-    // set search context
+    // setup serpapi client
+    Map<String, String> auth = new HashMap<>();
+    auth.put("api_key", System.getenv("API_KEY"));
+    SerpApi client = new SerpApi(auth);
+
+    // run search
     Map<String, String> parameter = new HashMap<>();
     parameter.put("engine", "google_events");
-    parameter.put("api_key", System.getenv("API_KEY"));
-
-    SerpApi serpapi = new SerpApi(parameter);
-
-    // set search parameter
-parameter.put("q", "coffee");
-
-    JsonObject results = serpapi.search(parameter);
+    parameter.put("q", "coffee");
+    JsonObject results = client.search(parameter);
     assertTrue(results.getAsJsonArray("events_results").size() > 5);
   }
 

src/test/java/serpapi/GoogleImagesTest.java

@@ -20,19 +20,18 @@ public void search() throws SerpApiException {
     if(System.getenv("API_KEY") == null)
       return;
 
-    // set search context
+    // setup serpapi client
+    Map<String, String> auth = new HashMap<>();
+    auth.put("api_key", System.getenv("API_KEY"));
+    SerpApi client = new SerpApi(auth);
+
+    // run search
     Map<String, String> parameter = new HashMap<>();
     parameter.put("engine", "google_images");
-    parameter.put("api_key", System.getenv("API_KEY"));
-
-    SerpApi serpapi = new SerpApi(parameter);
-
-    // set search parameter
-parameter.put("engine", "google_images");
-parameter.put("tbm", "isch");
-parameter.put("q", "coffee");
-
-    JsonObject results = serpapi.search(parameter);
+    parameter.put("engine", "google_images");
+    parameter.put("tbm", "isch");
+    parameter.put("q", "coffee");
+    JsonObject results = client.search(parameter);
     assertTrue(results.getAsJsonArray("images_results").size() > 5);
   }
 

src/test/java/serpapi/GoogleJobsTest.java

@@ -20,17 +20,16 @@ public void search() throws SerpApiException {
     if(System.getenv("API_KEY") == null)
       return;
 
-    // set search context
+    // setup serpapi client
+    Map<String, String> auth = new HashMap<>();
+    auth.put("api_key", System.getenv("API_KEY"));
+    SerpApi client = new SerpApi(auth);
+
+    // run search
     Map<String, String> parameter = new HashMap<>();
     parameter.put("engine", "google_jobs");
-    parameter.put("api_key", System.getenv("API_KEY"));
-
-    SerpApi serpapi = new SerpApi(parameter);
-
-    // set search parameter
-parameter.put("q", "coffee");
-
-    JsonObject results = serpapi.search(parameter);
+    parameter.put("q", "coffee");
+    JsonObject results = client.search(parameter);
     assertTrue(results.getAsJsonArray("jobs_results").size() > 5);
   }
 

src/test/java/serpapi/GoogleLocalServicesTest.java

@@ -20,18 +20,17 @@ public void search() throws SerpApiException {
     if(System.getenv("API_KEY") == null)
       return;
 
-    // set search context
+    // setup serpapi client
+    Map<String, String> auth = new HashMap<>();
+    auth.put("api_key", System.getenv("API_KEY"));
+    SerpApi client = new SerpApi(auth);
+
+    // run search
     Map<String, String> parameter = new HashMap<>();
     parameter.put("engine", "google_local_services");
-    parameter.put("api_key", System.getenv("API_KEY"));
-
-    SerpApi serpapi = new SerpApi(parameter);
-
-    // set search parameter
-parameter.put("q", "electrician");
-parameter.put("data_cid", "6745062158417646970");
-
-    JsonObject results = serpapi.search(parameter);
+    parameter.put("q", "electrician");
+    parameter.put("data_cid", "6745062158417646970");
+    JsonObject results = client.search(parameter);
     assertTrue(results.getAsJsonArray("local_ads").size() > 5);
   }