GitLab

at 2024-06-25T17:40:30+02:00

Fix persistence tests (by skipping them), when some files are missing to execute them

     }

 

     public static List<String> allDatabases(Path path) {

+        Assume.assumeTrue("Skip, avdth root path " + path + " not found", Files.exists(path));

         try (Stream<Path> pathStream = Files.find(path, 1, (p, b) -> p.toFile().getName().endsWith(".mdb"))) {

             List<String> collect = pathStream.map(p -> p.toFile().getName()).sorted().collect(Collectors.toList());

             Collections.reverse(collect);

     public void build() throws SQLException, IOException, MissingReferentialException {

         log.info(String.format("Start for database: %s", dbName));

         Path avdthFile = getRootPath().resolve(dbName);

+        Assume.assumeTrue("Skip, avdth file " + avdthFile + " not found", Files.exists(avdthFile));

         Path scriptPath = TOPIA_TEST_CLASS_RESOURCE.getTestDirectory().toPath().resolve("export-" + dbName.replace(".mdb", ".sql"));

         Path scriptTemporaryDirectory = scriptPath.getParent().resolve(scriptPath.toFile().getName().replace(".sql", "-tmp"));

 

 import fr.ird.observe.test.spi.DatabasePasswordConfiguration;

 import fr.ird.observe.test.spi.DatabaseVersionConfiguration;

 import org.junit.Assert;

+import org.junit.Assume;

 import org.junit.ClassRule;

 import org.junit.Test;

 

 import java.io.IOException;

+import java.nio.file.Files;

 import java.nio.file.Path;

 import java.sql.Connection;

 import java.sql.SQLException;

         Path avdthFile = AvdthFixtures.getAvdthCachePath()

                 .resolve("OA")

                 .resolve("OA_2020_V35.mdb");

+        Assume.assumeTrue("Skip, avdth file " + avdthFile + " not found", Files.exists(avdthFile));

         Path scriptPath = localTestMethodResource.getTestDirectory().toPath().resolve("export-" + avdthFile.toFile().getName().replace(".mdb", ".sql"));

         Path scriptTemporaryDirectory = scriptPath.getParent().resolve(scriptPath.toFile().getName().replace(".sql", "-tmp"));

 

 import fr.ird.observe.test.spi.DatabasePasswordConfiguration;

 import fr.ird.observe.test.spi.DatabaseVersionConfiguration;

 import org.junit.Assert;

+import org.junit.Assume;

 import org.junit.ClassRule;

 import org.junit.Test;

 

 import java.io.IOException;

+import java.nio.file.Files;

 import java.nio.file.Path;

 import java.sql.Connection;

 import java.sql.SQLException;

     public void build() throws SQLException, IOException {

         Path avdthFile = AvdthFixtures.getAvdthCachePath()

                 .resolve("avdth-gen-35_74.mdb");

+        Assume.assumeTrue("Skip, avdth file " + avdthFile + " not found", Files.exists(avdthFile));

         Path scriptPath = localTestMethodResource.getTestDirectory().toPath().resolve("export-" + avdthFile.toFile().getName().replace(".mdb", ".sql"));

         Path scriptTemporaryDirectory = scriptPath.getParent().resolve(scriptPath.toFile().getName().replace(".sql", "-tmp"));

 

 

     @Test

     public void isTableExist() throws SQLException {

-        boolean actual = jdbcHelper.isTableExist("Public", "Tms_version");

+        boolean actual = jdbcHelper.isTableExist("Common", "database_version");

         Assert.assertTrue(actual);

 

-        actual = jdbcHelper.isTableExist("PUBLIC", "tms_version-fake");

+        actual = jdbcHelper.isTableExist("PUBLIC", "database_version-fake");

         Assert.assertFalse(actual);

     }

     @Test

 import io.ultreia.java4all.util.Version;

 import io.ultreia.java4all.util.sql.conf.JdbcConfiguration;

 import io.ultreia.java4all.util.sql.conf.JdbcConfigurationBuilder;

+import org.junit.Assume;

 

 import java.lang.reflect.AnnotatedElement;

 import java.net.MalformedURLException;

 import java.net.URL;

+import java.nio.file.Files;

 import java.nio.file.Path;

 

 /**

     }

 

     public static JdbcConfiguration pgConfiguration() {

-        return new JdbcConfigurationBuilder().forDatabase(ObserveTestConfiguration.getTestPropertyAsString(ObserveTestConfiguration.PG_URL),//"jdbc:postgresql://localhost:5432/observe_9",

-                                                          ObserveTestConfiguration.getTestPropertyAsString(ObserveTestConfiguration.PG_LOGIN),//"obstuna-referentiel",

-                                                          ObserveTestConfiguration.getTestPropertyAsString(ObserveTestConfiguration.PG_PASSWORD)//";;dm8-referentiel.."

+        return new JdbcConfigurationBuilder().forDatabase(ObserveTestConfiguration.getTestPropertyAsString(ObserveTestConfiguration.PG_URL),

+                                                          ObserveTestConfiguration.getTestPropertyAsString(ObserveTestConfiguration.PG_LOGIN),

+                                                          ObserveTestConfiguration.getTestPropertyAsString(ObserveTestConfiguration.PG_PASSWORD)

         );

     }

 

     public static void injectCredentials() {

 

         Path credentialPath = Path.of(ObserveTestConfiguration.getTestPropertyAsString(ToolkitFixtures.TEST_CREDENTIALS_KEY));

+        Assume.assumeTrue("Skip, no credential file found", Files.exists(credentialPath));

         ToolkitFixtures.injectCredentials(credentialPath,

                                           ObserveTestConfiguration.PG_URL,

                                           ObserveTestConfiguration.PG_LOGIN,

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe

Commits:

5 changed files:

Changes: