From 48b65190b616c68e5d3ad093fc7a7ddcb357bf0b Mon Sep 17 00:00:00 2001 From: Even Solbraa <41290109+EvenSol@users.noreply.github.com> Date: Sat, 7 Dec 2024 10:59:03 +0000 Subject: [PATCH] fix windows bug --- .github/workflows/verify_build.yml | 58 ++++++++++++++++--- .../neqsim/util/database/NeqSimDataBase.java | 25 ++++---- .../PTPhaseEnvelopeTest.java | 27 ++++----- src/test/resources/log4j.properties | 21 ------- .../COMP.csv | 0 .../INTER.csv | 0 .../neqsimdb.sql | 0 .../testcases/TestCase10_I.json | 0 .../testcases/TestCase10_O.json | 0 .../testcases/TestCase11_I.json | 0 .../testcases/TestCase11_O.json | 0 .../testcases/TestCase13_I.json | 0 .../testcases/TestCase13_O.json | 0 .../testcases/TestCase14_I.json | 0 .../testcases/TestCase14_O.json | 0 .../testcases/TestCase15_I.json | 0 .../testcases/TestCase15_O.json | 0 .../testcases/TestCase16_I.json | 0 .../testcases/TestCase16_O.json | 0 .../testcases/TestCase17_I.json | 0 .../testcases/TestCase17_O.json | 0 .../testcases/TestCase18_I.json | 0 .../testcases/TestCase18_O.json | 0 .../testcases/TestCase19_I.json | 0 .../testcases/TestCase19_O.json | 0 .../testcases/TestCase1_I.json | 0 .../testcases/TestCase1_O.json | 0 .../testcases/TestCase20_I.json | 0 .../testcases/TestCase20_O.json | 0 .../testcases/TestCase21_I.json | 0 .../testcases/TestCase21_O.json | 0 .../testcases/TestCase22_I.json | 0 .../testcases/TestCase22_O.json | 0 .../testcases/TestCase23_I.json | 0 .../testcases/TestCase23_O.json | 0 .../testcases/TestCase24_I.json | 0 .../testcases/TestCase24_O.json | 0 .../testcases/TestCase25_I.json | 0 .../testcases/TestCase25_O.json | 0 .../testcases/TestCase26_I.json | 0 .../testcases/TestCase26_O.json | 0 .../testcases/TestCase27_I.json | 0 .../testcases/TestCase27_O.json | 0 .../testcases/TestCase28_I.json | 0 .../testcases/TestCase28_O.json | 0 .../testcases/TestCase29_I.json | 0 .../testcases/TestCase29_O.json | 0 .../testcases/TestCase2_I.json | 0 .../testcases/TestCase2_O.json | 0 .../testcases/TestCase3_I.json | 0 .../testcases/TestCase3_O.json | 0 .../testcases/TestCase4_I.json | 0 .../testcases/TestCase4_O.json | 0 .../testcases/TestCase5_I.json | 0 .../testcases/TestCase5_O.json | 0 .../testcases/TestCase6_I.json | 0 .../testcases/TestCase6_O.json | 0 .../testcases/TestCase7_I.json | 0 .../testcases/TestCase7_O.json | 0 .../testcases/TestCase8_I.json | 0 .../testcases/TestCase8_O.json | 0 .../testcases/TestCase9_I.json | 0 .../testcases/TestCase9_O.json | 0 63 files changed, 74 insertions(+), 57 deletions(-) rename src/test/java/neqsim/thermodynamicoperations/phaseenvelopeops/{multicomponentEnvelopeOps => multicomponentenvelopeops}/PTPhaseEnvelopeTest.java (84%) delete mode 100644 src/test/resources/log4j.properties rename src/test/resources/neqsim/{thermodynamicOperations => thermodynamicoperations}/COMP.csv (100%) rename src/test/resources/neqsim/{thermodynamicOperations => thermodynamicoperations}/INTER.csv (100%) rename src/test/resources/neqsim/{thermodynamicOperations => thermodynamicoperations}/neqsimdb.sql (100%) rename src/test/resources/neqsim/{thermodynamicOperations => thermodynamicoperations}/testcases/TestCase10_I.json (100%) rename src/test/resources/neqsim/{thermodynamicOperations => thermodynamicoperations}/testcases/TestCase10_O.json (100%) rename src/test/resources/neqsim/{thermodynamicOperations => thermodynamicoperations}/testcases/TestCase11_I.json (100%) rename src/test/resources/neqsim/{thermodynamicOperations => thermodynamicoperations}/testcases/TestCase11_O.json (100%) rename src/test/resources/neqsim/{thermodynamicOperations => thermodynamicoperations}/testcases/TestCase13_I.json (100%) rename src/test/resources/neqsim/{thermodynamicOperations => thermodynamicoperations}/testcases/TestCase13_O.json (100%) rename src/test/resources/neqsim/{thermodynamicOperations => thermodynamicoperations}/testcases/TestCase14_I.json (100%) rename src/test/resources/neqsim/{thermodynamicOperations => thermodynamicoperations}/testcases/TestCase14_O.json (100%) rename src/test/resources/neqsim/{thermodynamicOperations => thermodynamicoperations}/testcases/TestCase15_I.json (100%) rename src/test/resources/neqsim/{thermodynamicOperations => thermodynamicoperations}/testcases/TestCase15_O.json (100%) rename src/test/resources/neqsim/{thermodynamicOperations => thermodynamicoperations}/testcases/TestCase16_I.json (100%) rename src/test/resources/neqsim/{thermodynamicOperations => thermodynamicoperations}/testcases/TestCase16_O.json (100%) rename src/test/resources/neqsim/{thermodynamicOperations => thermodynamicoperations}/testcases/TestCase17_I.json (100%) rename src/test/resources/neqsim/{thermodynamicOperations => thermodynamicoperations}/testcases/TestCase17_O.json (100%) rename src/test/resources/neqsim/{thermodynamicOperations => thermodynamicoperations}/testcases/TestCase18_I.json (100%) rename src/test/resources/neqsim/{thermodynamicOperations => thermodynamicoperations}/testcases/TestCase18_O.json (100%) rename src/test/resources/neqsim/{thermodynamicOperations => thermodynamicoperations}/testcases/TestCase19_I.json (100%) rename src/test/resources/neqsim/{thermodynamicOperations => thermodynamicoperations}/testcases/TestCase19_O.json (100%) rename src/test/resources/neqsim/{thermodynamicOperations => thermodynamicoperations}/testcases/TestCase1_I.json (100%) rename src/test/resources/neqsim/{thermodynamicOperations => thermodynamicoperations}/testcases/TestCase1_O.json (100%) rename src/test/resources/neqsim/{thermodynamicOperations => thermodynamicoperations}/testcases/TestCase20_I.json (100%) rename src/test/resources/neqsim/{thermodynamicOperations => thermodynamicoperations}/testcases/TestCase20_O.json (100%) rename src/test/resources/neqsim/{thermodynamicOperations => thermodynamicoperations}/testcases/TestCase21_I.json (100%) rename src/test/resources/neqsim/{thermodynamicOperations => thermodynamicoperations}/testcases/TestCase21_O.json (100%) rename src/test/resources/neqsim/{thermodynamicOperations => thermodynamicoperations}/testcases/TestCase22_I.json (100%) rename src/test/resources/neqsim/{thermodynamicOperations => thermodynamicoperations}/testcases/TestCase22_O.json (100%) rename src/test/resources/neqsim/{thermodynamicOperations => thermodynamicoperations}/testcases/TestCase23_I.json (100%) rename src/test/resources/neqsim/{thermodynamicOperations => thermodynamicoperations}/testcases/TestCase23_O.json (100%) rename src/test/resources/neqsim/{thermodynamicOperations => thermodynamicoperations}/testcases/TestCase24_I.json (100%) rename src/test/resources/neqsim/{thermodynamicOperations => thermodynamicoperations}/testcases/TestCase24_O.json (100%) rename src/test/resources/neqsim/{thermodynamicOperations => thermodynamicoperations}/testcases/TestCase25_I.json (100%) rename src/test/resources/neqsim/{thermodynamicOperations => thermodynamicoperations}/testcases/TestCase25_O.json (100%) rename src/test/resources/neqsim/{thermodynamicOperations => thermodynamicoperations}/testcases/TestCase26_I.json (100%) rename src/test/resources/neqsim/{thermodynamicOperations => thermodynamicoperations}/testcases/TestCase26_O.json (100%) rename src/test/resources/neqsim/{thermodynamicOperations => thermodynamicoperations}/testcases/TestCase27_I.json (100%) rename src/test/resources/neqsim/{thermodynamicOperations => thermodynamicoperations}/testcases/TestCase27_O.json (100%) rename src/test/resources/neqsim/{thermodynamicOperations => thermodynamicoperations}/testcases/TestCase28_I.json (100%) rename src/test/resources/neqsim/{thermodynamicOperations => thermodynamicoperations}/testcases/TestCase28_O.json (100%) rename src/test/resources/neqsim/{thermodynamicOperations => thermodynamicoperations}/testcases/TestCase29_I.json (100%) rename src/test/resources/neqsim/{thermodynamicOperations => thermodynamicoperations}/testcases/TestCase29_O.json (100%) rename src/test/resources/neqsim/{thermodynamicOperations => thermodynamicoperations}/testcases/TestCase2_I.json (100%) rename src/test/resources/neqsim/{thermodynamicOperations => thermodynamicoperations}/testcases/TestCase2_O.json (100%) rename src/test/resources/neqsim/{thermodynamicOperations => thermodynamicoperations}/testcases/TestCase3_I.json (100%) rename src/test/resources/neqsim/{thermodynamicOperations => thermodynamicoperations}/testcases/TestCase3_O.json (100%) rename src/test/resources/neqsim/{thermodynamicOperations => thermodynamicoperations}/testcases/TestCase4_I.json (100%) rename src/test/resources/neqsim/{thermodynamicOperations => thermodynamicoperations}/testcases/TestCase4_O.json (100%) rename src/test/resources/neqsim/{thermodynamicOperations => thermodynamicoperations}/testcases/TestCase5_I.json (100%) rename src/test/resources/neqsim/{thermodynamicOperations => thermodynamicoperations}/testcases/TestCase5_O.json (100%) rename src/test/resources/neqsim/{thermodynamicOperations => thermodynamicoperations}/testcases/TestCase6_I.json (100%) rename src/test/resources/neqsim/{thermodynamicOperations => thermodynamicoperations}/testcases/TestCase6_O.json (100%) rename src/test/resources/neqsim/{thermodynamicOperations => thermodynamicoperations}/testcases/TestCase7_I.json (100%) rename src/test/resources/neqsim/{thermodynamicOperations => thermodynamicoperations}/testcases/TestCase7_O.json (100%) rename src/test/resources/neqsim/{thermodynamicOperations => thermodynamicoperations}/testcases/TestCase8_I.json (100%) rename src/test/resources/neqsim/{thermodynamicOperations => thermodynamicoperations}/testcases/TestCase8_O.json (100%) rename src/test/resources/neqsim/{thermodynamicOperations => thermodynamicoperations}/testcases/TestCase9_I.json (100%) rename src/test/resources/neqsim/{thermodynamicOperations => thermodynamicoperations}/testcases/TestCase9_O.json (100%) diff --git a/.github/workflows/verify_build.yml b/.github/workflows/verify_build.yml index 11d0c38376..f79a05af63 100644 --- a/.github/workflows/verify_build.yml +++ b/.github/workflows/verify_build.yml @@ -12,7 +12,7 @@ on: jobs: test_java_11: - name: Assert tests and javadoc with java 11 + name: Assert tests and javadoc with Java 11 on Ubuntu runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -34,13 +34,11 @@ jobs: file: jacoco.xml name: codecov token: ${{ secrets.CODECOV_TOKEN }} - # tags: coverage - + test_java_8: - name: Assert tests with java 8 + name: Assert tests with Java 8 on Ubuntu runs-on: ubuntu-latest needs: test_java_11 - steps: - uses: actions/checkout@v4 - name: Set up JDK 8 @@ -52,9 +50,8 @@ jobs: - name: Run tests run: mvn -B test --file pomJava8.xml -ntp - test_java_21: - name: Assert tests with java 21 + name: Assert tests with Java 21 on Ubuntu runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -68,3 +65,50 @@ jobs: run: mvn javadoc:javadoc - name: Run tests run: mvn -B test --file pomJava21.xml -ntp + + test_java_11_windows: + name: Assert tests with Java 11 on Windows + runs-on: windows-latest + steps: + - uses: actions/checkout@v4 + - name: Set up JDK 11 + uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: '11' + cache: 'maven' + - name: Generate javadoc + run: mvn javadoc:javadoc + - name: Run tests + run: mvn -B test --file pom.xml -ntp + + test_java_8_windows: + name: Assert tests with Java 8 on Windows + runs-on: windows-latest + needs: test_java_11_windows + steps: + - uses: actions/checkout@v4 + - name: Set up JDK 8 + uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: '8' + cache: 'maven' + - name: Run tests + run: mvn -B test --file pomJava8.xml -ntp + + test_java_21_windows: + name: Assert tests with Java 21 on Windows + runs-on: windows-latest + steps: + - uses: actions/checkout@v4 + - name: Set up JDK 21 + uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: '21' + cache: 'maven' + - name: Generate javadoc + run: mvn javadoc:javadoc + - name: Run tests + run: mvn -B test --file pomJava21.xml -ntp diff --git a/src/main/java/neqsim/util/database/NeqSimDataBase.java b/src/main/java/neqsim/util/database/NeqSimDataBase.java index f10345f73b..61bc6f9730 100644 --- a/src/main/java/neqsim/util/database/NeqSimDataBase.java +++ b/src/main/java/neqsim/util/database/NeqSimDataBase.java @@ -72,7 +72,7 @@ public NeqSimDataBase() { *

* * @return a Connection object - * @throws java.sql.SQLException if any. + * @throws java.sql.SQLException if any. * @throws java.lang.ClassNotFoundException if any. */ public Connection openConnection() throws SQLException, ClassNotFoundException { @@ -163,7 +163,8 @@ public void setStatement(Statement statement) { *

* * @param sqlString Query to execute. - * @return True if the first result is a ResultSet object; false if it is an update count or there + * @return True if the first result is a ResultSet object; false if it is an + * update count or there * are no results */ public boolean execute(String sqlString) { @@ -286,7 +287,7 @@ public static void setDataBaseType(String aDataBaseType) { * Setter for the field dataBaseType. *

* - * @param aDataBaseType a {@link java.lang.String} object + * @param aDataBaseType a {@link java.lang.String} object * @param connectionString a {@link java.lang.String} object */ public static void setDataBaseType(String aDataBaseType, String connectionString) { @@ -402,8 +403,7 @@ public static String[] getComponentNames() { */ public static boolean hasComponent(String name) { try (neqsim.util.database.NeqSimDataBase database = new neqsim.util.database.NeqSimDataBase(); - java.sql.ResultSet dataSet = - database.getResultSet("select count(*) from comp WHERE NAME='" + name + "'")) { + java.sql.ResultSet dataSet = database.getResultSet("select count(*) from comp WHERE NAME='" + name + "'")) { dataSet.next(); int size = dataSet.getInt(1); if (size == 0) { @@ -424,8 +424,7 @@ public static boolean hasComponent(String name) { */ public static boolean hasTempComponent(String name) { try (neqsim.util.database.NeqSimDataBase database = new neqsim.util.database.NeqSimDataBase(); - java.sql.ResultSet dataSet = - database.getResultSet("select count(*) from comptemp WHERE NAME='" + name + "'")) { + java.sql.ResultSet dataSet = database.getResultSet("select count(*) from comptemp WHERE NAME='" + name + "'")) { dataSet.next(); int size = dataSet.getInt(1); if (size == 0) { @@ -451,7 +450,7 @@ public static void updateTable(String tableName) { * Drops and re-creates table from contents in csv file. * * @param tableName Name of table to replace - * @param path Path to csv file to get table data from + * @param path Path to csv file to get table data from */ public static void updateTable(String tableName, String path) { URL url = NeqSimDataBase.class.getClassLoader().getResource(path); @@ -461,7 +460,7 @@ public static void updateTable(String tableName, String path) { } try (neqsim.util.database.NeqSimDataBase database = new neqsim.util.database.NeqSimDataBase()) { database.execute("DROP TABLE IF EXISTS " + tableName); - String sqlString = "CREATE TABLE " + tableName + " AS SELECT * FROM CSVREAD('" + url + "')"; + String sqlString = "CREATE TABLE " + tableName + " AS SELECT * FROM CSVREAD('file:" + url + "')"; database.execute(sqlString); } catch (Exception ex) { logger.error("Failed updating table " + tableName, ex); @@ -472,7 +471,7 @@ public static void updateTable(String tableName, String path) { * Drops and re-creates table from contents in csv file. * * @param tableName Name of table to replace - * @param path Path to csv file to + * @param path Path to csv file to */ public static void replaceTable(String tableName, String path) { try (neqsim.util.database.NeqSimDataBase database = new neqsim.util.database.NeqSimDataBase()) { @@ -494,8 +493,7 @@ public static void replaceTable(String tableName, String path) { */ public static void initH2DatabaseFromCSVfiles() { h2IsInitalizing = true; - neqsim.util.database.NeqSimDataBase.connectionString = - "jdbc:h2:mem:neqsimthermodatabase;DB_CLOSE_DELAY=-1"; + neqsim.util.database.NeqSimDataBase.connectionString = "jdbc:h2:mem:neqsimthermodatabase;DB_CLOSE_DELAY=-1"; neqsim.util.database.NeqSimDataBase.dataBaseType = "H2"; try { @@ -539,8 +537,7 @@ public static void initH2DatabaseFromCSVfiles() { // technicalrequirements, technicalrequirements_process, materialpipeproperties, // materialplateproperties, fittings, LuciaData, Luciadata8 - try (neqsim.util.database.NeqSimDataBase database = - new neqsim.util.database.NeqSimDataBase()) { + try (neqsim.util.database.NeqSimDataBase database = new neqsim.util.database.NeqSimDataBase()) { database.execute("CREATE TABLE comptemp AS SELECT * FROM comp"); database.execute("CREATE TABLE intertemp AS SELECT * FROM inter"); } diff --git a/src/test/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentEnvelopeOps/PTPhaseEnvelopeTest.java b/src/test/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/PTPhaseEnvelopeTest.java similarity index 84% rename from src/test/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentEnvelopeOps/PTPhaseEnvelopeTest.java rename to src/test/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/PTPhaseEnvelopeTest.java index d827509cf4..9c1f4b2c17 100644 --- a/src/test/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentEnvelopeOps/PTPhaseEnvelopeTest.java +++ b/src/test/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/PTPhaseEnvelopeTest.java @@ -1,4 +1,4 @@ -package neqsim.thermodynamicoperations.phaseenvelopeops.multicomponentEnvelopeOps; +package neqsim.thermodynamicoperations.phaseenvelopeops.multicomponentenvelopeops; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -32,16 +32,15 @@ void testDewP() { testSystem.initProperties(); testOps.calcPTphaseEnvelope(); double[] dewPointPressures = testOps.get("dewP"); - double[] expectedDewPointPressures = - new double[] {1.1051709180756477, 1.2214027581601699, 1.3498588075760032, - 1.4918246976412703, 1.6652911949458864, 1.8794891289619104, 2.1418131227502055, - 2.4690864123141987, 2.881197018974799, 3.404779997613969, 4.075230307874481, - 4.938583914869986, 6.051801019586486, 7.477304695462727, 9.260793952051571, - 11.364101185282063, 13.480106047577934, 14.53423776629387, 13.607498029406681, - 11.181207439509638, 9.189487040488075, 9.612827246459474, 10.706126846063928, - 12.501491987760147, 15.075672692089958, 18.51283799420178, 23.330378296334104, - 29.71319711031059, 37.25532259549197, 43.660805656603934, 45.75836660678656, - 46.42490219574348, 46.83203503669948, 46.869568345957006, 46.903557772489435}; + double[] expectedDewPointPressures = new double[] { 1.1051709180756477, 1.2214027581601699, 1.3498588075760032, + 1.4918246976412703, 1.6652911949458864, 1.8794891289619104, 2.1418131227502055, + 2.4690864123141987, 2.881197018974799, 3.404779997613969, 4.075230307874481, + 4.938583914869986, 6.051801019586486, 7.477304695462727, 9.260793952051571, + 11.364101185282063, 13.480106047577934, 14.53423776629387, 13.607498029406681, + 11.181207439509638, 9.189487040488075, 9.612827246459474, 10.706126846063928, + 12.501491987760147, 15.075672692089958, 18.51283799420178, 23.330378296334104, + 29.71319711031059, 37.25532259549197, 43.660805656603934, 45.75836660678656, + 46.42490219574348, 46.83203503669948, 46.869568345957006, 46.903557772489435 }; // System.out.println(Arrays.toString(dewPointPressures)); assertArrayEquals(expectedDewPointPressures, dewPointPressures, 10E-10); } @@ -59,8 +58,7 @@ void testFailingCaseWithWater() { testOps.TPflash(); testSystem.initProperties(); - Exception exception = - assertThrows(ArrayIndexOutOfBoundsException.class, () -> testOps.calcPTphaseEnvelope()); + Exception exception = assertThrows(ArrayIndexOutOfBoundsException.class, () -> testOps.calcPTphaseEnvelope()); } @Test @@ -134,8 +132,7 @@ void testFailingCase1() { void testFailingCase2() { // testSystem.setTemperature(40, "C"); // testSystem.setPressure(50, "bara"); - neqsim.thermo.system.SystemInterface fluid0_HC = - new neqsim.thermo.system.SystemUMRPRUMCEos(298.0, 50.0); + neqsim.thermo.system.SystemInterface fluid0_HC = new neqsim.thermo.system.SystemUMRPRUMCEos(298.0, 50.0); fluid0_HC.addComponent("nitrogen", 2.5); fluid0_HC.addComponent("CO2", 4.5); fluid0_HC.addComponent("methane", 79.45); diff --git a/src/test/resources/log4j.properties b/src/test/resources/log4j.properties deleted file mode 100644 index d0c0e1089c..0000000000 --- a/src/test/resources/log4j.properties +++ /dev/null @@ -1,21 +0,0 @@ -status = warn -dest = out -name = NeqSimTestConfig - -filters = threshold - -filter.threshold.type = ThresholdFilter -filter.threshold.level = debug - -appenders = console - -appender.console.type = Console -appender.console.name = STDOUT -appender.console.layout.type = PatternLayout -appender.console.layout.pattern = %d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n - - -# Define the root logger with appender file - see https://www.tutorialspoint.com/log4j/log4j_logging_levels.htm -rootLogger.level = warn -rootLogger.appenderRefs = stdout -rootLogger.appenderRef.stdout.ref = STDOUT diff --git a/src/test/resources/neqsim/thermodynamicOperations/COMP.csv b/src/test/resources/neqsim/thermodynamicoperations/COMP.csv similarity index 100% rename from src/test/resources/neqsim/thermodynamicOperations/COMP.csv rename to src/test/resources/neqsim/thermodynamicoperations/COMP.csv diff --git a/src/test/resources/neqsim/thermodynamicOperations/INTER.csv b/src/test/resources/neqsim/thermodynamicoperations/INTER.csv similarity index 100% rename from src/test/resources/neqsim/thermodynamicOperations/INTER.csv rename to src/test/resources/neqsim/thermodynamicoperations/INTER.csv diff --git a/src/test/resources/neqsim/thermodynamicOperations/neqsimdb.sql b/src/test/resources/neqsim/thermodynamicoperations/neqsimdb.sql similarity index 100% rename from src/test/resources/neqsim/thermodynamicOperations/neqsimdb.sql rename to src/test/resources/neqsim/thermodynamicoperations/neqsimdb.sql diff --git a/src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase10_I.json b/src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase10_I.json similarity index 100% rename from src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase10_I.json rename to src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase10_I.json diff --git a/src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase10_O.json b/src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase10_O.json similarity index 100% rename from src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase10_O.json rename to src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase10_O.json diff --git a/src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase11_I.json b/src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase11_I.json similarity index 100% rename from src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase11_I.json rename to src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase11_I.json diff --git a/src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase11_O.json b/src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase11_O.json similarity index 100% rename from src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase11_O.json rename to src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase11_O.json diff --git a/src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase13_I.json b/src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase13_I.json similarity index 100% rename from src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase13_I.json rename to src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase13_I.json diff --git a/src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase13_O.json b/src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase13_O.json similarity index 100% rename from src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase13_O.json rename to src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase13_O.json diff --git a/src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase14_I.json b/src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase14_I.json similarity index 100% rename from src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase14_I.json rename to src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase14_I.json diff --git a/src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase14_O.json b/src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase14_O.json similarity index 100% rename from src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase14_O.json rename to src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase14_O.json diff --git a/src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase15_I.json b/src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase15_I.json similarity index 100% rename from src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase15_I.json rename to src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase15_I.json diff --git a/src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase15_O.json b/src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase15_O.json similarity index 100% rename from src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase15_O.json rename to src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase15_O.json diff --git a/src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase16_I.json b/src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase16_I.json similarity index 100% rename from src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase16_I.json rename to src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase16_I.json diff --git a/src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase16_O.json b/src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase16_O.json similarity index 100% rename from src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase16_O.json rename to src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase16_O.json diff --git a/src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase17_I.json b/src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase17_I.json similarity index 100% rename from src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase17_I.json rename to src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase17_I.json diff --git a/src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase17_O.json b/src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase17_O.json similarity index 100% rename from src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase17_O.json rename to src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase17_O.json diff --git a/src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase18_I.json b/src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase18_I.json similarity index 100% rename from src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase18_I.json rename to src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase18_I.json diff --git a/src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase18_O.json b/src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase18_O.json similarity index 100% rename from src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase18_O.json rename to src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase18_O.json diff --git a/src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase19_I.json b/src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase19_I.json similarity index 100% rename from src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase19_I.json rename to src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase19_I.json diff --git a/src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase19_O.json b/src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase19_O.json similarity index 100% rename from src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase19_O.json rename to src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase19_O.json diff --git a/src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase1_I.json b/src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase1_I.json similarity index 100% rename from src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase1_I.json rename to src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase1_I.json diff --git a/src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase1_O.json b/src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase1_O.json similarity index 100% rename from src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase1_O.json rename to src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase1_O.json diff --git a/src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase20_I.json b/src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase20_I.json similarity index 100% rename from src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase20_I.json rename to src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase20_I.json diff --git a/src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase20_O.json b/src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase20_O.json similarity index 100% rename from src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase20_O.json rename to src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase20_O.json diff --git a/src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase21_I.json b/src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase21_I.json similarity index 100% rename from src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase21_I.json rename to src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase21_I.json diff --git a/src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase21_O.json b/src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase21_O.json similarity index 100% rename from src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase21_O.json rename to src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase21_O.json diff --git a/src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase22_I.json b/src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase22_I.json similarity index 100% rename from src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase22_I.json rename to src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase22_I.json diff --git a/src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase22_O.json b/src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase22_O.json similarity index 100% rename from src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase22_O.json rename to src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase22_O.json diff --git a/src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase23_I.json b/src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase23_I.json similarity index 100% rename from src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase23_I.json rename to src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase23_I.json diff --git a/src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase23_O.json b/src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase23_O.json similarity index 100% rename from src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase23_O.json rename to src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase23_O.json diff --git a/src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase24_I.json b/src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase24_I.json similarity index 100% rename from src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase24_I.json rename to src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase24_I.json diff --git a/src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase24_O.json b/src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase24_O.json similarity index 100% rename from src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase24_O.json rename to src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase24_O.json diff --git a/src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase25_I.json b/src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase25_I.json similarity index 100% rename from src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase25_I.json rename to src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase25_I.json diff --git a/src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase25_O.json b/src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase25_O.json similarity index 100% rename from src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase25_O.json rename to src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase25_O.json diff --git a/src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase26_I.json b/src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase26_I.json similarity index 100% rename from src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase26_I.json rename to src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase26_I.json diff --git a/src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase26_O.json b/src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase26_O.json similarity index 100% rename from src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase26_O.json rename to src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase26_O.json diff --git a/src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase27_I.json b/src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase27_I.json similarity index 100% rename from src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase27_I.json rename to src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase27_I.json diff --git a/src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase27_O.json b/src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase27_O.json similarity index 100% rename from src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase27_O.json rename to src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase27_O.json diff --git a/src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase28_I.json b/src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase28_I.json similarity index 100% rename from src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase28_I.json rename to src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase28_I.json diff --git a/src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase28_O.json b/src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase28_O.json similarity index 100% rename from src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase28_O.json rename to src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase28_O.json diff --git a/src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase29_I.json b/src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase29_I.json similarity index 100% rename from src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase29_I.json rename to src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase29_I.json diff --git a/src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase29_O.json b/src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase29_O.json similarity index 100% rename from src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase29_O.json rename to src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase29_O.json diff --git a/src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase2_I.json b/src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase2_I.json similarity index 100% rename from src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase2_I.json rename to src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase2_I.json diff --git a/src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase2_O.json b/src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase2_O.json similarity index 100% rename from src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase2_O.json rename to src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase2_O.json diff --git a/src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase3_I.json b/src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase3_I.json similarity index 100% rename from src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase3_I.json rename to src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase3_I.json diff --git a/src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase3_O.json b/src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase3_O.json similarity index 100% rename from src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase3_O.json rename to src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase3_O.json diff --git a/src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase4_I.json b/src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase4_I.json similarity index 100% rename from src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase4_I.json rename to src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase4_I.json diff --git a/src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase4_O.json b/src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase4_O.json similarity index 100% rename from src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase4_O.json rename to src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase4_O.json diff --git a/src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase5_I.json b/src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase5_I.json similarity index 100% rename from src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase5_I.json rename to src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase5_I.json diff --git a/src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase5_O.json b/src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase5_O.json similarity index 100% rename from src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase5_O.json rename to src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase5_O.json diff --git a/src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase6_I.json b/src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase6_I.json similarity index 100% rename from src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase6_I.json rename to src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase6_I.json diff --git a/src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase6_O.json b/src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase6_O.json similarity index 100% rename from src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase6_O.json rename to src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase6_O.json diff --git a/src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase7_I.json b/src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase7_I.json similarity index 100% rename from src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase7_I.json rename to src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase7_I.json diff --git a/src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase7_O.json b/src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase7_O.json similarity index 100% rename from src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase7_O.json rename to src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase7_O.json diff --git a/src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase8_I.json b/src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase8_I.json similarity index 100% rename from src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase8_I.json rename to src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase8_I.json diff --git a/src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase8_O.json b/src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase8_O.json similarity index 100% rename from src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase8_O.json rename to src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase8_O.json diff --git a/src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase9_I.json b/src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase9_I.json similarity index 100% rename from src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase9_I.json rename to src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase9_I.json diff --git a/src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase9_O.json b/src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase9_O.json similarity index 100% rename from src/test/resources/neqsim/thermodynamicOperations/testcases/TestCase9_O.json rename to src/test/resources/neqsim/thermodynamicoperations/testcases/TestCase9_O.json