modified configuration for tests

Author: Manuel Perez Belmonte

pom.xml

@@ -150,8 +150,24 @@
                     <autoReleaseAfterClose>false</autoReleaseAfterClose>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.19</version>
+                <configuration>
+                    <argLine>-Xmx1024m</argLine>
+                    <environmentVariables>
+                        <HIBERNATEURL>jdbc:postgresql://postgres/ece</HIBERNATEURL>
+                        <HIBERNATEUSERNAME>elastest</HIBERNATEUSERNAME>
+                        <HIBERNATEPASSWORD>elastestpassword</HIBERNATEPASSWORD>
+                        <!--<HIBERNATEURL>jdbc:postgresql://localhost/ece2</HIBERNATEURL>-->
+                        <!--<HIBERNATEUSERNAME>ubuntu</HIBERNATEUSERNAME>-->
+                        <!--<HIBERNATEPASSWORD>pass1234</HIBERNATEPASSWORD>-->
+                        <HIBERNATEDRIVER>org.postgresql.Driver</HIBERNATEDRIVER>
+                        <HIBERNATEDIALECT>org.hibernate.dialect.PostgreSQL9Dialect</HIBERNATEDIALECT>
+                    </environmentVariables>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
-
-
 </project>

src/main/java/io/elastest/ece/application/APIController.java

@@ -10,13 +10,11 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import javax.annotation.PostConstruct;
-import javax.transaction.Transactional;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;

src/main/java/io/elastest/ece/load/Loader.java

@@ -41,7 +41,9 @@ public class Loader {
      */
     private Loader(String path) throws Exception {
         // only if object is created by createInstance (which gives it context)
-        if (!path.isEmpty()) {
+        if (path == null) {
+            settings = new Settings(new Properties());
+        } else if (!path.isEmpty()) {
             // start with loading config file
             Properties properties = loadAndParseConfigurationFile(path);
 
@@ -53,8 +55,17 @@ private Loader(String path) throws Exception {
         }
     }
 
+    /**
+     * Public empty initializer
+     */
+    public static void createInstance() throws Exception {
+        if (singleton == null)
+            singleton = new Loader(null);
+    }
+
     /**
      * When creating instance, we need it to have context
+     *
      * @param path for the configuration file
      */
     public static void createInstance(String path) throws Exception {
@@ -65,6 +76,7 @@ public static void createInstance(String path) throws Exception {
 
     /**
      * Access settings from Loader class
+     *
      * @return settings object or null
      */
     public static Settings getSettings() {
@@ -77,6 +89,7 @@ public static Settings getSettings() {
 
     /**
      * Load and parse configuration file
+     *
      * @return null or property object
      */
     private Properties loadAndParseConfigurationFile(String path) {

src/main/java/io/elastest/ece/load/Settings.java

@@ -18,6 +18,7 @@
 
 import io.elastest.ece.load.model.HibernateCredentials;
 
+import java.util.Map;
 import java.util.Properties;
 
 /**
@@ -62,12 +63,32 @@ public Settings(Properties prop) {
      */
     private HibernateCredentials loadHibernateConfiguration() {
         HibernateCredentials hibernateCredentials = new HibernateCredentials();
+        Map<String, String> env = System.getenv();
 
-        hibernateCredentials.setHibernateURL(properties.getProperty("HibernateURL"));
-        hibernateCredentials.setHibernateUsername(properties.getProperty("HibernateUsername"));
-        hibernateCredentials.setHibernatePassword(properties.getProperty("HibernatePassword"));
-        hibernateCredentials.setHibernateDriver(properties.getProperty("HibernateDriver"));
-        hibernateCredentials.setHibernateDialect(properties.getProperty("HibernateDialect"));
+        if (env.containsKey("HIBERNATEURL"))
+            hibernateCredentials.setHibernateURL(env.get("HIBERNATEURL"));
+        else
+            hibernateCredentials.setHibernateURL(properties.getProperty("HibernateURL"));
+
+        if (env.containsKey("HIBERNATEUSERNAME"))
+            hibernateCredentials.setHibernateUsername(env.get("HIBERNATEUSERNAME"));
+        else
+            hibernateCredentials.setHibernateUsername(properties.getProperty("HibernateUsername"));
+
+        if (env.containsKey("HIBERNATEPASSWORD"))
+            hibernateCredentials.setHibernatePassword(env.get("HIBERNATEPASSWORD"));
+        else
+            hibernateCredentials.setHibernatePassword(properties.getProperty("HibernatePassword"));
+
+        if (env.containsKey("HIBERNATEDRIVER"))
+            hibernateCredentials.setHibernateDriver(env.get("HIBERNATEDRIVER"));
+        else
+            hibernateCredentials.setHibernateDriver(properties.getProperty("HibernateDriver"));
+
+        if (env.containsKey("HIBERNATEDIALECT"))
+            hibernateCredentials.setHibernateDialect(env.get("HIBERNATEDIALECT"));
+        else
+            hibernateCredentials.setHibernateDialect(properties.getProperty("HibernateDialect"));
 
         return hibernateCredentials;
     }

src/main/java/io/elastest/ece/model/CostModel.java

@@ -43,7 +43,8 @@ public class CostModel {
 
     private String description;
 
-    protected CostModel(){}
+    protected CostModel() {
+    }
 
     public CostModel(String name, String type, Map fix_cost) {
         this.name = name;
@@ -111,4 +112,22 @@ public Map<String, String> getComponents() {
     public void setComponents(Map<String, String> components) {
         this.components = components;
     }
+
+    @Override
+    public boolean equals(Object o) {
+
+        if (o == this) return true;
+        if (!(o instanceof CostModel)) {
+            return false;
+        }
+
+        CostModel costModel = (CostModel) o;
+
+        return (costModel.getName().equals(((CostModel) o).getName())
+                && costModel.getType().equals(((CostModel) o).getType())
+                && costModel.getVar_rate().equals(((CostModel) o).getVar_rate())
+                && costModel.getFix_cost().equals(((CostModel) o).getFix_cost())
+                && costModel.getComponents().equals(((CostModel) o).getComponents())
+                && costModel.getDescription().equals(((CostModel) o).getDescription()));
+    }
 }

src/main/resources/application.properties

@@ -5,3 +5,9 @@ logging.file=ece.log
 logging.pattern.console=%d{yyyy-MM-dd HH:mm:ss} [%-5level] - %msg%n
 logging.pattern.file=%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n
 server.port=8888
+# Hibernate connection credentials
+HibernateURL=jdbc:postgresql://postgres/ece
+HibernateUsername=elastest
+HibernatePassword=elastestpassword
+HibernateDriver=org.postgresql.Driver
+HibernateDialect=org.hibernate.dialect.PostgreSQL9Dialect