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/pom.xml b/pom.xml index 3c9ace69b8..d5abd38a7f 100644 --- a/pom.xml +++ b/pom.xml @@ -202,7 +202,7 @@ - 3.8.8 + 3.8.7 diff --git a/pomJava21.xml b/pomJava21.xml index 874f45bd2f..57d35c3364 100644 --- a/pomJava21.xml +++ b/pomJava21.xml @@ -132,7 +132,7 @@ - 3.8.8 + 3.8.7 diff --git a/pomJava8.xml b/pomJava8.xml index e44f4ca58f..3131f351f2 100644 --- a/pomJava8.xml +++ b/pomJava8.xml @@ -132,7 +132,7 @@ - 3.8.8 + 3.8.7 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/ThermodynamicOperationsTest.java b/src/test/java/neqsim/thermodynamicoperations/ThermodynamicOperationsTest.java index f95ba00492..6b31360aad 100644 --- a/src/test/java/neqsim/thermodynamicoperations/ThermodynamicOperationsTest.java +++ b/src/test/java/neqsim/thermodynamicoperations/ThermodynamicOperationsTest.java @@ -40,7 +40,8 @@ void testFlash() { ops.getSystem().initPhysicalProperties(); Double[] PTfluidProperties = ops.getSystem().getProperties().getValues(); - // Test that the operations are stable, i.e., do the same flash on the same system with the same + // Test that the operations are stable, i.e., do the same flash on the same + // system with the same // components and at the same conditions and assert that the result is the same. ops.getSystem().init(0); ops.flash(FlashType.TP, T, P, unitT, unitP); @@ -55,12 +56,11 @@ void testFlash() { @Test void testFluidDefined() { - double[] fractions = new double[] {98.0, 2.0}; - List Sp1 = - Arrays.asList(new Double[] {22.1, 23.2, 24.23, 25.98, 25.23, 26.1, 27.3, 28.7, 23.5, 22.7}); + double[] fractions = new double[] { 98.0, 2.0 }; + List Sp1 = Arrays.asList(new Double[] { 22.1, 23.2, 24.23, 25.98, 25.23, 26.1, 27.3, 28.7, 23.5, 22.7 }); List Sp2 = Arrays.asList( - new Double[] {288.1, 290.1, 295.1, 301.2, 299.3, 310.2, 315.3, 310.0, 305.2, 312.7}); - List components = Arrays.asList(new String[] {"O2", "N2"}); + new Double[] { 288.1, 290.1, 295.1, 301.2, 299.3, 310.2, 315.3, 310.0, 305.2, 312.7 }); + List components = Arrays.asList(new String[] { "O2", "N2" }); List> onlineFractions = new ArrayList>(); for (double d : fractions) { @@ -124,7 +124,8 @@ void testFluidDefined() { Assertions.assertEquals(res, res2); // todo: why does below not work? - // Assertions.assertArrayEquals(res_static.fluidProperties[0], res.fluidProperties[0]); + // Assertions.assertArrayEquals(res_static.fluidProperties[0], + // res.fluidProperties[0]); } @Test @@ -134,10 +135,9 @@ void testNeqSimPython() { thermoSystem.addComponent("ethane", 0.3); thermoSystem.init(0); - ThermodynamicOperations thermoOps = - new neqsim.thermodynamicoperations.ThermodynamicOperations(thermoSystem); - List jP = Arrays.asList(new Double[] {10.0}); - List jT = Arrays.asList(new Double[] {280.0}); + ThermodynamicOperations thermoOps = new neqsim.thermodynamicoperations.ThermodynamicOperations(thermoSystem); + List jP = Arrays.asList(new Double[] { 10.0 }); + List jT = Arrays.asList(new Double[] { 280.0 }); CalculationResult res = thermoOps.propertyFlash(jP, jT, 1, null, null); // Verify some basic properties @@ -158,32 +158,29 @@ void testNeqSimPython() { Assertions.assertEquals(res2.hashCode(), res2.hashCode()); Assertions.assertFalse(res2 == res); - CalculationResult res2_copy = - new CalculationResult(res2.fluidProperties, res2.calculationError); + CalculationResult res2_copy = new CalculationResult(res2.fluidProperties, res2.calculationError); Assertions.assertEquals(res2, res2_copy); } @Test void testNeqSimPython2() { - String[] components = - new String[] {"H2O", "N2", "CO2", "C1", "C2", "C3", "iC4", "nC4", "iC5", "nC5", "C6"}; - double[] fractions = new double[] {0.0003, 1.299, 0.419, 94.990, 2.399, 0.355, 0.172, 0.088, - 0.076, 0.036, 0.1656}; + String[] components = new String[] { "H2O", "N2", "CO2", "C1", "C2", "C3", "iC4", "nC4", "iC5", "nC5", "C6" }; + double[] fractions = new double[] { 0.0003, 1.299, 0.419, 94.990, 2.399, 0.355, 0.172, 0.088, + 0.076, 0.036, 0.1656 }; - double[] fractions2 = new double[] {0.0003, 2.299, 0.419, 93.990, 2.399, 0.355, 0.172, 0.088, - 0.076, 0.036, 0.1656}; + double[] fractions2 = new double[] { 0.0003, 2.299, 0.419, 93.990, 2.399, 0.355, 0.172, 0.088, + 0.076, 0.036, 0.1656 }; SystemInterface thermoSystem = new neqsim.thermo.system.SystemSrkEos(100 + 273.15, 60.0); thermoSystem.addComponents(components, fractions); thermoSystem.init(0); - ThermodynamicOperations thermoOps = - new neqsim.thermodynamicoperations.ThermodynamicOperations(thermoSystem); + ThermodynamicOperations thermoOps = new neqsim.thermodynamicoperations.ThermodynamicOperations(thermoSystem); double temp = 373.15; double press = 60.0 + ThermodynamicConstantsInterface.referencePressure; - List jP = Arrays.asList(new Double[] {press}); - List jT = Arrays.asList(new Double[] {temp}); + List jP = Arrays.asList(new Double[] { press }); + List jT = Arrays.asList(new Double[] { temp }); CalculationResult res = thermoOps.propertyFlash(jP, jT, 1, null, null); // Assert no calculation failed for (String errorMessage : res.calculationError) { @@ -210,15 +207,13 @@ void testNeqSimPython2() { Assertions.assertArrayEquals(res.fluidProperties[0], res1.fluidProperties[0]); int numFrac = 3; - List> onlineFractions2 = - createDummyRequest(thermoSystem.getMolarComposition(), numFrac); + List> onlineFractions2 = createDummyRequest(thermoSystem.getMolarComposition(), numFrac); - List jP2 = Arrays.asList(new Double[] {press, press}); - List jT2 = Arrays.asList(new Double[] {temp, temp}); + List jP2 = Arrays.asList(new Double[] { press, press }); + List jT2 = Arrays.asList(new Double[] { temp, temp }); SystemInterface thermoSystem2 = new neqsim.thermo.system.SystemSrkEos(273.15, 0.0); thermoSystem2.addComponents(components, fractions2); - ThermodynamicOperations thermoOps2 = - new neqsim.thermodynamicoperations.ThermodynamicOperations(thermoSystem2); + ThermodynamicOperations thermoOps2 = new neqsim.thermodynamicoperations.ThermodynamicOperations(thermoSystem2); CalculationResult res2 = thermoOps2.propertyFlash(jP2, jT2, 1, null, onlineFractions2); // Assert no calculation failed for (String errorMessage : res.calculationError) { @@ -269,10 +264,10 @@ void testComponentNames() { void testPropertyFlash() { SystemInterface fluid = new SystemSrkEos(273.15 + 45.0, 22.0); - List Sp1 = Arrays.asList(new Double[] {100000.0, 1000000.0, 10000000.0, 20000000.0, - 100000.0, 1000000.0, 10000000.0, 20000000.0, 100000.0, 1000000.0, 10000000.0, 20000000.0}); - List Sp2 = Arrays.asList(new Double[] {288.15, 288.15, 288.15, 288.15, 303.15, 303.15, - 303.15, 303.15, 423.15, 423.15, 423.15, 423.15}); + List Sp1 = Arrays.asList(new Double[] { 100000.0, 1000000.0, 10000000.0, 20000000.0, + 100000.0, 1000000.0, 10000000.0, 20000000.0, 100000.0, 1000000.0, 10000000.0, 20000000.0 }); + List Sp2 = Arrays.asList(new Double[] { 288.15, 288.15, 288.15, 288.15, 303.15, 303.15, + 303.15, 303.15, 423.15, 423.15, 423.15, 423.15 }); fluid.addComponent("water", 0.01); fluid.addComponent("nitrogen", 0.02); @@ -286,7 +281,7 @@ void testPropertyFlash() { fluid.addComponent("n-pentane", 0.01); fluid.addComponent("n-hexane", 0.01); fluid.setMolarComposition( - new double[] {0.054, 0.454, 1.514, 89.92, 5.324, 1.535, 0.232, 0.329, 0.094, 0.107, 0.437}); + new double[] { 0.054, 0.454, 1.514, 89.92, 5.324, 1.535, 0.232, 0.329, 0.094, 0.107, 0.437 }); ThermodynamicOperations ops = new ThermodynamicOperations(fluid); CalculationResult s = ops.propertyFlash(Sp1, Sp2, 1, null, null); @@ -302,8 +297,8 @@ void testPropertyFlash() { @Test void testpropertyFlashOnline() { - String[] components = {"nitrogen", "oxygen"}; - double[] fractions = {0.79, 0.21}; + String[] components = { "nitrogen", "oxygen" }; + double[] fractions = { 0.79, 0.21 }; int len = 10; List> onlineFractions = createDummyRequest(fractions, len); @@ -313,8 +308,8 @@ void testpropertyFlashOnline() { // fluid.setTotalFlowRate(1, "mole/sec"); // fluid.init(0); - Double[] pressure = {1.0, 1.5, 2.0, 2.5, 3.0, 4.0, 4.0, 3.5, 3.0, 2.5}; - Double[] temperature = {301.0, 301.5, 302.0, 302.5, 303.0, 304.0, 304.0, 303.5, 303.0, 302.5}; + Double[] pressure = { 1.0, 1.5, 2.0, 2.5, 3.0, 4.0, 4.0, 3.5, 3.0, 2.5 }; + Double[] temperature = { 301.0, 301.5, 302.0, 302.5, 303.0, 304.0, 304.0, 303.5, 303.0, 302.5 }; ThermodynamicOperations ops = new ThermodynamicOperations(fluid); CalculationResult s = ops.propertyFlash(Arrays.asList(pressure), Arrays.asList(temperature), 1, @@ -324,8 +319,8 @@ void testpropertyFlashOnline() { @Test void testpropertyFlashOnlineSingle() { - String[] components = {"nitrogen"}; - double[] fractions = {0.98}; + String[] components = { "nitrogen" }; + double[] fractions = { 0.98 }; int len = 10; List> onlineFractions = createDummyRequest(fractions, len); @@ -333,10 +328,8 @@ void testpropertyFlashOnlineSingle() { fluid.addComponents(components); fluid.addComponent("oxygen"); - Double[] pressure = - new Double[] {22.1, 23.2, 24.23, 25.98, 25.23, 26.1, 27.3, 28.7, 23.5, 22.7}; - Double[] temperature = - new Double[] {288.1, 290.1, 295.1, 301.2, 299.3, 310.2, 315.3, 310.0, 305.2, 312.7}; + Double[] pressure = new Double[] { 22.1, 23.2, 24.23, 25.98, 25.23, 26.1, 27.3, 28.7, 23.5, 22.7 }; + Double[] temperature = new Double[] { 288.1, 290.1, 295.1, 301.2, 299.3, 310.2, 315.3, 310.0, 305.2, 312.7 }; ThermodynamicOperations ops = new ThermodynamicOperations(fluid); CalculationResult s = ops.propertyFlash(Arrays.asList(pressure), Arrays.asList(temperature), 1, @@ -346,13 +339,13 @@ void testpropertyFlashOnlineSingle() { @Test void testpropertyFlashOnlineTooFewInputComponents() { - String[] components = {"nitrogen", "oxygen"}; - double[] fractions = {0.79, 0.21}; + String[] components = { "nitrogen", "oxygen" }; + double[] fractions = { 0.79, 0.21 }; int len = 10; List> onlineFractions = createDummyRequest(fractions, len); - Double[] pressure = {1.0, 1.5, 2.0, 2.5, 3.0, 4.0, 4.0, 3.5, 3.0, 2.5}; - Double[] temperature = {301.0, 301.5, 302.0, 302.5, 303.0, 304.0, 304.0, 303.5, 303.0, 302.5}; + Double[] pressure = { 1.0, 1.5, 2.0, 2.5, 3.0, 4.0, 4.0, 3.5, 3.0, 2.5 }; + Double[] temperature = { 301.0, 301.5, 302.0, 302.5, 303.0, 304.0, 304.0, 303.5, 303.0, 302.5 }; SystemInterface fluid = new SystemSrkEos(298, 1.0); // Add extra component C1 @@ -371,17 +364,17 @@ void testpropertyFlashOnlineTooFewInputComponents() { @Test void testPropertyFlashTooManyInputComponents() { int len = 10; - String[] components_too_many = {"nitrogen", "oxygen", "water"}; - double[] fractions_to_many = {0.79, 0.21, 0.01}; + String[] components_too_many = { "nitrogen", "oxygen", "water" }; + double[] fractions_to_many = { 0.79, 0.21, 0.01 }; - Double[] pressure = {1.0, 1.5, 2.0, 2.5, 3.0, 4.0, 4.0, 3.5, 3.0, 2.5}; - Double[] temperature = {301.0, 301.5, 302.0, 302.5, 303.0, 304.0, 304.0, 303.5, 303.0, 302.5}; + Double[] pressure = { 1.0, 1.5, 2.0, 2.5, 3.0, 4.0, 4.0, 3.5, 3.0, 2.5 }; + Double[] temperature = { 301.0, 301.5, 302.0, 302.5, 303.0, 304.0, 304.0, 303.5, 303.0, 302.5 }; List> onlineFractions_too_many = createDummyRequest(fractions_to_many, len); SystemInterface fluid = new SystemSrkEos(298, 1.0); // Add only two components to fluid - String[] components = {"nitrogen", "oxygen"}; + String[] components = { "nitrogen", "oxygen" }; fluid.addComponents(components); ThermodynamicOperations ops = new ThermodynamicOperations(fluid); CalculationResult s = ops.propertyFlash(Arrays.asList(pressure), Arrays.asList(temperature), 1, @@ -396,7 +389,8 @@ void testPropertyFlashTooManyInputComponents() { @SuppressWarnings("unchecked") void testpropertyFlashRegressions() throws IOException { // TODO: make these tests work - // make output log of differences per failing test and see check if it is related to change in + // make output log of differences per failing test and see check if it is + // related to change in // component input data Collection testData = getTestData(); @@ -411,7 +405,8 @@ void testpropertyFlashRegressions() throws IOException { if (compNames == null) { // System.out.println("Skips test " + test.toString()); /* - * for (int k = 0; k < fractions.size(); k++) { fluid.addComponent(k, fractions.get(k)); } + * for (int k = 0; k < fractions.size(); k++) { fluid.addComponent(k, + * fractions.get(k)); } */ continue; } else { @@ -474,8 +469,7 @@ private List> createDummyRequest(double[] fractions, int len) { private Collection getTestData() throws IOException { ClassLoader classLoader = getClass().getClassLoader(); - File folder = - new File(classLoader.getResource("neqsim/thermodynamicOperations/testcases").getFile()); + File folder = new File(classLoader.getResource("neqsim/thermodynamicoperations/testcases").getFile()); HashMap testData = new HashMap<>(); @@ -524,7 +518,8 @@ public void setOutputFile(String outputFile) { private void setInput(String inputFile) throws IOException { String fileContents = new String(Files.readAllBytes(Paths.get(inputFile))); Gson gson = new Gson(); - Type type = new TypeToken>() {}.getType(); + Type type = new TypeToken>() { + }.getType(); input = gson.fromJson(fileContents, type); @@ -548,11 +543,11 @@ private HashMap getInput() { public CalculationResult getOutput() throws IOException { String fileContents = new String(Files.readAllBytes(Paths.get(this.getOutputFile()))); Gson gson = new Gson(); - Type type = new TypeToken>() {}.getType(); + Type type = new TypeToken>() { + }.getType(); HashMap outputData = gson.fromJson(fileContents, type); - ArrayList> calcresult = - (ArrayList>) outputData.get("calcresult"); + ArrayList> calcresult = (ArrayList>) outputData.get("calcresult"); Double[][] calcResult = new Double[calcresult.size()][]; for (int kSample = 0; kSample < calcresult.size(); kSample++) { 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