chore: move main methods to test methods. (#670)

* chore: move main methods to test methods. --------- Co-authored-by: Even Solbraa <[email protected]>
equinor · May 22, 2023 · db50378 · db50378
1 parent 947edfd
commit db50378
Show file tree

Hide file tree

Showing 7 changed files with 89 additions and 64 deletions.
diff --git a/src/main/java/neqsim/util/database/AspenIP21Database.java b/src/main/java/neqsim/util/database/AspenIP21Database.java
@@ -131,25 +131,4 @@ public ResultSet getResultSet(String database, String sqlString) {
   public Statement getStatement() {
     return statement;
   }
-
-  /**
-   * <p>
-   * main.
-   * </p>
-   *
-   * @param args an array of {@link java.lang.String} objects
-   */
-  public static void main(String[] args) {
-    AspenIP21Database database = new AspenIP21Database();
-    try (ResultSet dataSet = database.getResultSet("Karsto", "....'")) {
-      while (dataSet.next()) {
-        System.out.println("dataset " + dataSet.getString(4));
-        System.out.println("dataset value " + dataSet.getDouble("..."));
-      }
-    } catch (Exception ex) {
-      logger.error("failed ", ex);
-    }
-
-    System.out.println("ok");
-  }
 }
diff --git a/src/main/java/neqsim/util/database/NeqSimDataBase.java b/src/main/java/neqsim/util/database/NeqSimDataBase.java
@@ -357,30 +357,6 @@ public static void setConnectionString(String aConnectionString) {
     connectionString = aConnectionString;
   }
 
-  /**
-   * <p>
-   * main.
-   * </p>
-   *
-   * @param args an array of {@link java.lang.String} objects
-   */
-  public static void main(String[] args) {
-    // NeqSimDataBase.initH2DatabaseFromCSVfiles();
-    // NeqSimDataBase.initDatabaseFromCSVfiles();
-    NeqSimDataBase.updateTable("COMP", "/workspaces/neqsim/src/main/resources/data/COMP.csv");
-
-    try (NeqSimDataBase database = new NeqSimDataBase();
-        ResultSet dataSet = database.getResultSet("SELECT * FROM comp WHERE NAME='methane'")) {
-      dataSet.next();
-      System.out.println("dataset " + dataSet.getString("molarmass"));
-      logger.info("dataset " + dataSet.getString("molarmass"));
-      dataSet.close();
-    } catch (Exception ex) {
-      logger.error("failed ", ex);
-      throw new RuntimeException(ex);
-    }
-  }
-
   /**
    * <p>
    * getComponentNames.

diff --git a/src/main/java/neqsim/util/database/NeqSimFluidDataBase.java b/src/main/java/neqsim/util/database/NeqSimFluidDataBase.java
@@ -141,23 +141,4 @@ public void execute(String sqlString) {
       logger.error("The database must be rgistered on the local DBMS to work.");
     }
   }
-
-  /**
-   * <p>
-   * main.
-   * </p>
-   *
-   * @param args an array of {@link java.lang.String} objects
-   */
-  public static void main(String[] args) {
-    NeqSimFluidDataBase database = new NeqSimFluidDataBase();
-    try (ResultSet dataSet =
-        database.getResultSet("FluidDatabase", "SELECT * FROM comp where name='water'")) {
-      dataSet.next();
-      System.out.println("dataset " + dataSet.getString("molarmass"));
-    } catch (Exception ex) {
-      logger.error("failed ", ex);
-    }
-    System.out.println("ok");
-  }
 }
diff --git a/src/test/java/neqsim/thermo/phase/PhaseTypeTest.java b/src/test/java/neqsim/thermo/phase/PhaseTypeTest.java
@@ -0,0 +1,16 @@
+package neqsim.thermo.phase;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+public class PhaseTypeTest {
+  @Test
+  void testValues() {
+    for (PhaseType pt : PhaseType.values()) {
+      // System.out.println("Phase type: " + pt);
+
+      Assertions.assertTrue(pt.getValue() >= 0);
+      Assertions.assertTrue(pt.getDesc().length() > 0);
+    }
+  }
+}
diff --git a/src/test/java/neqsim/util/database/AspenIP21DatabaseTest.java b/src/test/java/neqsim/util/database/AspenIP21DatabaseTest.java
@@ -0,0 +1,25 @@
+package neqsim.util.database;
+
+import java.sql.ResultSet;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+public class AspenIP21DatabaseTest {
+  @Disabled
+  @Test
+  void testMain() {
+    boolean failed = true;
+    AspenIP21Database database = new AspenIP21Database();
+    try (ResultSet dataSet = database.getResultSet("Karsto", "....'")) {
+      while (dataSet.next()) {
+        System.out.println("dataset " + dataSet.getString(4));
+        System.out.println("dataset value " + dataSet.getDouble("..."));
+      }
+      failed = false;
+    } catch (Exception ex) {
+      System.out.println("failed ");
+    }
+    Assertions.assertFalse(failed, "Failed getting properties from FluidDatabase");
+  }
+}
diff --git a/src/test/java/neqsim/util/database/NeqSimDataBaseTest.java b/src/test/java/neqsim/util/database/NeqSimDataBaseTest.java
@@ -1,6 +1,9 @@
 package neqsim.util.database;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.sql.ResultSet;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import neqsim.NeqSimTest;
 
@@ -16,4 +19,25 @@ void testUpdateTable() {
     neqsim.util.database.NeqSimDataBase.updateTable("COMP",
         "classpath:/data/COMP.csv");
   }
+
+  @Test
+    void testMain() {
+      boolean failed = true;
+      //NeqSimDataBase.initH2DatabaseFromCSVfiles();
+      double molmass = 0.0;
+      try (NeqSimDataBase database = new NeqSimDataBase();
+        //boolean testHasMethane = NeqSimDataBase.hasComponent("methane");   
+        //NeqSimDataBase.updateTable("COMP", "/workspaces/neqsim/src/main/resources/data/COMP.csv");
+        ResultSet dataSet = database.getResultSet("SELECT * FROM comp WHERE NAME='methane'")) {
+        dataSet.next();
+        molmass = Double.valueOf(dataSet.getString("molarmass"));
+        dataSet.close();
+        failed = false;
+      } catch (Exception ex) {
+        System.out.println("DB test failed ");
+      }
+      //Assertions.assertTrue(testHasMethane, "Methane component found in database");
+      Assertions.assertEquals(16.04, molmass, 0.1);
+      Assertions.assertFalse(failed, "Failed getting data from NeqsimDataBase");
+    }
 }
diff --git a/src/test/java/neqsim/util/database/NeqSimFluidDataBaseTest.java b/src/test/java/neqsim/util/database/NeqSimFluidDataBaseTest.java
@@ -0,0 +1,24 @@
+package neqsim.util.database;
+
+import java.sql.ResultSet;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+public class NeqSimFluidDataBaseTest {
+  @Disabled
+  @Test
+  void testMain() {
+    boolean failed = true;
+    NeqSimFluidDataBase database = new NeqSimFluidDataBase();
+    try (ResultSet dataSet =
+        database.getResultSet("FluidDatabase", "SELECT * FROM comp where name='water'")) {
+      dataSet.next();
+      System.out.println("dataset " + dataSet.getString("molarmass"));
+      failed = false;
+    } catch (Exception ex) {
+      System.out.println("failed");
+    }
+    Assertions.assertFalse(failed, "Failed getting properties from FluidDatabase");
+  }
+}