Skip to content

Commit

Permalink
feat: better test mechanics for wsimport
Browse files Browse the repository at this point in the history
  • Loading branch information
@Nolife999
Nolife999 committed Dec 6, 2023
1 parent f4621af commit 53e347c
Show file tree
Hide file tree
Showing 7 changed files with 196 additions and 207 deletions.
22 changes: 22 additions & 0 deletions arc-ws/src/test/java/fr/insee/arc/ws/services/importServlet/ExpectedResults.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package fr.insee.arc.ws.services.importServlet;

import java.util.Arrays;
import java.util.List;

import fr.insee.arc.ws.services.importServlet.bo.RetrievedTable;

public class ExpectedResults {


public static final List<RetrievedTable> EXPECTED_RETRIEVED_TABLES = Arrays.asList(
new RetrievedTable("ws_info", 1, "ARTEMIS")
,new RetrievedTable("mapping_dsn_test1_ok", 2, "file1_to_retrieve.xml")
,new RetrievedTable("mod_table_metier", 1, "DSN")
,new RetrievedTable("mod_variable_metier", 1, "DSN")
,new RetrievedTable("nmcl_table1", 1, "data1")
,new RetrievedTable("nmcl_table2", 1, "data2")
,new RetrievedTable("ext_mod_famille", 1, "DSN")
,new RetrievedTable("ext_mod_periodicite", 1, "1")
);

}
52 changes: 52 additions & 0 deletions arc-ws/src/test/java/fr/insee/arc/ws/services/importServlet/ImportOKNoScalabilityTest.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
package fr.insee.arc.ws.services.importServlet;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;

import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import java.nio.charset.StandardCharsets;
import java.sql.SQLException;
import java.util.zip.GZIPInputStream;

import org.apache.commons.io.IOUtils;
import org.json.JSONObject;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;

import fr.insee.arc.core.dataobjects.ArcPreparedStatementBuilder;
import fr.insee.arc.utils.dao.UtilitaireDao;
import fr.insee.arc.utils.exception.ArcException;
import fr.insee.arc.utils.query.InitializeQueryTest;
import fr.insee.arc.utils.utils.ManipString;
import fr.insee.arc.ws.services.importServlet.bo.ExecuteStep;
import fr.insee.arc.ws.services.importServlet.dao.InitializeTestDataNoScalability;

public class ImportOKNoScalabilityTest {

@BeforeClass
public static void setup() throws SQLException, ArcException {
InitializeTestDataNoScalability.destroyTestData();
InitializeTestDataNoScalability.initializeTestData(true);
}

@AfterClass
public static void tearDown() throws SQLException, ArcException {
InitializeTestDataNoScalability.destroyTestData();
}

@Test(expected = ArcException.class)
public void testExecuteFamilyNotValid() throws ArcException, UnsupportedEncodingException {
RunImport.testExecuteFamilyNotValid();
}

@Test
public void testExecute() throws ArcException, IOException {
RunImport.testExecute();
}

}
158 changes: 11 additions & 147 deletions arc-ws/src/test/java/fr/insee/arc/ws/services/importServlet/ImportOKScalabilityTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
import java.io.UnsupportedEncodingException;
import java.nio.charset.StandardCharsets;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
import java.util.zip.GZIPInputStream;

import org.apache.commons.io.IOUtils;
Expand All @@ -22,8 +24,10 @@
import fr.insee.arc.utils.dao.UtilitaireDao;
import fr.insee.arc.utils.exception.ArcException;
import fr.insee.arc.utils.query.InitializeQueryTest;
import fr.insee.arc.utils.structure.GenericBean;
import fr.insee.arc.utils.utils.ManipString;
import fr.insee.arc.ws.services.importServlet.bo.ExecuteStep;
import fr.insee.arc.ws.services.importServlet.bo.RetrievedTable;
import fr.insee.arc.ws.services.importServlet.dao.InitializeTestDataScalability;

public class ImportOKScalabilityTest {
Expand All @@ -39,155 +43,15 @@ public static void tearDown() throws SQLException, ArcException {
InitializeTestDataScalability.destroyTestData();
}

@Test
public void testExecute() throws ArcException, IOException {

// parameters sent by client for step 1
JSONObject clientJsonInputStep1 = new JSONObject(
"{\"familleNorme\":\"DSN\",\"periodicite\":\"M\",\"service\":\"arcClient\",\"validiteSup\":\"2032-03-01\",\"format\":\"csv_gzip\",\"reprise\":false,\"client\":\"ARTEMIS\",\"environnement\":\"arc_bas1\"}");

// response token will be used by client to invoke step2
String arcResponseStep1 = ExecuteStep.executeImportStep1(clientJsonInputStep1);

testCreateAndDropWsPending();
testCreateTableNmcl();
testCreateTableVarMetier();
testCreateTableTableMetier();
testCreateTableTableFamille();
testCreateTableTablePeriodicite();

// test ws Iteration
testWsIteration(arcResponseStep1);

// test that client had been marked in pilotage
testClientMarkedInPilotage();

@Test(expected = ArcException.class)
public void testExecuteFamilyNotValid() throws ArcException, UnsupportedEncodingException {
RunImport.testExecuteFamilyNotValid();
}

private void testClientMarkedInPilotage() throws ArcException {
ArcPreparedStatementBuilder query = new ArcPreparedStatementBuilder();

query.append("SELECT client[1] as client from arc_bas1.pilotage_fichier where id_source = 'file_to_retrieve.xml';");

String clientMarkedInPilotage = UtilitaireDao.get(0).getString(null, query);

assertEquals("ARTEMIS", clientMarkedInPilotage);

// "ws_info", "mapping_dsn_test1_ok", "mod_table_metier", "mod_variable_metier", "nmcl_table1", "nmcl_table2", "ext_mod_famille", "ext_mod_periodicite"

}

/**
* iterate through webservice call until the end
* test the first table to be retrieved
* @param arcResponseStep1
* @throws IOException
* @throws ArcException
*/
private void testWsIteration(String arcResponseStep1) throws IOException, ArcException {
boolean sortie = false;
boolean first = true;

do {
String arcResponseStep2 = invokeStep2(arcResponseStep1);
// arcResponse2 return table,ame and DDL of the table
// tablename is the first token from the arcResponse2
String tableBucket = ManipString.substringBeforeFirst(arcResponseStep2, " ");

sortie = tableBucket.equals("");

if (sortie)
{
break;
}

ByteArrayOutputStream arcResponseStep3 = invokeStep3(tableBucket);
String outputStep3 = "";

try (InputStream is = new ByteArrayInputStream(arcResponseStep3.toByteArray());
GZIPInputStream zis = new GZIPInputStream(is);) {
outputStep3 = IOUtils.toString(zis, StandardCharsets.UTF_8);
}

if (first) {
// ws info must be the first table to be retrieved
assertEquals(arcResponseStep1 + "_ws_info client text, timestamp text", arcResponseStep2);
// first info in the csv table of ws_info is client name
assertEquals("ARTEMIS", ManipString.substringBeforeFirst(outputStep3, ";"));
}

first=false;

} while (!sortie);

}

private ByteArrayOutputStream invokeStep3(String tableResponseStep2)
throws UnsupportedEncodingException, ArcException {
JSONObject clientJsonInputStep3 = new JSONObject(
"{\"familleNorme\":\"DSN\",\"periodicite\":\"M\",\"service\":\"tableName\",\"validiteSup\":\"2032-03-01\",\"format\":\"csv_gzip\",\"reprise\":false,\"client\":\""
+ tableResponseStep2
+ "\",\"environnement\":\"arc_bas1\",\"type\":\"jsonwsp/request\"}");
return ExecuteStep.executeImportStep3(clientJsonInputStep3);
}

private String invokeStep2(String arcResponseStep1) throws UnsupportedEncodingException, ArcException {
// parameters sent by client for step 2
// it use response token provided as response of step1
JSONObject clientJsonInputStep2 = new JSONObject(
"{\"familleNorme\":\"DSN\",\"periodicite\":\"M\",\"service\":\"tableName\",\"validiteSup\":\"2032-03-01\",\"format\":\"csv_gzip\",\"reprise\":false,\"client\":\""
+ arcResponseStep1 + "\",\"environnement\":\"arc_bas1\",\"type\":\"jsonwsp/request\"}");

return ExecuteStep.executeImportStep2(clientJsonInputStep2);
}

private void testCreateAndDropWsPending() throws ArcException {

// check that the parallel thread that create tables drop the table ws_pending

// it should be done in less than 50 iteration, test data is very little
int maxIteration = 50;
int i = 0;

while (i < maxIteration
&& UtilitaireDao.get(0).isTableExiste(InitializeQueryTest.c, "arc_bas1.ARTEMIS_%_ws_pending")) {
i++;
UtilitaireDao.get(0).executeImmediate(InitializeQueryTest.c, "SELECT pg_sleep(1);");
}

assertTrue(i > 0);
assertTrue(i < maxIteration);
}

private void testCreateTableNmcl() throws ArcException {
// table image created should be like
// arc_bas1.ARTEMIS_timestamp_<tablename_to_retrieve>
assertTrue(UtilitaireDao.get(0).isTableExiste(InitializeQueryTest.c, "arc_bas1.ARTEMIS_%_nmcl_table1"));
assertTrue(UtilitaireDao.get(0).isTableExiste(InitializeQueryTest.c, "arc_bas1.ARTEMIS_%_nmcl_table2"));
}

private void testCreateTableVarMetier() throws ArcException {
// table image created should be like
// arc_bas1.ARTEMIS_timestamp_<tablename_to_retrieve>
assertTrue(UtilitaireDao.get(0).isTableExiste(InitializeQueryTest.c, "arc_bas1.ARTEMIS_%_mod_variable_metier"));
}

private void testCreateTableTableMetier() throws ArcException {
// table image created should be like
// arc_bas1.ARTEMIS_timestamp_<tablename_to_retrieve>
assertTrue(UtilitaireDao.get(0).isTableExiste(InitializeQueryTest.c, "arc_bas1.ARTEMIS_%_mod_table_metier"));
}

private void testCreateTableTableFamille() throws ArcException {
// table image created should be like
// arc_bas1.ARTEMIS_timestamp_<tablename_to_retrieve>
assertTrue(UtilitaireDao.get(0).isTableExiste(InitializeQueryTest.c, "arc_bas1.ARTEMIS_%_ext_mod_famille"));
}

private void testCreateTableTablePeriodicite() throws ArcException {
// table image created should be like
// arc_bas1.ARTEMIS_timestamp_<tablename_to_retrieve>
assertTrue(UtilitaireDao.get(0).isTableExiste(InitializeQueryTest.c, "arc_bas1.ARTEMIS_%_ext_mod_periodicite"));
@Test
public void testExecute() throws ArcException, IOException {
RunImport.testExecute();
}


}
Loading

0 comments on commit 53e347c

Please sign in to comment.