verwijder deprecated API calls in test klassen

B3Partners · Nov 12, 2019 · 884eca5 · 884eca5
1 parent 74ca6ae
commit 884eca5
Show file tree

Hide file tree

Showing 27 changed files with 36 additions and 51 deletions.
diff --git a/.gitignore b/.gitignore
@@ -14,6 +14,7 @@
 
 /datamodel/referentiedata/*.zip
 /datamodel/referentiedata/*.qg*
+/TOP*.zip
 
 # maven release procedure files
 **/pom.xml.tag

diff --git a/brmo-loader/src/test/java/nl/b3p/Art37aIntegrationTest.java b/brmo-loader/src/test/java/nl/b3p/Art37aIntegrationTest.java
@@ -122,7 +122,7 @@ public void setUp() throws Exception {
     public void cleanup() throws Exception {
         brmo.closeBrmoFramework();
 
-        CleanUtil.cleanSTAGING(staging);
+        CleanUtil.cleanSTAGING(staging, false);
         staging.close();
 
         CleanUtil.cleanRSGB_BRK(rsgb, true);

diff --git a/brmo-loader/src/test/java/nl/b3p/BAGXMLToStagingIntegrationTest.java b/brmo-loader/src/test/java/nl/b3p/BAGXMLToStagingIntegrationTest.java
@@ -121,7 +121,7 @@ public void setUp() throws Exception {
     @After
     public void cleanup() throws Exception {
         brmo.closeBrmoFramework();
-        CleanUtil.cleanSTAGING(staging);
+        CleanUtil.cleanSTAGING(staging, false);
         staging.close();
         sequential.unlock();
     }

diff --git a/brmo-loader/src/test/java/nl/b3p/BRKLocatiebeschrijvingIntegrationTest.java b/brmo-loader/src/test/java/nl/b3p/BRKLocatiebeschrijvingIntegrationTest.java
@@ -145,7 +145,7 @@ public void setUp() throws Exception {
     public void cleanup() throws Exception {
         brmo.closeBrmoFramework();
 
-        CleanUtil.cleanSTAGING(staging);
+        CleanUtil.cleanSTAGING(staging, false);
         staging.close();
 
         CleanUtil.cleanRSGB_BRK(rsgb, true);

diff --git a/brmo-loader/src/test/java/nl/b3p/BerichtenFilterSqlIntegrationTest.java b/brmo-loader/src/test/java/nl/b3p/BerichtenFilterSqlIntegrationTest.java
@@ -8,6 +8,7 @@
 import nl.b3p.brmo.loader.entity.Bericht;
 import nl.b3p.brmo.loader.BrmoFramework;
 import nl.b3p.brmo.loader.util.BrmoException;
+import nl.b3p.brmo.test.util.database.dbunit.CleanUtil;
 import nl.b3p.loader.jdbc.OracleConnectionUnwrapper;
 import org.apache.commons.dbcp.BasicDataSource;
 import org.dbunit.database.DatabaseConfig;
@@ -97,10 +98,7 @@ public void setUp() throws Exception {
     @After
     public void cleanup() throws Exception {
         brmo.closeBrmoFramework();
-        DatabaseOperation.DELETE_ALL.execute(staging, new DefaultDataSet(new DefaultTable[]{
-            new DefaultTable("laadproces"),
-            new DefaultTable("bericht")
-        }));
+        CleanUtil.cleanSTAGING(staging, false);
         staging.close();
 
         sequential.unlock();

diff --git a/brmo-loader/src/test/java/nl/b3p/BrkToStagingToRsgbIntegrationTest.java b/brmo-loader/src/test/java/nl/b3p/BrkToStagingToRsgbIntegrationTest.java
@@ -153,7 +153,7 @@ public void setUp() throws Exception {
     public void cleanup() throws Exception {
         brmo.closeBrmoFramework();
 
-        CleanUtil.cleanSTAGING(staging);
+        CleanUtil.cleanSTAGING(staging, false);
         staging.close();
 
         CleanUtil.cleanRSGB_BRK(rsgb, true);

diff --git a/brmo-loader/src/test/java/nl/b3p/GBAVXMLToStagingIntegrationTest.java b/brmo-loader/src/test/java/nl/b3p/GBAVXMLToStagingIntegrationTest.java
@@ -188,7 +188,7 @@ public void setUp() throws Exception {
     @After
     public void cleanup() throws Exception {
         brmo.closeBrmoFramework();
-        CleanUtil.cleanSTAGING(staging);
+        CleanUtil.cleanSTAGING(staging, false);
         CleanUtil.cleanRSGB_BAG(rsgb, true);
         CleanUtil.cleanRSGB_BRP(rsgb);
         staging.close();

diff --git a/brmo-loader/src/test/java/nl/b3p/GH527NhrToStagingToRsgbIntegrationTest.java b/brmo-loader/src/test/java/nl/b3p/GH527NhrToStagingToRsgbIntegrationTest.java
@@ -108,7 +108,7 @@ public void setUp() throws Exception {
     public void cleanup() throws Exception {
         brmo.closeBrmoFramework();
 
-        CleanUtil.cleanSTAGING(staging);
+        CleanUtil.cleanSTAGING(staging, false);
         staging.close();
 
         CleanUtil.cleanRSGB_NHR(rsgb);
@@ -151,6 +151,7 @@ public void testNhrXMLToStagingToRsgb() throws Exception {
 
     private void checkWaarde(String tabelNaam, String kolom) throws DataSetException, SQLException {
         ITable tabel = rsgb.createDataSet().getTable(tabelNaam);
+        LOG.info("check " + tabelNaam + ":" + kolom);
         for (int i = 0; i < tabel.getRowCount(); i++) {
             assertFalse("kolom " + kolom + " van tabel " + tabelNaam + " bevat quote", tabel.getValue(i, kolom).toString().contains("'"));
         }

diff --git a/brmo-loader/src/test/java/nl/b3p/Mantis10315IntegrationTest.java b/brmo-loader/src/test/java/nl/b3p/Mantis10315IntegrationTest.java
@@ -113,7 +113,7 @@ public void cleanup() throws Exception {
         CleanUtil.cleanRSGB_BRK(rsgb, true);
         rsgb.close();
 
-        CleanUtil.cleanSTAGING(staging);
+        CleanUtil.cleanSTAGING(staging, false);
         staging.close();
 
         sequential.unlock();

diff --git a/brmo-loader/src/test/java/nl/b3p/Mantis10547IntegrationTest.java b/brmo-loader/src/test/java/nl/b3p/Mantis10547IntegrationTest.java
@@ -159,9 +159,7 @@ public void cleanup() throws Exception {
         CleanUtil.cleanRSGB_BRK(rsgb, true);
         rsgb.close();
 
-        DatabaseOperation.DELETE_ALL.execute(staging, new DefaultDataSet(new DefaultTable[]{
-            new DefaultTable("job")}
-        ));
+        CleanUtil.cleanSTAGING(staging, false);
         staging.close();
 
         try {

diff --git a/brmo-loader/src/test/java/nl/b3p/Mantis11180IntegrationTest.java b/brmo-loader/src/test/java/nl/b3p/Mantis11180IntegrationTest.java
@@ -112,7 +112,7 @@ public void cleanup() throws Exception {
         CleanUtil.cleanRSGB_BRK(rsgb, true);
         rsgb.close();
 
-        CleanUtil.cleanSTAGING(staging);
+        CleanUtil.cleanSTAGING(staging, false);
         staging.close();
 
         sequential.unlock();

diff --git a/brmo-loader/src/test/java/nl/b3p/Mantis6098IntegrationTest.java b/brmo-loader/src/test/java/nl/b3p/Mantis6098IntegrationTest.java
@@ -114,12 +114,10 @@ public void setUp() throws Exception {
     public void cleanup() throws Exception {
         brmo.closeBrmoFramework();
 
-        CleanUtil.cleanRSGB(rsgb);
+        CleanUtil.cleanRSGB_BRK(rsgb, true);
         rsgb.close();
 
-        DatabaseOperation.DELETE_ALL.execute(staging, new DefaultDataSet(new DefaultTable[]{
-            new DefaultTable("job")}
-        ));
+        CleanUtil.cleanSTAGING(staging, false);
         staging.close();
 
         sequential.unlock();

diff --git a/brmo-loader/src/test/java/nl/b3p/Mantis6166IntegrationTest.java b/brmo-loader/src/test/java/nl/b3p/Mantis6166IntegrationTest.java
@@ -157,14 +157,11 @@ public void cleanup() throws Exception {
             // in geval van niet waar gemaakte assumptions
             brmo.closeBrmoFramework();
         }
-        assumeTrue("Deze test werkt niet met de jTDS driver omdat die geen JtdsPreparedStatement#setNull() methode heeft.", !this.isMsSQL);
 
-        CleanUtil.cleanRSGB(rsgb);
+        CleanUtil.cleanRSGB_BRK(rsgb,true);
         rsgb.close();
 
-        DatabaseOperation.DELETE_ALL.execute(staging, new DefaultDataSet(new DefaultTable[]{
-            new DefaultTable("job")}
-        ));
+        CleanUtil.cleanSTAGING(staging, false);
         staging.close();
 
         try {

diff --git a/brmo-loader/src/test/java/nl/b3p/Mantis6235IntegrationTest.java b/brmo-loader/src/test/java/nl/b3p/Mantis6235IntegrationTest.java
@@ -113,7 +113,7 @@ public void cleanup() throws Exception {
         brmo.closeBrmoFramework();
 
         CleanUtil.cleanRSGB_BRK(rsgb, true);
-        CleanUtil.cleanSTAGING(staging);
+        CleanUtil.cleanSTAGING(staging, false);
         rsgb.close();
         staging.close();
 

diff --git a/brmo-loader/src/test/java/nl/b3p/Mantis6380IntegrationTest.java b/brmo-loader/src/test/java/nl/b3p/Mantis6380IntegrationTest.java
@@ -115,7 +115,7 @@ public void cleanup() throws Exception {
         CleanUtil.cleanRSGB_BRK(rsgb, true);
         rsgb.close();
 
-        CleanUtil.cleanSTAGING(staging);
+        CleanUtil.cleanSTAGING(staging, false);
         staging.close();
 
         sequential.unlock();

diff --git a/brmo-loader/src/test/java/nl/b3p/NhrToStagingToRsgbIntegrationTest.java b/brmo-loader/src/test/java/nl/b3p/NhrToStagingToRsgbIntegrationTest.java
@@ -216,7 +216,7 @@ public void setUp() throws Exception {
     public void cleanup() throws Exception {
         brmo.closeBrmoFramework();
 
-        CleanUtil.cleanSTAGING(staging);
+        CleanUtil.cleanSTAGING(staging, false);
         staging.close();
 
         CleanUtil.cleanRSGB_NHR(rsgb);

diff --git a/brmo-loader/src/test/java/nl/b3p/Oracle8000byteBugIntegrationTest.java b/brmo-loader/src/test/java/nl/b3p/Oracle8000byteBugIntegrationTest.java
@@ -168,10 +168,7 @@ public void cleanup() throws Exception {
         }
 
         if (staging != null) {
-            CleanUtil.cleanSTAGING(staging);
-            DatabaseOperation.DELETE_ALL.execute(staging, new DefaultDataSet(new DefaultTable[]{
-                new DefaultTable("job")}
-            ));
+            CleanUtil.cleanSTAGING(staging, false);
             staging.close();
         }
 

diff --git a/brmo-loader/src/test/java/nl/b3p/TopNLIntegrationTest.java b/brmo-loader/src/test/java/nl/b3p/TopNLIntegrationTest.java
@@ -179,7 +179,7 @@ public void setUp() throws Exception {
     public void cleanup() throws Exception {
         brmo.closeBrmoFramework();
 
-        CleanUtil.cleanSTAGING(staging);
+        CleanUtil.cleanSTAGING(staging, false);
         staging.close();
 
         topnl.close();

diff --git a/brmo-loader/src/test/java/nl/b3p/VerminderenStukdelenIntegrationTest.java b/brmo-loader/src/test/java/nl/b3p/VerminderenStukdelenIntegrationTest.java
@@ -116,7 +116,7 @@ public void setUp() throws Exception {
     public void cleanup() throws Exception {
         brmo.closeBrmoFramework();
 
-        CleanUtil.cleanSTAGING(staging);
+        CleanUtil.cleanSTAGING(staging, false);
         staging.close();
 
         CleanUtil.cleanRSGB_BRK(rsgb, true);

diff --git a/brmo-loader/src/test/java/nl/b3p/ZakRechtArchiefIntegrationTest.java b/brmo-loader/src/test/java/nl/b3p/ZakRechtArchiefIntegrationTest.java
@@ -114,7 +114,7 @@ public void cleanup() throws Exception {
         CleanUtil.cleanRSGB_BRK(rsgb, true);
         rsgb.close();
 
-        CleanUtil.cleanSTAGING(staging);
+        CleanUtil.cleanSTAGING(staging, false);
         staging.close();
 
         sequential.unlock();

diff --git a/brmo-loader/src/test/java/nl/b3p/brmo/loader/entity/BagBerichtIntegrationTest.java b/brmo-loader/src/test/java/nl/b3p/brmo/loader/entity/BagBerichtIntegrationTest.java
@@ -153,7 +153,7 @@ public void setUp() throws Exception {
     public void cleanup() throws Exception {
         brmo.closeBrmoFramework();
 
-        CleanUtil.cleanSTAGING(staging);
+        CleanUtil.cleanSTAGING(staging, false);
         staging.close();
 
         CleanUtil.cleanRSGB_BAG(rsgb, true);

diff --git a/brmo-loader/src/test/java/nl/b3p/brmo/loader/jdbc/ContraintViolationIntegrationTest.java b/brmo-loader/src/test/java/nl/b3p/brmo/loader/jdbc/ContraintViolationIntegrationTest.java
@@ -122,10 +122,7 @@ public void cleanup() throws Exception {
         }
 
         if (staging != null) {
-            CleanUtil.cleanSTAGING(staging);
-            DatabaseOperation.DELETE_ALL.execute(staging, new DefaultDataSet(new DefaultTable[]{
-                new DefaultTable("job")}
-            ));
+            CleanUtil.cleanSTAGING(staging, false);
             staging.close();
         }
 

diff --git a/...t/java/nl/b3p/brmo/service/stripes/AdvancedFunctionsActionBeanCleanupIntegrationTest.java b/...t/java/nl/b3p/brmo/service/stripes/AdvancedFunctionsActionBeanCleanupIntegrationTest.java
@@ -131,7 +131,7 @@ public void setUp() throws Exception {
         } else {
             fail("Geen ondersteunde database aangegegeven");
         }
-        setupJNDI(dsRsgb, dsStaging);
+        setupJNDI(dsRsgb, dsStaging, null, null);
 
         FlatXmlDataSetBuilder fxdb = new FlatXmlDataSetBuilder();
         fxdb.setCaseSensitiveTableNames(false);
@@ -160,10 +160,8 @@ public void cleanup() throws Exception {
         }
 
         if (staging != null) {
-        CleanUtil.cleanSTAGING(staging);
-        if (staging != null) {
+            CleanUtil.cleanSTAGING(staging, true);
             staging.close();
-            }
         }
         try {
             sequential.unlock();

diff --git a/...src/test/java/nl/b3p/brmo/service/stripes/AdvancedFunctionsActionBeanIntegrationTest.java b/...src/test/java/nl/b3p/brmo/service/stripes/AdvancedFunctionsActionBeanIntegrationTest.java
@@ -146,7 +146,7 @@ public void setUp() throws Exception {
         } else {
             fail("Geen ondersteunde database aangegegeven");
         }
-        setupJNDI(dsRsgb, dsStaging);
+        setupJNDI(dsRsgb, dsStaging, null, null);
 
         FlatXmlDataSetBuilder fxdb = new FlatXmlDataSetBuilder();
         fxdb.setCaseSensitiveTableNames(false);
@@ -182,7 +182,7 @@ public void cleanup() throws Exception {
             rsgb.close();
         }
         if (staging != null) {
-            CleanUtil.cleanSTAGING(staging);
+            CleanUtil.cleanSTAGING(staging, true);
             staging.close();
         }
 

diff --git a/.../brmo/service/stripes/AdvancedFunctionsAfterAddingBeginDateActionBeanIntegrationTest.java b/.../brmo/service/stripes/AdvancedFunctionsAfterAddingBeginDateActionBeanIntegrationTest.java
@@ -149,7 +149,7 @@ public void setUp() throws Exception {
         } else {
             fail("Geen ondersteunde database aangegegeven");
         }
-        setupJNDI(dsRsgb, dsStaging);
+        setupJNDI(dsRsgb, dsStaging, null, null);
 
         FlatXmlDataSetBuilder fxdb = new FlatXmlDataSetBuilder();
         fxdb.setCaseSensitiveTableNames(false);
@@ -185,7 +185,7 @@ public void cleanup() throws Exception {
             rsgb.close();
         }
         if (staging != null) {
-            CleanUtil.cleanSTAGING(staging);
+            CleanUtil.cleanSTAGING(staging, true);
             staging.close();
         }
 

diff --git a/...vice/src/test/java/nl/b3p/brmo/service/stripes/BRKComfortAdresUpdatesIntegrationTest.java b/...vice/src/test/java/nl/b3p/brmo/service/stripes/BRKComfortAdresUpdatesIntegrationTest.java
@@ -130,7 +130,7 @@ public void setUp() throws Exception {
         staging.getConfig().setProperty(DatabaseConfig.FEATURE_ALLOW_EMPTY_FIELDS, true);
         rsgb.getConfig().setProperty(DatabaseConfig.FEATURE_ALLOW_EMPTY_FIELDS, true);
 
-        setupJNDI(dsRsgb, dsStaging);
+        setupJNDI(dsRsgb, dsStaging, null, null);
 
         FlatXmlDataSetBuilder fxdb = new FlatXmlDataSetBuilder();
         fxdb.setCaseSensitiveTableNames(false);
@@ -166,7 +166,7 @@ public void cleanup() throws Exception {
             rsgb.close();
         }
         if (staging != null) {
-            CleanUtil.cleanSTAGING(staging);
+            CleanUtil.cleanSTAGING(staging, true);
             staging.close();
         }
 

diff --git a/...ce/src/test/java/nl/b3p/brmo/service/stripes/UpdateBeginDatumZakRechtIntegrationTest.java b/...ce/src/test/java/nl/b3p/brmo/service/stripes/UpdateBeginDatumZakRechtIntegrationTest.java
@@ -124,7 +124,7 @@ public void setUp() throws Exception {
 
         staging.getConfig().setProperty(DatabaseConfig.FEATURE_ALLOW_EMPTY_FIELDS, true);
         rsgb.getConfig().setProperty(DatabaseConfig.FEATURE_ALLOW_EMPTY_FIELDS, true);
-        setupJNDI(dsRsgb, dsStaging);
+        setupJNDI(dsRsgb, dsStaging, null, null);
 
         FlatXmlDataSetBuilder fxdb = new FlatXmlDataSetBuilder();
         fxdb.setCaseSensitiveTableNames(false);
@@ -161,7 +161,7 @@ public void cleanup() throws Exception {
             rsgb.close();
         }
         if (staging != null) {
-            CleanUtil.cleanSTAGING(staging);
+            CleanUtil.cleanSTAGING(staging, true);
             staging.close();
         }