passing tests after major code update.

Author: jvmvik

build.gradle

@@ -9,7 +9,7 @@ plugins {
 
 // Package default
 archivesBaseName = 'serpapi'
-version = '2.0.3'
+version = '1.0.0'
 group = 'com.github.serpapi'
 
 // java version 

gradle/wrapper/gradle-wrapper.jar

@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -38,14 +38,23 @@ public SerpApi(Map<String, String> parameter) {
     this.parameter = parameter;
   }
 
+  /***
+   * Constructor
+   * 
+   * @param parameter default search parameter should include {"api_key": "secret_api_key", "engine": "google" }
+   */
+  public SerpApi() {
+    this.parameter = new HashMap();
+  }
+
   /***
    * Returns HTML search results as a raw HTML String
    * 
    * @param parameter html search parameter
    * @return raw HTML response from the client engine for custom parsing
    * @throws SerpApiException wraps backend error message
    */
-  public String html(HashMap<String, String> parameter) throws SerpApiException {
+  public String html(Map<String, String> parameter) throws SerpApiException {
     return get("/client", "html", parameter);
   }
 
@@ -56,8 +65,8 @@ public String html(HashMap<String, String> parameter) throws SerpApiException {
    * @return JsonObject search results parent node
    * @throws SerpApiException wraps backend error message
    */
-  public JsonObject search(HashMap<String, String> parameter) throws SerpApiException {
-    return json("/client", parameter);
+  public JsonObject search(Map<String, String> parameter) throws SerpApiException {
+    return json("/search", parameter);
   }
 
   /***
@@ -67,7 +76,7 @@ public JsonObject search(HashMap<String, String> parameter) throws SerpApiExcept
    * @return JsonObject location using Location API
    * @throws SerpApiException wraps backend error message
    */
-  public JsonObject location(HashMap<String, String> parameter) throws SerpApiException {
+  public JsonObject location(Map<String, String> parameter) throws SerpApiException {
     return json("/locations.json", parameter);
   }
 
@@ -88,21 +97,33 @@ public JsonObject searchArchive(String clientID) throws SerpApiException {
   /***
    * Get account information using Account API
    * 
-   * @param parameter HashMap including the api_key if not set in the default client parameter
+   * @param parameter Map including the api_key if not set in the default client parameter
    * @return JsonObject account information
    * @throws SerpApiException wraps backend error message
    */
-  public JsonObject account(HashMap<String, String> parameter) throws SerpApiException {
+  public JsonObject account(Map<String, String> parameter) throws SerpApiException {
     return json("/account.json", parameter);
   }
 
+
+  /***
+   * Get account information using Account API
+   * 
+   * @param parameter Map including the api_key if not set in the default client parameter
+   * @return JsonObject account information
+   * @throws SerpApiException wraps backend error message
+   */
+  public JsonObject account() throws SerpApiException {
+    return json("/account.json", this.parameter);
+  }  
+
     /***
    * Convert HTTP content to JsonValue
    * 
    * @param content raw JSON HTTP response
    * @return JsonObject created by gson parser
    */
-  private JsonObject json(String endpoint, HashMap<String, String> parameter) throws SerpApiException {
+  private JsonObject json(String endpoint, Map<String, String> parameter) throws SerpApiException {
     String content = get(endpoint, "json", parameter);    
     JsonElement element = gson.fromJson(content, JsonElement.class);
     return element.getAsJsonObject();
@@ -124,7 +145,7 @@ public SerpApiHttp getClient() {
    * @return format parameter hash map
    * @throws SerpApiException wraps backend error message
    */
-  public String get(String path, String output, HashMap<String, String> parameter) throws SerpApiException {
+  public String get(String path, String output, Map<String, String> parameter) throws SerpApiException {
     // Initialize client if not done
     if (this.client == null) {
       this.client = new SerpApiHttp(path);
@@ -133,7 +154,7 @@ public String get(String path, String output, HashMap<String, String> parameter)
       this.client.path = path;
     }
 
-    HashMap<String, String> query = new HashMap();
+    Map<String, String> query = new HashMap();
     // Merge default parameter
     query.putAll(this.parameter);
 

src/main/java/serpapi/SerpApi.java

@@ -6,37 +6,25 @@
 import org.mockito.ArgumentMatchers;
 
 import java.nio.file.Paths;
+import java.util.HashMap;
+import java.util.Map;
 
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
 
 public class AccountApiTest {
 
-  @Before
-  public void setUp() throws Exception {
-    if (System.getenv("API_KEY") != null) {
-      GoogleSearch.api_key_default = System.getenv("API_KEY");
-    }
-  }
-
   @Test
-  public void getAccount() throws Exception {
-    String expected_api_key = GoogleSearch.api_key_default;
-
-    // mock response if run on github
-    GoogleSearch client = new GoogleSearch();
+  public void account() throws Exception {
     if (System.getenv("API_KEY") == null) {
-      SerpApiHttp stub = mock(SerpApiHttp.class);
-      String data = ReadJsonFile.readAsString(Paths.get("src/test/java/serpapi/data/account.json"));
-      when(stub.getResults(ArgumentMatchers.<String, String>anyMap())).thenReturn(data);
-      client.client = stub;
-
-      // fallback to default
-      expected_api_key = "demo";
+     return;
     }
 
-    JsonObject info = client.getAccount();
+    Map<String, String> parameter = new HashMap<String, String>();
+    parameter.put("api_key", System.getenv("API_KEY"));
+    SerpApi client = new SerpApi(parameter);
+    JsonObject info = client.account();
     System.out.println(info.toString());
-    assertEquals(expected_api_key, info.getAsJsonObject().get("api_key").getAsString());
+    assertEquals("Active", info.getAsJsonObject().get("account_status").getAsString());
   }
 }