create test cases and fix typing error

.classpath

@@ -14,5 +14,9 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
+	<classpathentry kind="lib" path="easymock-3.4.jar"/>
+
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

.project

@@ -15,9 +15,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>net.sourceforge.metrics.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>net.sourceforge.metrics.nature</nature>
 	</natures>
 </projectDescription>

src/me/corriekay/pokegoutil/BlossomsPoGoManager.java

@@ -63,7 +63,7 @@ public static void setNewPrimaryStage(final Stage stage) {
     public void start(final Stage primaryStage) {
         setupGlobalExceptionHandling();
 
-        if (ConfigNew.getConfig().getBool(ConfigKey.DEVELOPFLAG)) {
+        if ((boolean) ConfigNew.getConfig().getAsObject(ConfigKey.DEVELOPFLAG)) {
             new ChooseGuiWindowController();
             sPrimaryStage.show();
         } else {

src/me/corriekay/pokegoutil/data/enums/PokeColumn.java

@@ -164,7 +164,7 @@ public Object get(final Pokemon p) {
 
                 int evolvable = (int) ((double) candies / candiesToEvolve);
                 int rest = candies % candiesToEvolve;
-                final boolean transferAfterEvolve = ConfigNew.getConfig().getBool(ConfigKey.TRANSFER_AFTER_EVOLVE);
+                final boolean transferAfterEvolve = (boolean) ConfigNew.getConfig().getAsObject(ConfigKey.TRANSFER_AFTER_EVOLVE);
 
                 // We iterate and get how many candies are added while evolving and if that can make up for some more evolves
                 int newEvolvable = evolvable;

src/me/corriekay/pokegoutil/data/managers/AccountManager.java

@@ -61,37 +61,51 @@ private void deleteLoginData(final LoginType type) {
      */
     private void deleteLoginData(final LoginType type, final boolean deleteSaveAuth) {
         if (deleteSaveAuth) {
-            config.delete(ConfigKey.LOGIN_SAVE_AUTH);
+            deleteSavedLoginData();
         }
 
         switch (type) {
             case ALL:
-                config.delete(ConfigKey.LOGIN_GOOGLE_AUTH_TOKEN);
-                config.delete(ConfigKey.LOGIN_GOOGLE_APP_USERNAME);
-                config.delete(ConfigKey.LOGIN_GOOGLE_APP_PASSWORD);
-                config.delete(ConfigKey.LOGIN_PTC_USERNAME);
-                config.delete(ConfigKey.LOGIN_PTC_PASSWORD);
+                deleteGoogleAuthLoginData();
+                deleteGoogleAppLoginData();
+                deletePtcLoginData();
                 break;
             case GOOGLE_AUTH:
-                config.delete(ConfigKey.LOGIN_GOOGLE_AUTH_TOKEN);
+                deleteGoogleAuthLoginData();
                 break;
             case GOOGLE_APP_PASSWORD:
-                config.delete(ConfigKey.LOGIN_GOOGLE_APP_USERNAME);
-                config.delete(ConfigKey.LOGIN_GOOGLE_APP_PASSWORD);
+                deleteGoogleAppLoginData();
                 break;
             case PTC:
-                config.delete(ConfigKey.LOGIN_PTC_USERNAME);
-                config.delete(ConfigKey.LOGIN_PTC_PASSWORD);
+                deletePtcLoginData();
                 break;
             default:
         }
     }
 
+    private void deleteGoogleAuthLoginData() {
+        config.delete(ConfigKey.LOGIN_GOOGLE_AUTH_TOKEN);
+    }
+
+    private void deleteSavedLoginData() {
+        config.delete(ConfigKey.LOGIN_SAVE_AUTH);
+    }
+
+    private void deletePtcLoginData() {
+        config.delete(ConfigKey.LOGIN_PTC_USERNAME);
+        config.delete(ConfigKey.LOGIN_PTC_PASSWORD);
+    }
+
+    private void deleteGoogleAppLoginData() {
+        config.delete(ConfigKey.LOGIN_GOOGLE_APP_USERNAME);
+        config.delete(ConfigKey.LOGIN_GOOGLE_APP_PASSWORD);
+    }
+
     public LoginData getLoginData() {
         final LoginData loginData = new LoginData(
-                config.getString(ConfigKey.LOGIN_PTC_USERNAME),
-                config.getString(ConfigKey.LOGIN_PTC_PASSWORD),
-                config.getString(ConfigKey.LOGIN_GOOGLE_AUTH_TOKEN));
+                (String) config.getAsObject(ConfigKey.LOGIN_PTC_USERNAME),
+                (String) config.getAsObject(ConfigKey.LOGIN_PTC_PASSWORD),
+                (String) config.getAsObject(ConfigKey.LOGIN_GOOGLE_AUTH_TOKEN));
 
         if (loginData.isValidGoogleLogin()) {
             loginData.setSavedToken(true);
@@ -110,7 +124,11 @@ public PlayerAccount getPlayerAccount() {
     }
 
     public PlayerProfile getPlayerProfile() {
-        return go != null ? go.getPlayerProfile() : null;
+        PlayerProfile result = null;
+        if(go != null)
+            result = go.getPlayerProfile();
+
+        return result;
     }
 
     private void initOtherControllers() {
@@ -126,20 +144,21 @@ private void initOtherControllers() {
      * @return results of the login
      */
     public BpmResult login(final LoginData loginData) {
+        BpmResult result = new BpmResult("Invalid Login Type");
         switch (loginData.getLoginType()) {
             case GOOGLE_AUTH:
                 if (loginData.isValidGoogleLogin()) {
-                    return logOnGoogleAuth(loginData);
+                    result = logOnGoogleAuth(loginData);
                 }
                 break;
             case PTC:
                 if (loginData.isValidPtcLogin()) {
-                    return logOnPtc(loginData);
+                    result = logOnPtc(loginData);
                 }
                 break;
             default:
         }
-        return new BpmResult("Invalid Login Type");
+        return result;
     }
 
     /**
@@ -150,12 +169,14 @@ public BpmResult login(final LoginData loginData) {
      */
     private BpmResult logOnGoogleAuth(final LoginData loginData) {
         OkHttpClient http;
-        CredentialProvider cp;
+        CredentialProvider credentialProvider = null;
         http = new OkHttpClient();
 
         final String authCode = loginData.getToken();
-        final boolean saveAuth = config.getBool(ConfigKey.LOGIN_SAVE_AUTH);
+        final boolean saveAuth = (boolean) config.getAsObject(ConfigKey.LOGIN_SAVE_AUTH);
 
+        BpmResult result = new BpmResult();
+
         boolean shouldRefresh = false;
         if (loginData.isSavedToken() && saveAuth) {
             shouldRefresh = true;
@@ -174,24 +195,27 @@ private BpmResult logOnGoogleAuth(final LoginData loginData) {
                 throw new LoginFailedException();
             }
 
-            cp = provider;
+            credentialProvider = provider;
             if (saveAuth && !shouldRefresh) {
-                config.setString(ConfigKey.LOGIN_GOOGLE_AUTH_TOKEN, provider.getRefreshToken());
+                config.setFromObject(ConfigKey.LOGIN_GOOGLE_AUTH_TOKEN, provider.getRefreshToken());
             } else if (!saveAuth) {
                 deleteLoginData(LoginType.GOOGLE_AUTH);
             }
         } catch (LoginFailedException | RemoteServerException | CaptchaActiveException e) {
             deleteLoginData(LoginType.GOOGLE_APP_PASSWORD);
-            return new BpmResult(e.getMessage());
+            result =  new BpmResult(e.getMessage());
         }
-
-        try {
-            prepareLogin(cp, http);
-            return new BpmResult();
-        } catch (LoginFailedException | RemoteServerException | CaptchaActiveException | HashException e) {
-            deleteLoginData(LoginType.ALL);
-            return new BpmResult(e.getMessage());
+
+        if (result.isSuccess()) {
+            try {
+                prepareLogin(credentialProvider, http);
+            } catch (LoginFailedException | RemoteServerException | CaptchaActiveException | HashException e) {
+                deleteLoginData(LoginType.ALL);
+                result = new BpmResult(e.getMessage());
+            }
         }
+
+        return result;
     }
 
     /**
@@ -202,33 +226,38 @@ private BpmResult logOnGoogleAuth(final LoginData loginData) {
      */
     private BpmResult logOnPtc(final LoginData loginData) {
         OkHttpClient http;
-        CredentialProvider cp;
+        CredentialProvider credentialProvider = null;
         http = new OkHttpClient();
 
         final String username = loginData.getUsername();
         final String password = loginData.getPassword();
-        final boolean saveAuth = config.getBool(ConfigKey.LOGIN_SAVE_AUTH);
+        final boolean saveAuth = (boolean) config.getAsObject(ConfigKey.LOGIN_SAVE_AUTH);
 
+        BpmResult result = new BpmResult();
+
         try {
-            cp = new PtcCredentialProvider(http, username, password);
-            config.setString(ConfigKey.LOGIN_PTC_USERNAME, username);
+            credentialProvider = new PtcCredentialProvider(http, username, password);
+            config.setFromObject(ConfigKey.LOGIN_PTC_USERNAME, username);
             if (saveAuth) {
-                config.setString(ConfigKey.LOGIN_PTC_PASSWORD, password);
+                config.setFromObject(ConfigKey.LOGIN_PTC_PASSWORD, password);
             } else {
                 deleteLoginData(LoginType.PTC);
             }
         } catch (LoginFailedException | RemoteServerException | CaptchaActiveException e) {
             deleteLoginData(LoginType.PTC);
-            return new BpmResult(e.getMessage());
+            result = new BpmResult(e.getMessage());
         }
-
-        try {
-            prepareLogin(cp, http);
-            return new BpmResult();
-        } catch (LoginFailedException | RemoteServerException | CaptchaActiveException | HashException e) {
-            deleteLoginData(LoginType.ALL);
-            return new BpmResult(e.getMessage());
+
+        if (result.isSuccess()) {
+            try {
+                prepareLogin(credentialProvider, http);
+            } catch (LoginFailedException | RemoteServerException | CaptchaActiveException | HashException e) {
+                deleteLoginData(LoginType.ALL);
+                result = new BpmResult(e.getMessage());
+            }
         }
+
+        return result;
     }
 
     /**
@@ -256,6 +285,6 @@ private void prepareLogin(final CredentialProvider cp, final OkHttpClient http)
      * @param shouldSave settings for saveAuth
      */
     public void setSaveLogin(final boolean shouldSave) {
-        config.setBool(ConfigKey.LOGIN_SAVE_AUTH, shouldSave);
+        config.setFromObject(ConfigKey.LOGIN_SAVE_AUTH, shouldSave);
     }
 }

src/me/corriekay/pokegoutil/data/managers/InventoryManager.java

@@ -20,17 +20,14 @@ private InventoryManager() {
     }
 
     public static void initialize(PokemonGo go) {
-        if (sIsInit)
-            return;
-
-        try {
-            S_INSTANCE.inventories = go.getInventories();
-        } catch (Exception e) {
-            //TODO sumthin here
-            return;
+        if (!sIsInit) {
+            try {
+                S_INSTANCE.inventories = go.getInventories();
+                sIsInit = true;
+            } catch (Exception e) {
+                // TODO sumthin here
+            }
         }
-
-        sIsInit = true;
     }
 
     public static Inventories getInventories() throws LoginFailedException, RemoteServerException {

src/me/corriekay/pokegoutil/data/managers/PokemonBagManager.java

@@ -6,7 +6,7 @@
 import me.corriekay.pokegoutil.data.models.PokemonModel;
 
 /*
- * This controller takes care of handling pokémon
+ * This controller takes care of handling pok챕mon
  */
 public class PokemonBagManager {
 
@@ -19,23 +19,22 @@ private PokemonBagManager() {
     }
 
     public static void initialize(PokemonGo go) {
-        if (sIsInit)
-            return;
-        try {
-            S_INSTANCE.pokemonBag = new PokemonBag(go.getInventories().getPokebank().getPokemons());
-        } catch (Exception e) {
-            //TODO sumthin here
-            return;
+        if (!sIsInit) {
+            try {
+                S_INSTANCE.pokemonBag = new PokemonBag(go.getInventories().getPokebank().getPokemons());
+                sIsInit = true;
+            } catch (Exception e) {
+                // TODO sumthin here
+            }
         }
-
-        sIsInit = true;
+
     }
 
-    public static ObservableList<PokemonModel>getAllPokemon(){
+    public static ObservableList<PokemonModel> getAllPokemon() {
         return sIsInit ? S_INSTANCE.pokemonBag.getAllPokemon() : null;
     }
 
-    public static int getNbPokemon(){
+    public static int getNbPokemon() {
         return sIsInit ? S_INSTANCE.pokemonBag.getNumberPokemon() : 0;
     }
 }

src/me/corriekay/pokegoutil/data/managers/ProfileManager.java

@@ -14,11 +14,9 @@ private ProfileManager() {
     }
 
     public static void initialize(PokemonGo go) {
-        if (sIsInit)
-            return;
-
-        S_INSTANCE.pp = go.getPlayerProfile();
-
+        if (!sIsInit) 
+            S_INSTANCE.pp = go.getPlayerProfile();
+
         sIsInit = true;
     }
 

src/me/corriekay/pokegoutil/data/models/LoginData.java

@@ -98,7 +98,7 @@ public void setUsername(String username) {
 
     @Override
     public String toString() {
-        return String.format("Username: %s | Password: %s | Token: %s | LoginType: %s | isSavedToken %b",
+        return String.format("Username: %s | Password: %s | Token: %s | LoginType: %s | isSavedToken: %b",
                 username, password, token, loginType, isSavedToken);
     }
 }

src/me/corriekay/pokegoutil/data/models/PokemonCpCurrentProvider.java

@@ -0,0 +1,24 @@
+package me.corriekay.pokegoutil.data.models;
+
+import com.pokegoapi.api.pokemon.Pokemon;
+import com.pokegoapi.exceptions.NoSuchItemException;
+
+import POGOProtos.Enums.PokemonIdOuterClass.PokemonId;
+
+public class PokemonCpCurrentProvider extends PokemonCpProvider {
+
+    public PokemonCpCurrentProvider(Pokemon pokemon) {
+        super(pokemon);
+    }
+
+    @Override
+    protected int getMaxCpValue(Pokemon pokemon) throws NoSuchItemException {
+        return pokemon.getMaxCpForPlayer();
+    }
+
+    @Override
+    protected int getMaxEvolvedCpValue(Pokemon pokemon, PokemonId pokemonId) {
+        return pokemon.getMaxCpFullEvolveAndPowerupForPlayer(pokemonId);
+    }
+
+}