75% coverage, removed empty classes

Author: Manu

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

@@ -37,7 +37,7 @@ public static void main(String[] args) {
 	 * Check number of parameters
 	 * @param args as string array
 	 */
-	private static void checkParameters(String[] args) {
+	public static void checkParameters(String[] args) {
 		if (args.length == 0) {
 			String log = "A configuration file path has to be provided (as argument), otherwise the Elastest Cost Engine cannot be properly loaded";
 			logger.error(log);
@@ -52,7 +52,7 @@ private static void checkParameters(String[] args) {
 	 * Check whether parameter was help
 	 * @param param to be examined
 	 */
-	private static void checkHelp(String param) {
+	public static void checkHelp(String param) {
 		if (param.equals("-h") || param.equals("--help")) {
 			System.exit(0);
 		}
@@ -64,7 +64,7 @@ private static void checkHelp(String param) {
 	 * Make sure configuration file is valid
 	 * @param param path
 	 */
-	private static void checkConfigurationFile(String param) {
+	public static void checkConfigurationFile(String param) {
 		try {
 			// create and parse configuration settings
 			Loader.createInstance(param);
@@ -81,7 +81,7 @@ private static void checkConfigurationFile(String param) {
 	/**
 	 * Check and configure Hibernate
 	 */
-	private static void checkAndConfigureHibernate() {
+	public static void checkAndConfigureHibernate() {
 		try {
 			// get credentials
 			HibernateCredentials credentials = Loader.getSettings().getHibernateCredentials();
@@ -102,11 +102,11 @@ private static void checkAndConfigureHibernate() {
 		outputProgressBar();
 	}
 
-	private static void outputProgressBar() {
+	public static void outputProgressBar() {
 		outputProgressBar("...");
 	}
 
-	private static void outputProgressBar(String text, Boolean ... emptyLine) {
+	public static void outputProgressBar(String text, Boolean ... emptyLine) {
 		if (emptyLine.length > 0 && emptyLine[0]) {
 			System.out.println();
 		}

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

@@ -22,17 +22,15 @@
 
 import io.elastest.ece.load.model.HibernateCredentials;
 import io.elastest.ece.model.CostModel;
-import io.elastest.ece.model.CostItem;
 import io.elastest.ece.model.TJob;
-import io.elastest.ece.model.TJobItem;
 import org.hibernate.cfg.Configuration;
 
 public class HibernateConfiguration {
     public static Configuration createConfiguration(HibernateCredentials credentials) {
         Configuration conf = new Configuration();
 
         // add mandatory hibernate classes
-        conf.addAnnotatedClass(TJob.class).addAnnotatedClass(TJobItem.class).addAnnotatedClass(CostModel.class).addAnnotatedClass(CostItem.class);
+        conf.addAnnotatedClass(TJob.class).addAnnotatedClass(CostModel.class);
 
         // now set properties
         conf.setProperty("hibernate.connection.driver_class", credentials.getHibernateDriver())

src/main/java/io/elastest/ece/persistance/HibernateConfiguration.java

@@ -0,0 +1,45 @@
+package elastest.io.ece.api;
+
+import io.elastest.ece.model.CostModel;
+import junit.framework.TestCase;
+import org.junit.Test;
+
+import java.util.HashMap;
+
+/**
+ * Copyright (c) 2017. Zuercher Hochschule fuer Angewandte Wissenschaften
+ * All Rights Reserved.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License. You may obtain
+ * a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ * <p>
+ * Created by Manu Perez on 25.08.17.
+ */
+
+public class CostModelTest extends TestCase{
+
+    @Test
+    public void testEquals(){
+        CostModel costModel = new CostModel("costModel", "test", new HashMap());
+        CostModel sameCostModel = new CostModel("costModel", "test", new HashMap());
+
+        costModel.setVar_rate(new HashMap<>());
+        costModel.setComponents(new HashMap<>());
+        costModel.setDescription("");
+        sameCostModel.setVar_rate(new HashMap<>());
+        sameCostModel.setComponents(new HashMap<>());
+        sameCostModel.setDescription("");
+
+        assertNotSame(new Double(0), costModel);
+        assertEquals(costModel, sameCostModel);
+    }
+}

src/test/java/elastest/io/ece/api/CostModelTest.java

@@ -1,34 +1,52 @@
 package elastest.io.ece.api;
 
-import junit.framework.Test;
+import io.elastest.ece.application.EceApplication;
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
 
 /**
  * Unit test for simple App.
  */
 public class EceApplicationTests
         extends TestCase {
-    /**
-     * Create the test case
-     *
-     * @param testName name of the test case
-     */
-    public EceApplicationTests(String testName) {
-        super(testName);
+
+    private final ByteArrayOutputStream outContent = new ByteArrayOutputStream();
+    private final ByteArrayOutputStream errContent = new ByteArrayOutputStream();
+
+    public void setUpStreams(){
+        System.setOut(new PrintStream(outContent));
+        System.setErr(new PrintStream(errContent));
     }
 
-    /**
-     * @return the suite of tests being tested
-     */
-    public static Test suite() {
-        return new TestSuite(EceApplicationTests.class);
+    public void cleanUpStreams(){
+        System.setOut(null);
+        System.setErr(null);
+    }
+    @Test
+    public void testCheckParameters()
+    {
+        setUpStreams();
+        String[] array = new String[1];
+        array[0] = "param";
+        EceApplication.checkParameters(array);
+        assertEquals("...", outContent.toString());
+        cleanUpStreams();
     }
 
-    /**
-     * Rigourous Test :-)
-     */
-    public void testApp() {
-        assertTrue(true);
+    @Test
+    public void testCheckHelp()
+    {
+        setUpStreams();
+        EceApplication.checkHelp("");
+        assertEquals("...", outContent.toString());
+        cleanUpStreams();
     }
+
+
 }

src/test/java/elastest/io/ece/api/EceApplicationTests.java

@@ -1,8 +1,11 @@
-package io.elastest.ece.model;
+package elastest.io.ece.api;
 
+import io.elastest.ece.model.CostModel;
+import io.elastest.ece.model.TJob;
+import junit.framework.TestCase;
+import org.junit.Test;
 
-
-import javax.persistence.*;
+import java.util.HashMap;
 
 /**
  * Copyright (c) 2017. Zuercher Hochschule fuer Angewandte Wissenschaften
@@ -20,29 +23,21 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  * <p>
- * Created by Manu Perez on 14/07/17.
+ * Created by Manu Perez on 25.08.17.
  */
 
-@Entity
-public class CostItem {
-    @Id
-    @GeneratedValue(strategy= GenerationType.AUTO)
-    private Long id;
-    private Double cost;
+public class TJobTest extends TestCase{
 
-    public CostItem(Double cost) {
-        this.cost = Double.valueOf(cost);
-    }
+    @Test
+    public void testEquals(){
+        TJob tJob = new TJob("tjob", new HashMap());
+        TJob tJob1 = new TJob("tjob", new HashMap());
 
-    public Long getId() {
-        return id;
-    }
+        tJob.setMetadata(new HashMap<>());
+        tJob1.setMetadata(new HashMap<>());
 
-    public double getCost() {
-        return cost;
-    }
+        assertNotSame(new Double(0), tJob);
+        assertEquals(tJob, tJob1);
 
-    public void setCost(double cost) {
-        this.cost = cost;
     }
 }