From 8385ac70b9ccb43538c349705657d026a72628f7 Mon Sep 17 00:00:00 2001 From: Mark Prins Date: Thu, 27 Dec 2018 15:53:34 +0100 Subject: [PATCH 01/32] voeg een logfile viewer to voor de brmo-stufbg204 module --- brmo-stufbg204/src/main/webapp/logs.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/brmo-stufbg204/src/main/webapp/logs.jsp b/brmo-stufbg204/src/main/webapp/logs.jsp index d10d45b0fa..789738e128 100644 --- a/brmo-stufbg204/src/main/webapp/logs.jsp +++ b/brmo-stufbg204/src/main/webapp/logs.jsp @@ -27,4 +27,4 @@ 

<%=line%>

- \ No newline at end of file + From fb9e257c45b7abd2e0e7c8e42effce674c20fb81 Mon Sep 17 00:00:00 2001 From: Mark Prins Date: Thu, 27 Dec 2018 16:00:07 +0100 Subject: [PATCH 02/32] herstel debug logging en gebruik een switch ipv if voor mutatiesoort. voeg docu toe --- .../brmo-stufbg204-soapui-project.xml | 32 +++---- .../b3p/brmo/stufbg204/StUFBGasynchroon.java | 94 ++++++++++++++++--- 2 files changed, 95 insertions(+), 31 deletions(-) diff --git a/brmo-stufbg204/brmo-stufbg204-soapui-project.xml b/brmo-stufbg204/brmo-stufbg204-soapui-project.xml index d67660bf45..83263e66a2 100644 --- a/brmo-stufbg204/brmo-stufbg204-soapui-project.xml +++ b/brmo-stufbg204/brmo-stufbg204-soapui-project.xml @@ -1,5 +1,5 @@ - + @@ -30,7 +30,7 @@ -]]>http://localhost:8084/brmo-stufbg204/StUFBGAsynchroon?wsdl +]]>http://localhost:8037/brmo-stufbg204/StUFBGAsynchroon?wsdl Dit document definieert de webservices voor het sectormodel basisgegevens. Dit document gaat uit van twee webservices: @@ -49,8 +49,8 @@ Wijzigingen vergeleken met 020401: - soapAction gevuld met namespaceUri sectormodel BG0204 gevolgd door '/' en de operation name. - - + + @@ -160,15 +160,15 @@ Omdat de uit te wisselen berichten volledig gedefinieerd zijn in het sectormodel Het beantwoorden van een vraag kan veel meer resources vergen en dient op een andere wijze getuned te kunnen worden, dan het opslaan van een inkomend bericht. In het endpoint dient de url nog correct te worden ingevuld. - + - + -]]>http://schemas.xmlsoap.org/wsdl/http://localhost:8084/brmo-stufbg204/StUFBGAsynchroon?xsd=2 +]]>http://schemas.xmlsoap.org/wsdl/http://localhost:8037/brmo-stufbg204/StUFBGAsynchroon?xsd=2 Schema met de in StUF gebruikte elementen en attributen @@ -576,11 +576,11 @@ In het endpoint dient de url nog correct te worden ingevuld. -]]>http://www.w3.org/2001/XMLSchemahttp://localhost:8084/brmo-stufbg204/StUFBGAsynchroon?xsd=1 +]]>http://www.w3.org/2001/XMLSchemahttp://localhost:8037/brmo-stufbg204/StUFBGAsynchroon?xsd=1 - + Wijzigingen vergeleken met versie bg020411: - ERR0182: In R02-, R03- en R04-tabel op het element ingangsdatum nillable="true" gezet. @@ -6287,7 +6287,7 @@ Sortering 02: deelgemeentenaam -]]>http://www.w3.org/2001/XMLSchemahttp://example.com/StUFBGAsynchroonhttp://localhost:8037/brmo-stufbg204/StUFBGAsynchroonhttp://localhost:8084/brmo-stufbg204/StUFBGAsynchroon<xml-fragment/>UTF-8http://localhost:8084/brmo-stufbg204/StUFBGAsynchroon +]]>http://www.w3.org/2001/XMLSchemahttp://example.com/StUFBGAsynchroonhttp://localhost:8037/brmo-stufbg204/StUFBGAsynchroonhttp://localhost:8037/brmo-stufbg204/StUFBGAsynchroon<xml-fragment/>UTF-8http://localhost:8037/brmo-stufbg204/StUFBGAsynchroon @@ -43845,7 +43845,7 @@ Sortering 02: deelgemeentenaam -]]>No AuthorizationUTF-8http://localhost:8084/brmo-stufbg204/StUFBGAsynchroon +]]>No AuthorizationUTF-8http://localhost:8037/brmo-stufbg204/StUFBGAsynchroon @@ -56851,7 +56851,7 @@ Sortering 02: deelgemeentenaam -]]><xml-fragment/>UTF-8http://localhost:8084/brmo-stufbg204/StUFBGAsynchroon +]]><xml-fragment/>UTF-8http://localhost:8037/brmo-stufbg204/StUFBGAsynchroon @@ -56923,7 +56923,7 @@ Sortering 02: deelgemeentenaam -]]>No Authorization<xml-fragment/>UTF-8http://localhost:8084/brmo-stufbg204/StUFBGAsynchroon +]]>No Authorization<xml-fragment/>UTF-8http://localhost:8037/brmo-stufbg204/StUFBGAsynchroon @@ -60962,7 +60962,7 @@ Sortering 02: deelgemeentenaam -]]>No Authorization<xml-fragment/>UTF-8http://localhost:8084/brmo-stufbg204/StUFBGAsynchroon +]]>No Authorization<xml-fragment/>UTF-8http://localhost:8037/brmo-stufbg204/StUFBGAsynchroon @@ -61367,7 +61367,7 @@ Sortering 02: deelgemeentenaam -]]>No Authorizationhttp://localhost:8084/brmo-stufbg204/StUFBGSynchroon?wsdl +]]>No Authorizationhttp://localhost:8084/brmo-stufbg204/StUFBGSynchroon?wsdl Dit document definieert de webservices voor het sectormodel basisgegevens. Dit document gaat uit van twee webservices: @@ -197599,4 +197599,4 @@ Sortering 02: deelgemeentenaam -]]>No Authorization \ No newline at end of file +]]>No Authorizationhttp://localhost:8037/brmo-stufbg204/StUFBGAsynchroon \ No newline at end of file diff --git a/brmo-stufbg204/src/main/java/nl/b3p/brmo/stufbg204/StUFBGasynchroon.java b/brmo-stufbg204/src/main/java/nl/b3p/brmo/stufbg204/StUFBGasynchroon.java index 7ddafb51ea..ca822731a5 100644 --- a/brmo-stufbg204/src/main/java/nl/b3p/brmo/stufbg204/StUFBGasynchroon.java +++ b/brmo-stufbg204/src/main/java/nl/b3p/brmo/stufbg204/StUFBGasynchroon.java @@ -4,6 +4,7 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; +import java.text.ParseException; import java.util.AbstractMap.SimpleEntry; import java.util.ArrayList; import java.util.Date; @@ -63,16 +64,15 @@ public class StUFBGasynchroon { private static final Log LOG = LogFactory.getLog(StUFBGasynchroon.class); public BevestigingsBericht ontvangAsynchroneVraag(VraagBericht vraag) { - // LOG.debug("Er is vraag ontvangen van soort: " + vraag.getStuurgegevens().getBerichtsoort()); - + LOG.debug("Er is een vraag ontvangen van soort: " + vraag.getStuurgegevens().getBerichtsoort()); BevestigingsBericht b = new BevestigingsBericht(); b.setStuurgegevens(StUFbg204Util.maakStuurgegevens(vraag.getStuurgegevens())); + return b; } public BevestigingsBericht ontvangAsynchroonAntwoord(AsynchroonAntwoordBericht asynchroonAntwoord) { - // LOG.debug("Er is antwoord ontvangen van soort: " + asynchroonAntwoord.getStuurgegevens().getBerichtsoort()); - + LOG.debug("Er is een antwoord ontvangen van soort: " + asynchroonAntwoord.getStuurgegevens().getBerichtsoort()); BevestigingsBericht b = new BevestigingsBericht(); b.setStuurgegevens(StUFbg204Util.maakStuurgegevens(asynchroonAntwoord.getStuurgegevens())); @@ -80,20 +80,84 @@ public BevestigingsBericht ontvangAsynchroonAntwoord(AsynchroonAntwoordBericht a } public BevestigingsBericht ontvangFout(FoutBericht fout) { - // LOG.debug("Er is fout ontvangen van soort: " + fout.getStuurgegevens().getBerichtsoort()); - + LOG.debug("Er is een fout ontvangen van soort: " + fout.getStuurgegevens().getBerichtsoort()); BevestigingsBericht b = new BevestigingsBericht(); b.setStuurgegevens(StUFbg204Util.maakStuurgegevens(fout.getStuurgegevens())); return b; } + /** + * + * 4.2 Stuurgegevens voor kennisgevingberichten. In paragraaf 2.3 zijn vier + * varianten binnen een kennisgevingbericht onderkend: + * + *

Toevoeging

+ * Bij een toevoeging is in het zendende systeem een occurrence toegevoegd, + * omdat is vastgesteld dat in de werkelijkheid een voor het zendende + * systeem relevant object bestaat. + * + *

Wijziging

+ * Bij een wijziging is in het zendende systeem een occurrence gewijzigd, + * omdat is vastgesteld dat er in de werkelijkheid eigenschappen (gegevens) + * zijn veranderd van het object waar naar die occurrence verwijst. + * + *

Verwijdering

+ * Bij een verwijdering is in het zendende systeem een occurrence + * verwijderd, omdat is vastgesteld dat in de werkelijkheid het object + * waarnaar de occurrence verwijst, niet meer bestaat of niet meer relevant + * is voor het zendende systeem. + * + *

Correctie

+ * Bij een correctie is in het zendende systeem een occurrence gewijzigd, + * omdat is vastgesteld dat de vastgelegde waarden niet correct waren. Bij + * een correctie is het object in de werkelijkheid waarnaar de occurrence + * verwijst, zelf niet gewijzigd. Deze verschillende varianten worden als + * volgt gecodeerd in het stuurgegeven mutatiesoort: + *
    + *
  • ‘T’: Toevoeging + *
  • ‘W’: Wijziging + *
  • ‘V’: Verwijdering + *
  • ‘C’: Correctie + *
+ * Het is aan het ontvangende systeem om te interpreteren in hoeverre een + * kennisgeving relevant is en of de kennisgeving het gevolg is van het + * ontstaan of verdwijnen van een object c.q. van het relevant worden of + * niet meer relevant zijn van het object voor het zendende systeem. Het + * kennisgevingbericht bevat geen aanduiding van de gebeurtenis die + * aanleiding gaf tot de wijziging van de gegevens (zie paragraaf 2.3). + * + *
+ * Naast de mutatiesoort is in een kennisgevingbericht ook relevant hoe het + * ontvangende systeem geacht wordt te reageren op het bericht. Een + * kennisgevingbericht kan puur informatief bedoeld zijn: het ontvangende + * systeem mag zelf beslissen of de kennisgeving al dan niet wordt verwerkt + * in de eigen gegevens. Daarnaast kan het verplicht zijn voor het + * ontvangende systeem om de gegevens over te nemen. Of een + * kennisgevingbericht informatief is of verplicht over te nemen geeft het + * stuurgegeven indicator overname aan met 'I' (informatief) respectievelijk + * 'V' (verplicht). Aanvullende afspraken over de omgang met deze rubriek + * kunnen worden vastgelegd in het sectormodel. + * + * @param kennisgeving te verwerken kennisgevingsbericht + * @return een bevestiging van de kennisgeving + */ public BevestigingsBericht ontvangKennisgeving(KennisgevingsBericht kennisgeving) { - // LOG.debug("Er is kennisgeving ontvangen van soort: " + kennisgeving.getStuurgegevens().getBerichtsoort()); + LOG.debug("Er is een kennisgeving ontvangen van soort: " + kennisgeving.getStuurgegevens().getBerichtsoort() + + " en mutatiesoort " + kennisgeving.getStuurgegevens().getKennisgeving().getMutatiesoort()); BevestigingsBericht b = new BevestigingsBericht(); b.setStuurgegevens(StUFbg204Util.maakStuurgegevens(kennisgeving.getStuurgegevens())); - if(kennisgeving.getStuurgegevens().getKennisgeving().getMutatiesoort().equals(Mutatiesoort.T)){ - saveBericht(kennisgeving, kennisgeving.getStuurgegevens().getTijdstipBericht()); + + switch (kennisgeving.getStuurgegevens().getKennisgeving().getMutatiesoort()) { + case T: + saveBericht(kennisgeving, kennisgeving.getStuurgegevens().getTijdstipBericht()); + break; + case W: + case V: + case C: + default: + LOG.warn("Onbekende mutatiesoort wordt niet verwerkt."); + break; } return b; } @@ -107,11 +171,11 @@ private void saveBericht(Object body, String datum) { Date d = StUFbg204Util.sdf.parse(datum); String name = "Upload op " + StUFbg204Util.sdf.format(new Date()); - brmo.loadFromStream(BrmoFramework.BR_BRP, in, name, d); + brmo.loadFromStream(BrmoFramework.BR_BRP, in, name, d, null); brmo.closeBrmoFramework(); } catch (BrmoException ex) { LOG.error("Cannot create BRMO Framework:", ex); - } catch (Exception ex) { + } catch (JAXBException | ParseException ex) { LOG.error("Cannot get datasource:", ex); } @@ -130,9 +194,9 @@ private InputStream getXml(Object o) throws JAXBException { DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); factory.setNamespaceAware(true); DocumentBuilder builder = factory.newDocumentBuilder(); - + Document doc = builder.parse(in); - List> prefixes = new ArrayList<>(); + List> prefixes = new ArrayList<>(); getPrefixesRecursive(doc.getDocumentElement(), prefixes); //haal de body eruit met xpath XPathFactory xPathfactory = XPathFactory.newInstance(); @@ -162,7 +226,7 @@ private InputStream getXml(Object o) throws JAXBException { private static final String XMLNAMESPACE = "xmlns"; - public static void getPrefixesRecursive(Element element, List> prefixes) { + public static void getPrefixesRecursive(Element element, List> prefixes) { getPrefixes(element, prefixes); Node parent = element.getParentNode(); if (parent instanceof Element) { @@ -177,7 +241,7 @@ public static void getPrefixesRecursive(Element element, List> prefixes) { + public static void getPrefixes(Element element, List> prefixes) { NamedNodeMap atts = element.getAttributes(); for (int i = 0; i < atts.getLength(); i++) { Node node = atts.item(i); From 20a0fd53169abf5a98efa5a46ff5b958f195d250 Mon Sep 17 00:00:00 2001 From: Mark Prins Date: Thu, 27 Dec 2018 16:18:44 +0100 Subject: [PATCH 03/32] maak integratie test met tomcat mogelijk --- brmo-stufbg204/pom.xml | 220 ++++++++++++++++++ .../src/main/resources/log4j.properties | 5 +- brmo-stufbg204/src/test/resources/log4j.xml | 18 ++ 3 files changed, 241 insertions(+), 2 deletions(-) diff --git a/brmo-stufbg204/pom.xml b/brmo-stufbg204/pom.xml index cefbeb35e3..16a9375874 100644 --- a/brmo-stufbg204/pom.xml +++ b/brmo-stufbg204/pom.xml @@ -197,7 +197,80 @@ + + ${project.basedir}/src/test/resources/postgres.properties + + + + ${project.basedir}/src/test/tomcatconf/ + true + + + ${project.basedir}/src/test/resources/ + + + + org.codehaus.mojo + properties-maven-plugin + + + ${project.basedir}/src/test/resources/postgres.properties + ${project.basedir}/src/test/resources/local.postgres.properties + + true + + + + initialize + + read-project-properties + + + + + + org.apache.tomcat.maven + tomcat7-maven-plugin + + 9090 + + ${project.build.directory}/test-classes/testcontext.xml + + + + tomcat-run + + run-war-only + + pre-integration-test + + true + ${maven.test.skip} + + + + tomcat-shutdown + + shutdown + + post-integration-test + + ${maven.test.skip} + true + + + + + + org.postgresql + postgresql + ${postgresql.jdbc.version} + + + maven-failsafe-plugin @@ -223,7 +296,80 @@ + + ${project.basedir}/src/test/resources/oracle.properties + + + + ${project.basedir}/src/test/tomcatconf/ + true + + + ${project.basedir}/src/test/resources/ + + + + org.codehaus.mojo + properties-maven-plugin + + + ${project.basedir}/src/test/resources/oracle.properties + ${project.basedir}/src/test/resources/local.oracle.properties + + true + + + + initialize + + read-project-properties + + + + + + org.apache.tomcat.maven + tomcat7-maven-plugin + + 9090 + + ${project.build.directory}/test-classes/testcontext.oracle.xml + + + + tomcat-run + + run-war-only + + pre-integration-test + + true + ${maven.test.skip} + + + + tomcat-shutdown + + shutdown + + post-integration-test + + ${maven.test.skip} + true + + + + + + ${oracle.jdbc.groupId} + ${oracle.jdbc.artifactId} + ${oracle.jdbc.version} + + + maven-failsafe-plugin @@ -249,7 +395,81 @@ + + ${project.basedir}/src/test/resources/sqlserver.properties + + + + ${project.basedir}/src/test/tomcatconf/ + true + + + ${project.basedir}/src/test/resources/ + true + + + + org.codehaus.mojo + properties-maven-plugin + + + ${project.basedir}/src/test/resources/sqlserver.properties + ${project.basedir}/src/test/resources/local.sqlserver.properties + + true + + + + initialize + + read-project-properties + + + + + + org.apache.tomcat.maven + tomcat7-maven-plugin + + 9090 + + ${project.build.directory}/test-classes/testcontext.xml + + + + tomcat-run + + run-war-only + + pre-integration-test + + true + ${maven.test.skip} + + + + tomcat-shutdown + + shutdown + + post-integration-test + + ${maven.test.skip} + true + + + + + + net.sourceforge.jtds + jtds + ${sqlserver.jtds.version} + + + maven-failsafe-plugin diff --git a/brmo-stufbg204/src/main/resources/log4j.properties b/brmo-stufbg204/src/main/resources/log4j.properties index 474c6f66bb..6360f0cad4 100644 --- a/brmo-stufbg204/src/main/resources/log4j.properties +++ b/brmo-stufbg204/src/main/resources/log4j.properties @@ -3,8 +3,9 @@ logFile=brmo-stufbg204-service.log # Gebruik TRACE om SQL statements van de SOAP requests te loggen log4j.rootLogger=INFO,file -log4j.logger.nl.b3p=TRACE -log4j.logger.nl.b3p.brmo.soap.util.LogMessageHandler=ERROR +log4j.logger.nl.b3p=INFO +log4j.logger.nl.b3p.brmo.soap.util.LogMessageHandler=INFO +log4j.logger.nl.b3p.web.jsp=INFO log4j.appender.file=org.apache.log4j.RollingFileAppender log4j.appender.file.file=${logFilePath}/${logFile} diff --git a/brmo-stufbg204/src/test/resources/log4j.xml b/brmo-stufbg204/src/test/resources/log4j.xml index c2a1fe88ed..c73efe3004 100644 --- a/brmo-stufbg204/src/test/resources/log4j.xml +++ b/brmo-stufbg204/src/test/resources/log4j.xml @@ -7,6 +7,14 @@ + + + + + + + + @@ -31,8 +39,18 @@ + + + + + + + + + + From 7310d567c4093c0c6f0a4622581e409695e94c7a Mon Sep 17 00:00:00 2001 From: Mark Prins Date: Thu, 27 Dec 2018 18:34:54 +0100 Subject: [PATCH 04/32] stufbg204 mutatie integratie test deze test zou moeten falen, maar doet dat niet want het soort bericht wordt aangenomen en verder genegeerd zie: #587 --- ...erwerkHuwelijksMutatieIntegrationTest.java | 142 ++++++++++++++++++ .../nl/b3p/brmo/stufbg204/WebTestStub.java | 76 ++++++++++ .../OpnemenHuwelijkScenario/StUF_request.xml | 108 +++++++++++++ .../OpnemenHuwelijkScenario/StUF_response.xml | 30 ++++ brmo-stufbg204/src/test/resources/log4j.xml | 5 +- .../test/tomcatconf/testcontext.oracle.xml | 75 +++++++++ .../src/test/tomcatconf/testcontext.xml | 87 +++++++++++ 7 files changed, 522 insertions(+), 1 deletion(-) create mode 100644 brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/VerwerkHuwelijksMutatieIntegrationTest.java create mode 100644 brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/WebTestStub.java create mode 100644 brmo-stufbg204/src/test/resources/OpnemenHuwelijkScenario/StUF_request.xml create mode 100644 brmo-stufbg204/src/test/resources/OpnemenHuwelijkScenario/StUF_response.xml create mode 100644 brmo-stufbg204/src/test/tomcatconf/testcontext.oracle.xml create mode 100644 brmo-stufbg204/src/test/tomcatconf/testcontext.xml diff --git a/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/VerwerkHuwelijksMutatieIntegrationTest.java b/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/VerwerkHuwelijksMutatieIntegrationTest.java new file mode 100644 index 0000000000..4caf6356c0 --- /dev/null +++ b/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/VerwerkHuwelijksMutatieIntegrationTest.java @@ -0,0 +1,142 @@ +/* + * Copyright (C) 2018 B3Partners B.V. + */ +package nl.b3p.brmo.stufbg204; + +import java.io.IOException; +import java.sql.SQLException; +import java.text.ParseException; +import java.util.concurrent.locks.Lock; +import java.util.concurrent.locks.ReentrantLock; +import nl.b3p.brmo.loader.BrmoFramework; +import nl.b3p.brmo.loader.util.BrmoException; +import nl.b3p.brmo.stufbg204.util.StUFbg204Util; +import nl.b3p.brmo.test.util.database.dbunit.CleanUtil; +import org.apache.commons.dbcp.BasicDataSource; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.http.HttpStatus; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.client.protocol.HttpClientContext; +import org.apache.http.entity.ContentType; +import org.apache.http.entity.InputStreamEntity; +import org.dbunit.DatabaseUnitException; +import org.dbunit.database.DatabaseDataSourceConnection; +import org.dbunit.database.IDatabaseConnection; +import org.dbunit.dataset.DataSetException; +import org.dbunit.dataset.ITable; +import static org.hamcrest.CoreMatchers.equalTo; + +import org.junit.After; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertTrue; +import org.junit.Before; +import org.junit.Test; +import static org.junit.Assume.assumeNotNull; +import static org.junit.Assume.assumeTrue; + +/** + * Deze testcase verwerkt een soap bericht uit een bestand als kennisgeving. Het + * bestand bevat een HuwelijksMutatie welke naar de stufbg204 async service + * wordt gepost, hierna wordt in de staging gechecked voor laadproces en bericht + * en wordt na trasformatie in de rsgb gechecked. + * @code mvn -Dit.test=VerwerkHuwelijksMutatieIntegrationTest -Dtest.onlyITs=true verify -Ppostgresql > target/postgresql.log} + * + * @author Mark Prins + */ +public class VerwerkHuwelijksMutatieIntegrationTest extends WebTestStub { + + private static final Log LOG = LogFactory.getLog(VerwerkHuwelijksMutatieIntegrationTest.class); + private IDatabaseConnection staging; + private IDatabaseConnection rsgb; + private final Lock sequential = new ReentrantLock(); + private BrmoFramework brmo; + + @Before + @Override + public void setUp() throws SQLException, BrmoException, DatabaseUnitException { + BasicDataSource dsStaging = new BasicDataSource(); + dsStaging.setUrl(DBPROPS.getProperty("staging.url")); + dsStaging.setUsername(DBPROPS.getProperty("staging.username")); + dsStaging.setPassword(DBPROPS.getProperty("staging.password")); + dsStaging.setAccessToUnderlyingConnectionAllowed(true); + + BasicDataSource dsRsgb = new BasicDataSource(); + dsRsgb.setUrl(DBPROPS.getProperty("rsgb.url")); + dsRsgb.setUsername(DBPROPS.getProperty("rsgb.username")); + dsRsgb.setPassword(DBPROPS.getProperty("rsgb.password")); + dsRsgb.setAccessToUnderlyingConnectionAllowed(true); + + setupJNDI(dsRsgb, dsStaging); + + brmo = new BrmoFramework(dsStaging, dsRsgb, null); + staging = new DatabaseDataSourceConnection(dsStaging); + rsgb = new DatabaseDataSourceConnection(dsRsgb); + + sequential.lock(); + CleanUtil.cleanSTAGING(staging); + CleanUtil.cleanRSGB_BRP(rsgb); + } + + @After + public void cleanup() throws Exception { + brmo.closeBrmoFramework(); +// CleanUtil.cleanSTAGING(staging); +// CleanUtil.cleanRSGB_BRP(rsgb); + staging.close(); + rsgb.close(); + sequential.unlock(); + } + + @Test + public void testBericht() throws IOException, DataSetException, SQLException, BrmoException, InterruptedException, ParseException { + InputStreamEntity reqEntity = new InputStreamEntity( + VerwerkHuwelijksMutatieIntegrationTest.class.getResourceAsStream("/OpnemenHuwelijkScenario/StUF_request.xml"), + -1, + ContentType.create("text/xml", "utf-8") + ); + reqEntity.setChunked(true); + HttpPost httppost = new HttpPost(BASE_TEST_URL + "StUFBGAsynchroon"); + httppost.setEntity(reqEntity); + // httppost.addHeader("SOAPAction", "ontvangKennisgeving"); + + LOG.debug("SOAP request uitvoeren: " + httppost.getRequestLine()); + + // set-up preemptive auth voor request en stuur bericht + CloseableHttpResponse response = client.execute(target, httppost, localContext); + + assertThat("Response status is OK.", response.getStatusLine().getStatusCode(), + equalTo(HttpStatus.SC_OK)); + + // check staging database inhoud + assertTrue("Er zijn anders dan 1 STAGING_OK laadprocessen", 1l <= brmo.getCountLaadProcessen(null, null, BrmoFramework.BR_BRP, "STAGING_OK")); + + ITable laadproces = staging.createDataSet().getTable("laadproces"); + assertEquals("datum klopt niet", /* StUFbg204Util.sdf.parse("201812211418450000") */ "2018-12-21 14:18:45.0", laadproces.getValue(0, "bestand_datum").toString()); + + assertTrue("Er zijn anders dan 1 STAGING_OK berichten", 1l <= brmo.getCountBerichten(null, null, BrmoFramework.BR_BRP, "STAGING_OK")); + ITable bericht = staging.createDataSet().getTable("bericht"); + assertEquals("object ref klopt niet", "df2e41b72f8a3421ef575617fc247a77018a573f", bericht.getValue(0, "object_ref")); + assertEquals("datum klopt niet", "2018-12-21 14:18:45.0", bericht.getValue(0, "datum").toString()); + + // transformeren van bericht en check rsgb database inhoud + Thread t = brmo.toRsgb(); + t.join(); + + ITable subject = rsgb.createDataSet().getTable("subject"); + assertTrue("Aantal rijen klopt niet", subject.getRowCount() == 1); + assertEquals("naam niet als verwacht", "J de Cuykelaer", subject.getValue(0, "naam")); + + ITable nat_prs = rsgb.createDataSet().getTable("nat_prs"); + assertTrue("Aantal rijen klopt niet", nat_prs.getRowCount() == 1); + assertEquals("geslacht niet als verwacht", "M", nat_prs.getValue(1, "geslachtsaand")); + assertEquals("geslachtsnaam niet als verwacht", "Cuykelaer", nat_prs.getValue(0, "nm_geslachtsnaam")); + + ITable ingeschr_nat_prs = rsgb.createDataSet().getTable("ingeschr_nat_prs"); + assertTrue("Aantal rijen klopt niet", ingeschr_nat_prs.getRowCount() == 1); + assertEquals("a nummer niet als verwacht", "9173658014", ingeschr_nat_prs.getValue(0, "a_nummer")); + assertEquals("bsn nummer niet als verwacht", "301571818", ingeschr_nat_prs.getValue(0, "bsn")); + } +} diff --git a/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/WebTestStub.java b/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/WebTestStub.java new file mode 100644 index 0000000000..96fccc19e2 --- /dev/null +++ b/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/WebTestStub.java @@ -0,0 +1,76 @@ +package nl.b3p.brmo.stufbg204; + +import java.io.IOException; +import org.apache.http.HttpHost; +import org.apache.http.auth.AuthScope; +import org.apache.http.auth.UsernamePasswordCredentials; +import org.apache.http.client.AuthCache; +import org.apache.http.client.CredentialsProvider; +import org.apache.http.client.protocol.HttpClientContext; +import org.apache.http.impl.auth.BasicScheme; +import org.apache.http.impl.client.BasicAuthCache; +import org.apache.http.impl.client.BasicCookieStore; +import org.apache.http.impl.client.BasicCredentialsProvider; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClients; +import org.apache.http.impl.client.LaxRedirectStrategy; +import org.junit.AfterClass; +import org.junit.BeforeClass; + +/** + * Integratie test utility klasse om online integratie tests te bouwen welke + * tegen een brmo-stufbg204 kunnen worden uitgevoerd. + * + * @author Mark Prins + */ +public abstract class WebTestStub extends TestStub { + + public static final int HTTP_PORT = 9090; + /** + * the server root url. {@value} + */ + public static final String BASE_TEST_URL = "http://localhost:" + HTTP_PORT + "/brmo-stufbg204/"; + + /** + * onze test client. + */ + protected static CloseableHttpClient client; + protected static HttpHost target; + protected static HttpClientContext localContext; + + /** + * initialize http client. + */ + @BeforeClass + public static void setUpClass() { + target = new HttpHost("localhost", HTTP_PORT, "http"); + AuthCache authCache = new BasicAuthCache(); + authCache.put(target, new BasicScheme()); + + localContext = HttpClientContext.create(); + localContext.setAuthCache(authCache); + + CredentialsProvider credsProvider = new BasicCredentialsProvider(); + credsProvider.setCredentials( + new AuthScope(target.getHostName(), target.getPort()), + new UsernamePasswordCredentials("brmo", "brmo")); + + client = HttpClients.custom() + .useSystemProperties() + .setUserAgent("brmo integration test") + .setRedirectStrategy(new LaxRedirectStrategy()) + .setDefaultCookieStore(new BasicCookieStore()) + .setDefaultCredentialsProvider(credsProvider) + .build(); + } + + /** + * close http client connections. + * + * @throws IOException if any occurs closing the http connection + */ + @AfterClass + public static void tearDownClass() throws IOException { + client.close(); + } +} diff --git a/brmo-stufbg204/src/test/resources/OpnemenHuwelijkScenario/StUF_request.xml b/brmo-stufbg204/src/test/resources/OpnemenHuwelijkScenario/StUF_request.xml new file mode 100644 index 0000000000..78abf8e565 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/OpnemenHuwelijkScenario/StUF_request.xml @@ -0,0 +1,108 @@ + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 2018000005FF + 2018122114184500 + + W + I + 2018122114184500 + + + + + 9173658014 + 301571818 + Jan + J + de + Cuykelaer + 19671210 + M + + + 19920228 + + + + 2727FM + + Thorbeckegracht + 73 + + + + + + 1802 + + + + + + 9173658014 + 301571818 + Jan + J + de + Cuykelaer + 19671210 + M + + + 19920228 + + + + 2727FM + + Thorbeckegracht + 73 + + + + + + 1802 + + + + 20110526 + + 20110526 + + + + + + + + + Tupolev + + + + + + + + + diff --git a/brmo-stufbg204/src/test/resources/OpnemenHuwelijkScenario/StUF_response.xml b/brmo-stufbg204/src/test/resources/OpnemenHuwelijkScenario/StUF_response.xml new file mode 100644 index 0000000000..061fc0bfad --- /dev/null +++ b/brmo-stufbg204/src/test/resources/OpnemenHuwelijkScenario/StUF_response.xml @@ -0,0 +1,30 @@ + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + B3Partners B.V. + BRMO + + + DeDommel + B3Partners + + 2018000005FF + 201812210141847988 + + W + I + 2018122114184500 + + + + + diff --git a/brmo-stufbg204/src/test/resources/log4j.xml b/brmo-stufbg204/src/test/resources/log4j.xml index c73efe3004..34c1d86852 100644 --- a/brmo-stufbg204/src/test/resources/log4j.xml +++ b/brmo-stufbg204/src/test/resources/log4j.xml @@ -39,11 +39,14 @@ + + + - + diff --git a/brmo-stufbg204/src/test/tomcatconf/testcontext.oracle.xml b/brmo-stufbg204/src/test/tomcatconf/testcontext.oracle.xml new file mode 100644 index 0000000000..6bb8bc4a34 --- /dev/null +++ b/brmo-stufbg204/src/test/tomcatconf/testcontext.oracle.xml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + diff --git a/brmo-stufbg204/src/test/tomcatconf/testcontext.xml b/brmo-stufbg204/src/test/tomcatconf/testcontext.xml new file mode 100644 index 0000000000..4b15f2c5fc --- /dev/null +++ b/brmo-stufbg204/src/test/tomcatconf/testcontext.xml @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + From 1eaaaecfb5419d3b96c3c2ff36ec217fa7fb29bc Mon Sep 17 00:00:00 2001 From: Mark Prins Date: Thu, 27 Dec 2018 18:39:48 +0100 Subject: [PATCH 05/32] verwijder een k uit het SimpleDateFormat masker close #590 --- .../src/main/java/nl/b3p/brmo/stufbg204/util/StUFbg204Util.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/brmo-stufbg204/src/main/java/nl/b3p/brmo/stufbg204/util/StUFbg204Util.java b/brmo-stufbg204/src/main/java/nl/b3p/brmo/stufbg204/util/StUFbg204Util.java index 71bf070c21..51edf10004 100644 --- a/brmo-stufbg204/src/main/java/nl/b3p/brmo/stufbg204/util/StUFbg204Util.java +++ b/brmo-stufbg204/src/main/java/nl/b3p/brmo/stufbg204/util/StUFbg204Util.java @@ -18,7 +18,7 @@ */ public final class StUFbg204Util { - public static final SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddkkkmmssSSS"); + public static final SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddkkmmssSSS"); private static JAXBContext jaxbContext; private StUFbg204Util() { From 0e1dd9b1ce32e9ebac4b7199da905b6ccafb3a54 Mon Sep 17 00:00:00 2001 From: Mark Prins Date: Fri, 28 Dec 2018 10:52:27 +0100 Subject: [PATCH 06/32] gebruik INGESCHREVEN NATUURLIJK PERSOON voor de persoon uit het bericht, dit is geen comfort data. close #589 --- brmo-loader/src/main/resources/xsl/brp-to-rsgb-xml.xsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/brmo-loader/src/main/resources/xsl/brp-to-rsgb-xml.xsl b/brmo-loader/src/main/resources/xsl/brp-to-rsgb-xml.xsl index 643282d642..aac0ac8b91 100644 --- a/brmo-loader/src/main/resources/xsl/brp-to-rsgb-xml.xsl +++ b/brmo-loader/src/main/resources/xsl/brp-to-rsgb-xml.xsl @@ -35,7 +35,7 @@ - NATUURLIJK PERSOON + INGESCHREVEN NATUURLIJK PERSOON From c2ae7df600d5a5cee00c2a857a2d8d09f13ed2a5 Mon Sep 17 00:00:00 2001 From: Mark Prins Date: Fri, 28 Dec 2018 11:08:18 +0100 Subject: [PATCH 07/32] update javadoc en foutmeldingen --- .../nl/b3p/brmo/stufbg204/StUFBGasynchroon.java | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/brmo-stufbg204/src/main/java/nl/b3p/brmo/stufbg204/StUFBGasynchroon.java b/brmo-stufbg204/src/main/java/nl/b3p/brmo/stufbg204/StUFBGasynchroon.java index ca822731a5..2e93e8e060 100644 --- a/brmo-stufbg204/src/main/java/nl/b3p/brmo/stufbg204/StUFBGasynchroon.java +++ b/brmo-stufbg204/src/main/java/nl/b3p/brmo/stufbg204/StUFBGasynchroon.java @@ -34,11 +34,9 @@ import nl.b3p.brmo.stufbg204.util.StUFbg204Util; import nl.egem.stuf.sector.bg._0204.AsynchroonAntwoordBericht; import nl.egem.stuf.sector.bg._0204.KennisgevingsBericht; -import nl.egem.stuf.sector.bg._0204.StUFFout; import nl.egem.stuf.sector.bg._0204.VraagBericht; import nl.egem.stuf.stuf0204.BevestigingsBericht; import nl.egem.stuf.stuf0204.FoutBericht; -import nl.egem.stuf.stuf0204.Mutatiesoort; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.w3c.dom.Document; @@ -169,14 +167,14 @@ private void saveBericht(Object body, String datum) { InputStream in = getXml(body); Date d = StUFbg204Util.sdf.parse(datum); - String name = "Upload op " + StUFbg204Util.sdf.format(new Date()); + String bestand_naam = "StUF-BG upload op " + StUFbg204Util.sdf.format(new Date()); - brmo.loadFromStream(BrmoFramework.BR_BRP, in, name, d, null); + brmo.loadFromStream(BrmoFramework.BR_BRP, in, bestand_naam, d, null); brmo.closeBrmoFramework(); } catch (BrmoException ex) { - LOG.error("Cannot create BRMO Framework:", ex); + LOG.error("Fout tijdens laden van StUF-BG bericht", ex); } catch (JAXBException | ParseException ex) { - LOG.error("Cannot get datasource:", ex); + LOG.error("Fout tijdens parsen van bericht", ex); } } @@ -237,9 +235,8 @@ public static void getPrefixesRecursive(Element element, List> prefixes) { NamedNodeMap atts = element.getAttributes(); From 276f54d53455269ae66d0adbe8c567524aa49a1e Mon Sep 17 00:00:00 2001 From: Mark Prins Date: Fri, 28 Dec 2018 17:00:10 +0100 Subject: [PATCH 08/32] wip --- .../src/main/java/nl/b3p/brmo/stufbg204/StUFBGasynchroon.java | 3 +++ .../brmo/stufbg204/VerwerkHuwelijksMutatieIntegrationTest.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/brmo-stufbg204/src/main/java/nl/b3p/brmo/stufbg204/StUFBGasynchroon.java b/brmo-stufbg204/src/main/java/nl/b3p/brmo/stufbg204/StUFBGasynchroon.java index 2e93e8e060..41a390eab2 100644 --- a/brmo-stufbg204/src/main/java/nl/b3p/brmo/stufbg204/StUFBGasynchroon.java +++ b/brmo-stufbg204/src/main/java/nl/b3p/brmo/stufbg204/StUFBGasynchroon.java @@ -151,6 +151,9 @@ public BevestigingsBericht ontvangKennisgeving(KennisgevingsBericht kennisgeving saveBericht(kennisgeving, kennisgeving.getStuurgegevens().getTijdstipBericht()); break; case W: + // dit werkt -nog- niet omdat dit 2 PRS nodes bevat, een was en een wordt... + saveBericht(kennisgeving, kennisgeving.getStuurgegevens().getKennisgeving().getTijdstipMutatie()); + break; case V: case C: default: diff --git a/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/VerwerkHuwelijksMutatieIntegrationTest.java b/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/VerwerkHuwelijksMutatieIntegrationTest.java index 4caf6356c0..1e3d05631f 100644 --- a/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/VerwerkHuwelijksMutatieIntegrationTest.java +++ b/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/VerwerkHuwelijksMutatieIntegrationTest.java @@ -41,7 +41,7 @@ * Deze testcase verwerkt een soap bericht uit een bestand als kennisgeving. Het * bestand bevat een HuwelijksMutatie welke naar de stufbg204 async service * wordt gepost, hierna wordt in de staging gechecked voor laadproces en bericht - * en wordt na trasformatie in de rsgb gechecked. + * en wordt na trasnformatie in de rsgb gechecked. * @code mvn -Dit.test=VerwerkHuwelijksMutatieIntegrationTest -Dtest.onlyITs=true verify -Ppostgresql > target/postgresql.log} * * @author Mark Prins From 40c192f0123aef23a3af3df8dd748560dd7a555e Mon Sep 17 00:00:00 2001 From: Mark Prins Date: Thu, 14 Feb 2019 12:28:27 +0100 Subject: [PATCH 09/32] meer -geanonimiseerde- stufbg204 test berichten --- .../src/test/resources/testdata-tnt/README.md | 3 + .../stuf-bg_201900000028.anon.xml | 158 ++++++++++++++ .../stuf-bg_201900000029.anon.xml | 161 ++++++++++++++ .../stuf-bg_20190000002A.anon.xml | 127 +++++++++++ .../stuf-bg_20190000002B.anon.xml | 127 +++++++++++ .../stuf-bg_20190000002C.anon.xml | 121 +++++++++++ .../stuf-bg_20190000002D.anon.xml | 168 +++++++++++++++ .../stuf-bg_20190000002E.anon.xml | 125 +++++++++++ .../stuf-bg_20190000002F.anon.xml | 124 +++++++++++ .../stuf-bg_201900000030.anon.xml | 116 +++++++++++ .../stuf-bg_201900000031.anon.xml | 126 +++++++++++ .../stuf-bg_201900000032.anon.xml | 127 +++++++++++ .../stuf-bg_201900000033.anon.xml | 164 +++++++++++++++ .../stuf-bg_201900000034.anon.xml | 124 +++++++++++ .../stuf-bg_201900000035.anon.xml | 124 +++++++++++ .../stuf-bg_201900000036.anon.xml | 124 +++++++++++ .../stuf-bg_201900000037.anon.xml | 127 +++++++++++ .../stuf-bg_201900000038.anon.xml | 164 +++++++++++++++ .../stuf-bg_201900000039.anon.xml | 121 +++++++++++ .../stuf-bg_20190000003A.anon.xml | 127 +++++++++++ .../stuf-bg_20190000003B.anon.xml | 164 +++++++++++++++ .../stuf-bg_20190000003C.anon.xml | 164 +++++++++++++++ .../stuf-bg_20190000003D.anon.xml | 197 ++++++++++++++++++ .../stuf-bg_20190000003E.anon.xml | 197 ++++++++++++++++++ .../stuf-bg_20190000003F.anon.xml | 127 +++++++++++ .../stuf-bg_201900000040.anon.xml | 127 +++++++++++ .../stuf-bg_201900000041.anon.xml | 125 +++++++++++ .../stuf-bg_201900000042.anon.xml | 122 +++++++++++ .../stuf-bg_201900000043.anon.xml | 122 +++++++++++ .../stuf-bg_201900000044.anon.xml | 122 +++++++++++ .../stuf-bg_201900000045.anon.xml | 192 +++++++++++++++++ .../stuf-bg_201900000046.anon.xml | 191 +++++++++++++++++ .../stuf-bg_201900000047.anon.xml | 197 ++++++++++++++++++ .../stuf-bg_201900000048.anon.xml | 140 +++++++++++++ .../stuf-bg_201900000049.anon.xml | 124 +++++++++++ .../stuf-bg_20190000004A.anon.xml | 119 +++++++++++ .../stuf-bg_20190000004B.anon.xml | 126 +++++++++++ .../stuf-bg_20190000004C.anon.xml | 124 +++++++++++ .../stuf-bg_20190000004D.anon.xml | 124 +++++++++++ .../stuf-bg_20190000004E.anon.xml | 124 +++++++++++ .../stuf-bg_20190000004F.anon.xml | 197 ++++++++++++++++++ .../stuf-bg_201900000050.anon.xml | 140 +++++++++++++ .../stuf-bg_201900000051.anon.xml | 140 +++++++++++++ .../stuf-bg_201900000000.anon.xml | 124 +++++++++++ .../stuf-bg_201900000001.anon.xml | 116 +++++++++++ .../stuf-bg_201900000002.anon.xml | 80 +++++++ .../stuf-bg_201900000003.anon.xml | 80 +++++++ .../stuf-bg_201900000004.anon.xml | 80 +++++++ .../stuf-bg_201900000005.anon.xml | 113 ++++++++++ .../stuf-bg_201900000006.anon.xml | 74 +++++++ .../stuf-bg_201900000007.anon.xml | 110 ++++++++++ .../stuf-bg_201900000008.anon.xml | 115 ++++++++++ .../stuf-bg_201900000009.anon.xml | 83 ++++++++ .../stuf-bg_20190000000A.anon.xml | 80 +++++++ .../stuf-bg_20190000000B.anon.xml | 113 ++++++++++ .../stuf-bg_20190000000C.anon.xml | 80 +++++++ .../stuf-bg_20190000000D.anon.xml | 80 +++++++ .../stuf-bg_20190000000E.anon.xml | 112 ++++++++++ .../stuf-bg_20190000000F.anon.xml | 80 +++++++ .../stuf-bg_201900000010.anon.xml | 80 +++++++ .../stuf-bg_201900000011.anon.xml | 115 ++++++++++ .../stuf-bg_201900000012.anon.xml | 115 ++++++++++ .../stuf-bg_201900000013.anon.xml | 80 +++++++ .../stuf-bg_201900000014.anon.xml | 80 +++++++ .../stuf-bg_201900000015.anon.xml | 80 +++++++ .../stuf-bg_201900000016.anon.xml | 119 +++++++++++ .../stuf-bg_201900000017.anon.xml | 83 ++++++++ .../stuf-bg_201900000018.anon.xml | 80 +++++++ .../stuf-bg_201900000019.anon.xml | 144 +++++++++++++ .../stuf-bg_20190000001A.anon.xml | 118 +++++++++++ .../stuf-bg_20190000001B.anon.xml | 80 +++++++ .../stuf-bg_20190000001C.anon.xml | 80 +++++++ .../stuf-bg_20190000001D.anon.xml | 74 +++++++ .../stuf-bg_20190000001E.anon.xml | 83 ++++++++ .../stuf-bg_20190000001F.anon.xml | 123 +++++++++++ .../stuf-bg_201900000020.anon.xml | 117 +++++++++++ .../stuf-bg_201900000021.anon.xml | 80 +++++++ .../stuf-bg_201900000022.anon.xml | 115 ++++++++++ .../stuf-bg_201900000023.anon.xml | 80 +++++++ .../stuf-bg_201900000024.anon.xml | 110 ++++++++++ .../stuf-bg_201900000025.anon.xml | 77 +++++++ .../stuf-bg_201900000026.anon.xml | 119 +++++++++++ .../stuf-bg_201900000027.anon.xml | 80 +++++++ 83 files changed, 9795 insertions(+) create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/README.md create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_201900000028.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_201900000029.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_20190000002A.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_20190000002B.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_20190000002C.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_20190000002D.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_20190000002E.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_20190000002F.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_201900000030.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000031.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000032.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000033.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000034.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000035.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000036.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000037.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000038.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000039.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_20190000003A.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_20190000003B.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_20190000003C.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_20190000003D.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_20190000003E.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_20190000003F.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_201900000040.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_201900000041.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_201900000042.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_201900000043.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_201900000044.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_201900000045.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_201900000046.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_201900000047.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_201900000048.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_201900000049.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_20190000004A.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_20190000004B.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_20190000004C.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_20190000004D.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_20190000004E.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_20190000004F.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_201900000050.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_201900000051.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000000.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000001.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000002.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000003.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000004.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000005.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000006.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000007.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000008.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000009.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000000A.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000000B.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000000C.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000000D.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000000E.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000000F.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000010.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000011.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000012.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000013.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000014.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000015.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000016.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000017.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000018.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000019.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000001A.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000001B.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000001C.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000001D.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000001E.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000001F.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000020.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000021.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000022.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000023.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000024.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000025.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000026.anon.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000027.anon.xml diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/README.md b/brmo-stufbg204/src/test/resources/testdata-tnt/README.md new file mode 100644 index 0000000000..eb3d273c43 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/README.md @@ -0,0 +1,3 @@ +Alle berichten zijn door onze anonimizer heen gefietst, daardoor is het mogelijk dat voorletters niet meer overeenkomen met voornamen en dat een begindatum soms na een einddatum ligt. + +De vulberichten zijn `T` berichten diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_201900000028.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_201900000028.anon.xml new file mode 100644 index 0000000000..67b727f80d --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_201900000028.anon.xml @@ -0,0 +1,158 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000028 + 2019011416033300 + + W + I + 2019011416033300 + + + + + 2625854460 + 976900187 + 5c5 + 6 + 95 + 952f9c9ff + 1988-06-03 + M + + + 20210328 + 19600509 + + + 2727FM + + Thorbeckegracht + 73 + + + + + + 1802 + + + + + + 2625854460 + 976900187 + 5c5 + 6 + 95 + 952f9c9ff + 1988-06-03 + M + + + 20210328 + 19600509 + + + 2727FM + + Thorbeckegracht + 73 + + + + + + 1802 + + + + 20110526 + + 20240430 + 19600509 + + + + + + + + c58b867 + 1960-05-09 + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_201900000029.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_201900000029.anon.xml new file mode 100644 index 0000000000..d0ae8b1252 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_201900000029.anon.xml @@ -0,0 +1,161 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000029 + 2019011416034100 + + W + I + 2019011416034100 + + + + + 0789721340 + 606117644 + c14d5 + 0 + + c58b867 + 1964-02-09 + V + + + 20240627 + 19600509 + + + 3020RV + + Markt + 4 + + + + + + 1801 + + + + + + 0789721340 + 606117644 + c14d5 + 0 + + c58b867 + 1964-02-09 + V + + + 20240627 + 19600509 + + + 3020RV + + Markt + 4 + + + + + + 1801 + + + + 20110526 + + 20240430 + 19600509 + + + + + + + 95 + 952f9c9ff + 1960-05-09 + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_20190000002A.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_20190000002A.anon.xml new file mode 100644 index 0000000000..142e4f7654 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_20190000002A.anon.xml @@ -0,0 +1,127 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000002A + 2019011416034900 + + W + I + 2019011416034900 + + + + + 0814678270 + 497919104 + e24e2 + 5 + + 3879b76c + 1941-07-24 + V + 0 + + + 19410724 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + 0814678270 + 497919104 + e24e2 + 5 + + 3879b76c + 1941-07-24 + V + 7 + + + 19410724 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_20190000002B.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_20190000002B.anon.xml new file mode 100644 index 0000000000..21c61987b9 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_20190000002B.anon.xml @@ -0,0 +1,127 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000002B + 2019011416035700 + + W + I + 2019011416035700 + + + + + 8222536691 + 398069336 + d01926a + d + + 3879b76c + 1989-07-11 + V + 0 + + + 19890711 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + 8222536691 + 398069336 + d01926a + d + + 3879b76c + 1989-07-11 + V + 7 + + + 19890711 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_20190000002C.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_20190000002C.anon.xml new file mode 100644 index 0000000000..765882db0c --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_20190000002C.anon.xml @@ -0,0 +1,121 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000002C + 2019011416040500 + + W + I + 2019011416040500 + + + + + 9304800390 + 734784828 + b3e e181d8c + 3e + + 80fd77f + 2005-07-28 + M + + + 20210612 + 19930618 + + + 3019RT + + Thorbeckestraat + 5 + + + + + + 1801 + + + + + 9304800390 + 734784828 + b3e e181d8c + 3e + + 80fd77f + 2005-07-28 + M + + + 19930618 + 19600509 + + + 3020HA + + Sequoialaan + 5 + c + + + + + 1801 + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_20190000002D.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_20190000002D.anon.xml new file mode 100644 index 0000000000..041dbc426a --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_20190000002D.anon.xml @@ -0,0 +1,168 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000002D + 2019011416041300 + + W + I + 2019011416041300 + + + + + 7423586859 + 955 + 1989c7 + 7 + 970 + d0d536 + 2005-03-20 + V + + + + + + + 20230120 + 19410723 + + + 8073KS + + van Speykstraat + 52 + + + + + + 1801 + + + + + 7423586859 + 955 + 1989c7 + 7 + 970 + d0d536 + 2005-03-20 + V + + + 20110609 + + + 19410723 + 19600509 + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_20190000002E.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_20190000002E.anon.xml new file mode 100644 index 0000000000..b3dbfb1ca6 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_20190000002E.anon.xml @@ -0,0 +1,125 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000002E + 2019011416042100 + + W + I + 2019011416042100 + + + + + 1913118637 + 306472837 + f0365 + 6 + + 534ae8f7c + 1987-09-06 + M + + + 19870906 + 19600509 + + + 1785LG + + A M v Voorthuijsenstr + 23 + + + + + + 1801 + + + + + 1913118637 + 306472837 + f0365 + 6 + + 8246a79 + 1987-09-06 + M + + + 19870906 + 19600509 + + + 1785LG + + A M v Voorthuijsenstr + 23 + + + + + + 1801 + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_20190000002F.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_20190000002F.anon.xml new file mode 100644 index 0000000000..3984609f31 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_20190000002F.anon.xml @@ -0,0 +1,124 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000002F + 2019011416042900 + + W + I + 2019011416042900 + + + + + 1318579222 + 030941790 + 84827c4d06e85a77 + 7 + + 6284224 + 1940-05-18 + V + + + 19990621 + 19410723 + + + 1064BH + + Burgemeester Röellstraat + 31 + + + + + + 1801 + + + + + 1318579222 + 030941790 + 84827c4d06e85a77 + 7 + + 6284224 + 1940-05-18 + V + + + 19410723 + 19600509 + + + 1065CS + + Christiaan Brüningsstr + 25 + + + + + + 1801 + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_201900000030.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_201900000030.anon.xml new file mode 100644 index 0000000000..acdc5f5215 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_201900000030.anon.xml @@ -0,0 +1,116 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000030 + 2019011416043700 + + T + I + 2019011416043700 + + + + + 6171717520 + 749069273 + 727b5940 900ed1be 8b701201 935a9e ba5b4d6e d9b9226a + c42b69 + 95 + e7145 a3026 19399 37 eff41b7 0cc4de 845 e60 5971 fb2 627e7 552ca ac7 b33eb5bd + 1971-10-22 + M + 0 + JH + 1802 + + E + + + 19410723 + 19600509 + + + 3055NL + + Le Fèvre de Montignyln + 49 + + + + + + 1802 + + + + 19360000 + + 19600618 + 19600509 + + + + + + + + 0e8fc 07a65 02f2e 674af + 1960-05-09 + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000031.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000031.anon.xml new file mode 100644 index 0000000000..b0a44b330c --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000031.anon.xml @@ -0,0 +1,126 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000031 + 2019011416113600 + + W + I + 2019011416113600 + + + + + 0789721340 + 606117644 + c14d5 + 0 + + c58b867 + 1964-02-09 + V + 1801 + + + 20240627 + 19930618 + + + 3020RV + + Markt + 4 + + + + + + 1801 + + + + + 0789721340 + 606117644 + c14d5 + 0 + + c58b867 + 1964-02-09 + V + 1802 + + + 19930618 + 19600509 + + + 2727FM + + Thorbeckegracht + 73 + + + + + + 1802 + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000032.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000032.anon.xml new file mode 100644 index 0000000000..2805e37fb2 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000032.anon.xml @@ -0,0 +1,127 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000032 + 2019011416114400 + + W + I + 2019011416114400 + + + + + 5396163489 + 677924762 + c57e226 + 6 + + d6231 + 2027-06-16 + V + + + 20000227 + 19410723 + + + + + + + + + + Onder de Belvédère a/d Groenegracht + + 1802 + + + + + 5396163489 + 677924762 + c57e226 + 6 + + d6231 + 2027-06-16 + V + + + 19410723 + 19600509 + + + 6049HD + + A K vd Coppellostr + 17 + + B + + + + 1802 + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000033.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000033.anon.xml new file mode 100644 index 0000000000..699a4e3ac7 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000033.anon.xml @@ -0,0 +1,164 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000033 + 2019011416115200 + + W + I + 2019011416115200 + + + + + 3056876036 + 902215443 + 7f74d7 + 5 + + 568cf + 2003-01-15 + M + + + 19960304 + 19600509 + + + 2767GP + + Poolmanweg + 22 + + + + + + 1801 + + + + + + 3056876036 + 902215443 + 7f74d7 + 5 + + 568cf + 2003-01-15 + M + + + 19960304 + 19600509 + + + 2767GP + + Poolmanweg + 22 + + + + + + 1801 + + + + 20110609 + + 19410723 + 19600509 + + + + + + + + 0f2 + 1960-05-09 + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000034.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000034.anon.xml new file mode 100644 index 0000000000..9f57a0f3e1 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000034.anon.xml @@ -0,0 +1,124 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000034 + 2019011416120000 + + W + I + 2019011416120000 + + + + + 3056876036 + 902215443 + 7f74d7 + 5 + + 568cf + 2003-01-15 + M + + + 19960304 + 19410723 + + + 2767GP + + Poolmanweg + 22 + + + + + + 1801 + + + + + 3056876036 + 902215443 + 7f74d7 + 5 + + 568cf + 2003-01-15 + M + + + 19410723 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000035.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000035.anon.xml new file mode 100644 index 0000000000..a307ef82fa --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000035.anon.xml @@ -0,0 +1,124 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000035 + 2019011416120800 + + W + I + 2019011416120800 + + + + + 9406420424 + 995140038 + d96c084 + 8 + + 568cf + 1960-11-16 + V + + + 19601116 + 19410723 + + + 2767GP + + Poolmanweg + 22 + + + + + + 1801 + + + + + 9406420424 + 995140038 + d96c084 + 8 + + 568cf + 1960-11-16 + V + + + 19410723 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000036.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000036.anon.xml new file mode 100644 index 0000000000..5bb4817b8b --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000036.anon.xml @@ -0,0 +1,124 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000036 + 2019011416121600 + + W + I + 2019011416121600 + + + + + 7674337126 + 749421371 + a85deb0a1 + 6 + + 71525c823 + 2008-01-08 + V + + + 20080108 + 19410723 + + + 2710SR + + Achterbergweg + 15 + + + + + + 1801 + + + + + 7674337126 + 749421371 + a85deb0a1 + 6 + + 71525c823 + 2008-01-08 + V + + + 19410723 + 19600509 + + + 2724SK + + Lissenvaart + 51 + + + + + + 1801 + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000037.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000037.anon.xml new file mode 100644 index 0000000000..4e2bcf258f --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000037.anon.xml @@ -0,0 +1,127 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000037 + 2019011416122400 + + W + I + 2019011416122400 + + + + + 2678967915 + 355960378 + c9b5d70 + 0 + + 3879b76c + 1998-08-14 + V + 0 + + + 19980814 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + 2678967915 + 355960378 + c9b5d70 + 0 + + 3879b76c + 1998-08-14 + V + 7 + + + 19980814 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000038.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000038.anon.xml new file mode 100644 index 0000000000..180d118450 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000038.anon.xml @@ -0,0 +1,164 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000038 + 2019011416123200 + + W + I + 2019011416123200 + + + + + 2842897910 + 017434635 + 390fe + 0 + + 0f2 + 2025-05-25 + V + + + 19450427 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + + 2842897910 + 017434635 + 390fe + 0 + + 0f2 + 2025-05-25 + V + + + 19450427 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + 20110609 + + 19410723 + 19600509 + + + + + + + + 568cf + 1960-05-09 + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000039.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000039.anon.xml new file mode 100644 index 0000000000..bddc09a669 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000039.anon.xml @@ -0,0 +1,121 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000039 + 2019011416124000 + + W + I + 2019011416124000 + + + + + 9304800390 + 734784828 + b3e e181d8c + 3e + + 80fd77f + 2005-07-28 + M + + + 19930618 + 19410723 + + + 3020HA + + Sequoialaan + 5 + c + + + + + 1801 + + + + + 9304800390 + 734784828 + b3e e181d8c + 3e + + 80fd77f + 2005-07-28 + M + + + 19410723 + 19600509 + + + 3020HA + + Sequoialaan + 29 + + + + + + 1801 + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_20190000003A.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_20190000003A.anon.xml new file mode 100644 index 0000000000..adf893b29b --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_20190000003A.anon.xml @@ -0,0 +1,127 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000003A + 2019011416124800 + + W + I + 2019011416124800 + + + + + 6763823555 + 377226361 + 8bc796 + 3 + + 534ae8f7c + 1989-08-05 + V + E + + + 19700309 + 19600509 + + + 1785LG + + A M v Voorthuijsenstr + 23 + + + + + + 1801 + + + + + 6763823555 + 377226361 + 8bc796 + 3 + + 534ae8f7c + 1989-08-05 + V + V + + + 19700309 + 19600509 + + + 1785LG + + A M v Voorthuijsenstr + 23 + + + + + + 1801 + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_20190000003B.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_20190000003B.anon.xml new file mode 100644 index 0000000000..6c9f11d208 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_20190000003B.anon.xml @@ -0,0 +1,164 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000003B + 2019011416125600 + + W + I + 2019011416125600 + + + + + 6763823555 + 377226361 + 8bc796 + 3 + + 534ae8f7c + 1989-08-05 + V + + + 19700309 + 19600509 + + + 1785LG + + A M v Voorthuijsenstr + 23 + + + + + + 1801 + + + + + + 6763823555 + 377226361 + 8bc796 + 3 + + 534ae8f7c + 1989-08-05 + V + + + 19700309 + 19600509 + + + 1785LG + + A M v Voorthuijsenstr + 23 + + + + + + 1801 + + + + 20110609 + + 19410723 + 19600509 + + + + + + + + 8246a79 + 1960-05-09 + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_20190000003C.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_20190000003C.anon.xml new file mode 100644 index 0000000000..f6e472e3c1 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_20190000003C.anon.xml @@ -0,0 +1,164 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000003C + 2019011416130400 + + W + I + 2019011416130400 + + + + + 3850536601 + 615713666 + 4357a29dd8 + 8 + + 8246a79 + 2029-04-16 + M + + + 19521113 + 19600509 + + + 3053KG + + Karel de Grotestraat + 26 + + + + + + 1801 + + + + + + 3850536601 + 615713666 + 4357a29dd8 + 8 + + 8246a79 + 2029-04-16 + M + + + 19521113 + 19600509 + + + 3053KG + + Karel de Grotestraat + 26 + + + + + + 1801 + + + + 20110609 + + 19410723 + 19600509 + + + + + + + + 534ae8f7c + 1960-05-09 + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_20190000003D.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_20190000003D.anon.xml new file mode 100644 index 0000000000..b6c41420cd --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_20190000003D.anon.xml @@ -0,0 +1,197 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000003D + 2019011416131200 + + W + I + 2019011416131200 + + + + + 7274687268 + 896760175 + 8b2394 1034f4 + fc + + 437138e + 1975-07-04 + M + + + 19561007 + 19600509 + + + 3019RP + + Piersonstraat + 7 + + + + + + 1801 + + + + 19810909 + 19600509 + + 20290424 + 19600509 + + + + + + + + c1b36d + 1960-05-09 + + + + + + 7274687268 + 896760175 + 8b2394 1034f4 + fc + + 437138e + 1975-07-04 + M + + + 19561007 + 19600509 + + + 3019RP + + Piersonstraat + 7 + + + + + + 1801 + + + + 19810909 + 20240430 + + 20290424 + 20240430 + + + + + + + + c1b36d + 1960-05-09 + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_20190000003E.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_20190000003E.anon.xml new file mode 100644 index 0000000000..d39bcd8a7b --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_20190000003E.anon.xml @@ -0,0 +1,197 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000003E + 2019011416132000 + + W + I + 2019011416132000 + + + + + 2969431370 + 683962287 + 23948abf + 6 + + c1b36d + 1958-04-21 + V + + + 19561007 + 19600509 + + + 3019RP + + Piersonstraat + 7 + + + + + + 1801 + + + + 19810909 + 19600509 + + 20290424 + 19600509 + + + + + + + + 437138e + 1960-05-09 + + + + + + 2969431370 + 683962287 + 23948abf + 6 + + c1b36d + 1958-04-21 + V + + + 19561007 + 19600509 + + + 3019RP + + Piersonstraat + 7 + + + + + + 1801 + + + + 19810909 + 20240430 + + 20290424 + 20240430 + + + + + + + + 437138e + 1960-05-09 + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_20190000003F.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_20190000003F.anon.xml new file mode 100644 index 0000000000..61539ec01b --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_20190000003F.anon.xml @@ -0,0 +1,127 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000003F + 2019011417105600 + + W + I + 2019011417105600 + + + + + 2678967915 + 355960378 + c9b5d70 + 0 + + 3879b76c + 1998-08-14 + V + 7 + + + 19980814 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + 2678967915 + 355960378 + c9b5d70 + 0 + + 3879b76c + 1998-08-14 + V + 0 + + + 19980814 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_201900000040.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_201900000040.anon.xml new file mode 100644 index 0000000000..3512ee7b72 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_201900000040.anon.xml @@ -0,0 +1,127 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000040 + 2019011417110300 + + W + I + 2019011417110300 + + + + + 0814678270 + 497919104 + e24e2 + 5 + + 3879b76c + 1941-07-24 + V + 1 + + + 19410724 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + 0814678270 + 497919104 + e24e2 + 5 + + 3879b76c + 1941-07-24 + V + 0 + + + 19410724 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_201900000041.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_201900000041.anon.xml new file mode 100644 index 0000000000..d551dcb5b7 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_201900000041.anon.xml @@ -0,0 +1,125 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000041 + 2019011417111100 + + W + I + 2019011417111100 + + + + + 7274687268 + 896760175 + 8b2394 1034f4 + fc + + 437138e + 1975-07-04 + M + G + + + 19561007 + 19600509 + + + 3019RP + + Piersonstraat + 7 + + + + + + 1801 + + + + + 7274687268 + 896760175 + 8b2394 1034f4 + fc + 95 + afafb + 1975-07-04 + M + + + + 19561007 + 19600509 + + + 3019RP + + Piersonstraat + 7 + + + + + + 1801 + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_201900000042.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_201900000042.anon.xml new file mode 100644 index 0000000000..6a682ba405 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_201900000042.anon.xml @@ -0,0 +1,122 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000042 + 2019011417111900 + + W + I + 2019011417111900 + + + + + 7128413151 + 783340266 + 16d95b5 + b + + 437138e + 1992-06-13 + V + + + 19920613 + 19600509 + + + 3019RP + + Piersonstraat + 7 + + + + + + 1801 + + + + + 7128413151 + 783340266 + 16d95b5 + b + 95 + afafb + 1992-06-13 + V + + + 19920613 + 19600509 + + + 3019RP + + Piersonstraat + 7 + + + + + + 1801 + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_201900000043.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_201900000043.anon.xml new file mode 100644 index 0000000000..ac6ea9efdd --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_201900000043.anon.xml @@ -0,0 +1,122 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000043 + 2019011417112700 + + W + I + 2019011417112700 + + + + + 3087970133 + 919965111 + bb866 + 8 + + 437138e + 1992-06-13 + V + + + 19920613 + 19600509 + + + 3019RP + + Piersonstraat + 7 + + + + + + 1801 + + + + + 3087970133 + 919965111 + bb866 + 8 + 95 + afafb + 1992-06-13 + V + + + 19920613 + 19600509 + + + 3019RP + + Piersonstraat + 7 + + + + + + 1801 + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_201900000044.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_201900000044.anon.xml new file mode 100644 index 0000000000..9206381a2a --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_201900000044.anon.xml @@ -0,0 +1,122 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000044 + 2019011417113400 + + W + I + 2019011417113400 + + + + + 6433621730 + 094368468 + 10035d + 6 + + 437138e + 1992-06-13 + V + + + 19920613 + 19600509 + + + 3019RP + + Piersonstraat + 7 + + + + + + 1801 + + + + + 6433621730 + 094368468 + 10035d + 6 + 95 + afafb + 1992-06-13 + V + + + 19920613 + 19600509 + + + 3019RP + + Piersonstraat + 7 + + + + + + 1801 + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_201900000045.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_201900000045.anon.xml new file mode 100644 index 0000000000..0c421ddab8 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_201900000045.anon.xml @@ -0,0 +1,192 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000045 + 2019011417114200 + + W + I + 2019011417114200 + + + + + 2969431370 + 683962287 + 23948abf + 6 + + c1b36d + 1958-04-21 + V + + + 19561007 + 19600509 + + + 3019RP + + Piersonstraat + 7 + + + + + + 1801 + + + + 19810909 + 20240430 + + 20290424 + 20240430 + + + + + + + + 437138e + 1960-05-09 + + + + + + 2969431370 + 683962287 + 23948abf + 6 + + c1b36d + 1958-04-21 + V + + + 19561007 + 19600509 + + + 3019RP + + Piersonstraat + 7 + + + + + + 1801 + + + + 19810909 + 20240430 + + 20290424 + 20240430 + + + + + + + 95 + afafb + 1960-05-09 + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_201900000046.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_201900000046.anon.xml new file mode 100644 index 0000000000..4bded793b9 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_201900000046.anon.xml @@ -0,0 +1,191 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000046 + 2019011417262200 + + W + I + 2019011417262200 + + + + + 3169200703 + 584407993 + 04c44364e2 + 5 + 970 + a5e93 c5d7 503fd0 + 2004-03-14 + V + + + 20030129 + 19600509 + + + 3019RT + + Thorbeckestraat + 5 + + + + + + 1801 + + + + 19930425 + 19600509 + + 20030129 + 19600509 + + + + + + + + 80fd77f + 1960-05-09 + + + + + + 3169200703 + 584407993 + 04c44364e2 + 5 + 970 + a5e93 c5d7 503fd0 + 2004-03-14 + V + + + 20030129 + 19600509 + + + 3019RT + + Thorbeckestraat + 5 + + + + + + 1801 + + + + 19930425 + 19410723 + + 20030129 + 19410723 + + + + + + + + 80fd77f + 1960-05-09 + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_201900000047.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_201900000047.anon.xml new file mode 100644 index 0000000000..eeff650d5b --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_201900000047.anon.xml @@ -0,0 +1,197 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000047 + 2019011417263000 + + W + I + 2019011417263000 + + + + + 3056876036 + 902215443 + 7f74d7 + 5 + + 568cf + 2003-01-15 + M + + + 19410723 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + 20110609 + 19600509 + + 19410723 + 19600509 + + + + + + + + 0f2 + 1960-05-09 + + + + + + 3056876036 + 902215443 + 7f74d7 + 5 + + 568cf + 2003-01-15 + M + + + 19410723 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + 20110609 + 19410723 + + 19410723 + 19410723 + + + + + + + + 0f2 + 1960-05-09 + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_201900000048.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_201900000048.anon.xml new file mode 100644 index 0000000000..9312aedd1e --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_201900000048.anon.xml @@ -0,0 +1,140 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000048 + 2019011417263800 + + W + I + 2019011417263800 + + + + + 3056876036 + 902215443 + 7f74d7 + 5 + + 568cf + 2003-01-15 + M + 1960-05-09 + + + + + 19410723 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + 3056876036 + 902215443 + 7f74d7 + 5 + + 568cf + 2003-01-15 + M + 1941-07-23 + + + + + 19410723 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_201900000049.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_201900000049.anon.xml new file mode 100644 index 0000000000..7124691ac0 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_201900000049.anon.xml @@ -0,0 +1,124 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000049 + 2019011417264600 + + W + I + 2019011417264600 + + + + + 9406420424 + 995140038 + d96c084 + 8 + + 568cf + 1960-11-16 + V + + + 19410723 + 19410723 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + 9406420424 + 995140038 + d96c084 + 8 + + 568cf + 1960-11-16 + V + + + 19410723 + 19600509 + + + 1785LG + + A M v Voorthuijsenstr + 1 + + + + + + 1801 + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_20190000004A.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_20190000004A.anon.xml new file mode 100644 index 0000000000..03b06a1cb5 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_20190000004A.anon.xml @@ -0,0 +1,119 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000004A + 2019011417265400 + + C + I + 2019011417265400 + + + + + 2422002328 + 637352461 + 818b + 5 + 95 + 20f + 1977-10-13 + M + + + 19991023 + 19600509 + + + 2713PA + + Mañanalaan + 95 + + + + + + 1801 + + + + + 2422002328 + 637352461 + 818b + 5 + 95 + 20f + 1977-10-13 + M + + + 19991023 + 19600509 + + + 2713PA + + Mañanalaan + 95 + + + + + + 1801 + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_20190000004B.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_20190000004B.anon.xml new file mode 100644 index 0000000000..43414bcb4c --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_20190000004B.anon.xml @@ -0,0 +1,126 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000004B + 2019011417270200 + + W + I + 2019011417270200 + + + + + 8844739345 + 440019134 + bf4d d6bd9 28575 + d47 + + 33bdf4 + 2020-07-17 + V + 1801 + + + 19920128 + 19410723 + + + 2724SK + + Lissenvaart + 51 + + + + + + 1801 + + + + + 8844739345 + 440019134 + bf4d d6bd9 28575 + d47 + + 33bdf4 + 2020-07-17 + V + 1802 + + + 19410723 + 19600509 + + + 7684KI + + Apeldoornseweg + 83 + + + + + + 1802 + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_20190000004C.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_20190000004C.anon.xml new file mode 100644 index 0000000000..1b03e74745 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_20190000004C.anon.xml @@ -0,0 +1,124 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000004C + 2019011417271000 + + W + I + 2019011417271000 + + + + + 2678967915 + 355960378 + c9b5d70 + 0 + + 3879b76c + 1998-08-14 + V + + + 19980814 + 19410723 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + 2678967915 + 355960378 + c9b5d70 + 0 + + 3879b76c + 1998-08-14 + V + + + 19410723 + 19600509 + + + 1785LG + + A M v Voorthuijsenstr + 1 + + + + + + 1801 + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_20190000004D.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_20190000004D.anon.xml new file mode 100644 index 0000000000..7f02136b6a --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_20190000004D.anon.xml @@ -0,0 +1,124 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000004D + 2019011417271800 + + W + I + 2019011417271800 + + + + + 0814678270 + 497919104 + e24e2 + 5 + + 3879b76c + 1941-07-24 + V + + + 19410724 + 19410723 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + 0814678270 + 497919104 + e24e2 + 5 + + 3879b76c + 1941-07-24 + V + + + 19410723 + 19600509 + + + 1785LG + + A M v Voorthuijsenstr + 1 + + + + + + 1801 + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_20190000004E.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_20190000004E.anon.xml new file mode 100644 index 0000000000..8efd7e9ace --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_20190000004E.anon.xml @@ -0,0 +1,124 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000004E + 2019011417272600 + + W + I + 2019011417272600 + + + + + 8222536691 + 398069336 + d01926a + d + + 3879b76c + 1989-07-11 + V + + + 19890711 + 19410723 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + 8222536691 + 398069336 + d01926a + d + + 3879b76c + 1989-07-11 + V + + + 19410723 + 19600509 + + + 1785LG + + A M v Voorthuijsenstr + 1 + + + + + + 1801 + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_20190000004F.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_20190000004F.anon.xml new file mode 100644 index 0000000000..c49b78072e --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_20190000004F.anon.xml @@ -0,0 +1,197 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000004F + 2019011417273400 + + W + I + 2019011417273400 + + + + + 2842897910 + 017434635 + 390fe + 0 + + 0f2 + 2025-05-25 + V + + + 19450427 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + 20110609 + 19600509 + + 19410723 + 19600509 + + + + + + + + 568cf + 1960-05-09 + + + + + + 2842897910 + 017434635 + 390fe + 0 + + 0f2 + 2025-05-25 + V + + + 19450427 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + 20110609 + 19410723 + + 19410723 + 19410723 + + + + + + + + 568cf + 1960-05-09 + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_201900000050.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_201900000050.anon.xml new file mode 100644 index 0000000000..5657a5755e --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_201900000050.anon.xml @@ -0,0 +1,140 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000050 + 2019011417274200 + + W + I + 2019011417274200 + + + + + 2842897910 + 017434635 + 390fe + 0 + + 0f2 + 2025-05-25 + V + 1960-05-09 + + + + + 19450427 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + 2842897910 + 017434635 + 390fe + 0 + + 0f2 + 2025-05-25 + V + 1941-07-23 + + + + + 19450427 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_201900000051.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_201900000051.anon.xml new file mode 100644 index 0000000000..ec2f495aad --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_201900000051.anon.xml @@ -0,0 +1,140 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000051 + 2019011417275000 + + W + I + 2019011417275000 + + + + + 9304800390 + 734784828 + b3e e181d8c + 3e + + 80fd77f + 2005-07-28 + M + 1960-05-09 + + + + + 19410723 + 19600509 + + + 3020HA + + Sequoialaan + 29 + + + + + + 1801 + + + + + 9304800390 + 734784828 + b3e e181d8c + 3e + + 80fd77f + 2005-07-28 + M + 1941-07-23 + + + + + 19410723 + 19600509 + + + 3020HA + + Sequoialaan + 29 + + + + + + 1801 + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000000.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000000.anon.xml new file mode 100644 index 0000000000..39eb227804 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000000.anon.xml @@ -0,0 +1,124 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000000 + 2019011415491600 + + T + I + 2019011415491600 + + + + + 1153283835 + 195616527 + + + + 59de7 83 e01b 58 9812b + 1996-10-08 + V + 0 + 1801 + + E + + + 19850330 + 19600509 + + + 2571AA + + v Voerst v Lyndenstr + 10 + + + + + + 1801 + + + + 20050811 + + 19410813 + 19600509 + + + + + + + + 84c97b1e + 1960-05-09 + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000001.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000001.anon.xml new file mode 100644 index 0000000000..cd4db91878 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000001.anon.xml @@ -0,0 +1,116 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000001 + 2019011415492400 + + T + I + 2019011415492400 + + + + + 2861888781 + 093735639 + dd75d5981 231e5 + cf + + d34ce8 + 1958-06-21 + V + 0 + 1801 + + V + + + 19381011 + 19600509 + + + 2593BP + + Laan v Nieuw Oost-Indië + 210 + + + + + + 1801 + + + + 20190115 + + 19600509 + 20190115 + + + + + + + 51a + 00d5d + 1960-05-09 + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000002.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000002.anon.xml new file mode 100644 index 0000000000..277841527f --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000002.anon.xml @@ -0,0 +1,80 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000002 + 2019011415493200 + + T + I + 2019011415493200 + + + + + 7128413151 + 783340266 + 16d95b5 + b + + 437138e + 1992-06-13 + V + 0 + 1801 + E + + + 19920613 + 19600509 + + + 3019RP + + Piersonstraat + 7 + + + + + + 1801 + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000003.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000003.anon.xml new file mode 100644 index 0000000000..89db13c2c9 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000003.anon.xml @@ -0,0 +1,80 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000003 + 2019011415494000 + + T + I + 2019011415494000 + + + + + 0814678270 + 497919104 + e24e2 + 5 + + 3879b76c + 1941-07-24 + V + 0 + 1801 + E + + + 19410724 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000004.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000004.anon.xml new file mode 100644 index 0000000000..002de34c5b --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000004.anon.xml @@ -0,0 +1,80 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000004 + 2019011415494800 + + T + I + 2019011415494800 + + + + + 8222536691 + 398069336 + d01926a + d + + 3879b76c + 1989-07-11 + V + 0 + 1801 + E + + + 19890711 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000005.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000005.anon.xml new file mode 100644 index 0000000000..d31643a432 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000005.anon.xml @@ -0,0 +1,113 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000005 + 2019011415495700 + + T + I + 2019011415495700 + + + + + 3169200703 + 584407993 + 04c44364e2 + 5 + 970 + a5e93 c5d7 503fd0 + 2004-03-14 + V + 0 + JV + 1801 + E + + + 20030129 + 19600509 + + + 3019RT + + Thorbeckestraat + 5 + + + + + + 1801 + + + + 19930425 + + 20030129 + 19600509 + + + + + + + + 80fd77f + 1960-05-09 + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000006.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000006.anon.xml new file mode 100644 index 0000000000..fa2b610c09 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000006.anon.xml @@ -0,0 +1,74 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000006 + 2019011415500500 + + T + I + 2019011415500500 + + + + + 0491849700 + 917760778 + d5eef8 + 8 + + e8da590 + 1997-05-29 + V + 0 + 1801 + E + + + 19970529 + 19600509 + + + 1011RE + + Jonas Daniël Meijerplein + 11 + A + III + + + + 1801 + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000007.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000007.anon.xml new file mode 100644 index 0000000000..a144b3a32d --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000007.anon.xml @@ -0,0 +1,110 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000007 + 2019011415501300 + + T + I + 2019011415501300 + + + + + 3156735539 + 242708704 + 2b77f2e + 0 + 8a8 + ae0d2b1 + 2008-06-04 + V + 0 + 1801 + E + + + 20130616 + 19600509 + + + 2724SK + + Lissenvaart + 51 + + + + + + 1801 + + + + 19410516 + + 19600509 + 19410516 + + + + + + + 2d + 6687d + 1960-05-09 + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000008.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000008.anon.xml new file mode 100644 index 0000000000..e7b829b1f2 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000008.anon.xml @@ -0,0 +1,115 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000008 + 2019011415502100 + + T + I + 2019011415502100 + + + + + 9221555535 + 065596429 + 9e961 + 6 + + 71525c823 + 2015-08-19 + M + 0 + 1801 + E + + + 20270322 + 19600509 + + + 2710SR + + Achterbergweg + 15 + + + + + + 1801 + + + + 19780310 + + 20270322 + 19600509 + + + + + + + + c8cf7e + 1960-05-09 + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000009.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000009.anon.xml new file mode 100644 index 0000000000..87742953e0 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000009.anon.xml @@ -0,0 +1,83 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000009 + 2019011415502900 + + T + I + 2019011415502900 + + + + + 4190218146 + 237931115 + fd9c6c + 5 + + fea619c9c + 1970-10-27 + M + 0 + 1801 + + E + + + 20020102 + 19600509 + + + 1425SG + + Gen Karel vd Heydenln + 43 + + + + + + 1801 + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000000A.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000000A.anon.xml new file mode 100644 index 0000000000..65b5bff846 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000000A.anon.xml @@ -0,0 +1,80 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000000A + 2019011415503700 + + T + I + 2019011415503700 + + + + + 1913118637 + 306472837 + f0365 + 6 + + 534ae8f7c + 1987-09-06 + M + 0 + 1801 + E + + + 19870906 + 19600509 + + + 1785LG + + A M v Voorthuijsenstr + 23 + + + + + + 1801 + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000000B.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000000B.anon.xml new file mode 100644 index 0000000000..cf91c10447 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000000B.anon.xml @@ -0,0 +1,113 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000000B + 2019011415504500 + + T + I + 2019011415504500 + + + + + 8844739345 + 440019134 + bf4d d6bd9 28575 + d47 + + 33bdf4 + 2020-07-17 + V + 0 + 1801 + E + + + 19920128 + 19600509 + + + 2724SK + + Lissenvaart + 51 + + + + + + 1801 + + + + 20171006 + + 19600509 + 20171006 + + + + + + + 95 + d4fe9 + 1960-05-09 + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000000C.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000000C.anon.xml new file mode 100644 index 0000000000..114c7a4200 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000000C.anon.xml @@ -0,0 +1,80 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000000C + 2019011415505200 + + T + I + 2019011415505200 + + + + + 3087970133 + 919965111 + bb866 + 8 + + 437138e + 1992-06-13 + V + 0 + 1801 + E + + + 19920613 + 19600509 + + + 3019RP + + Piersonstraat + 7 + + + + + + 1801 + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000000D.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000000D.anon.xml new file mode 100644 index 0000000000..a5e75ace13 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000000D.anon.xml @@ -0,0 +1,80 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000000D + 2019011415510000 + + T + I + 2019011415510000 + + + + + 9406420424 + 995140038 + d96c084 + 8 + + 568cf + 1960-11-16 + V + 0 + 1801 + E + + + 19601116 + 19600509 + + + 2767GP + + Poolmanweg + 22 + + + + + + 1801 + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000000E.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000000E.anon.xml new file mode 100644 index 0000000000..cb5a4d6ca4 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000000E.anon.xml @@ -0,0 +1,112 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000000E + 2019011415510800 + + T + I + 2019011415510800 + + + + + 9304800390 + 734784828 + b3e e181d8c + 3e + + 80fd77f + 2005-07-28 + M + 0 + 1801 + E + + + 20210612 + 19600509 + + + 3019RT + + Thorbeckestraat + 5 + + + + + + 1801 + + + + 19930425 + + 20030129 + 19600509 + + + + + + + 970 + a5e93 c5d7 503fd0 + 1960-05-09 + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000000F.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000000F.anon.xml new file mode 100644 index 0000000000..55349d4798 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000000F.anon.xml @@ -0,0 +1,80 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000000F + 2019011415511600 + + T + I + 2019011415511600 + + + + + 3608087947 + 698393536 + 38d8aa + f + + 2c56 + 1986-05-12 + M + 0 + 1801 + E + + + 19860512 + 19600509 + + + 2712AD + + Zuidstraat + 13 + + + + + + 1801 + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000010.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000010.anon.xml new file mode 100644 index 0000000000..09f06aae01 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000010.anon.xml @@ -0,0 +1,80 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000010 + 2019011415512400 + + T + I + 2019011415512400 + + + + + 2678967915 + 355960378 + c9b5d70 + 0 + + 3879b76c + 1998-08-14 + V + 0 + 1801 + E + + + 19980814 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000011.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000011.anon.xml new file mode 100644 index 0000000000..958eef4211 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000011.anon.xml @@ -0,0 +1,115 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000011 + 2019011415513200 + + T + I + 2019011415513200 + + + + + 4075079129 + 402988237 + 354f + 6 + + 2c56 + 1943-07-28 + M + 0 + 1801 + E + + + 19501118 + 19600509 + + + 2712AD + + Zuidstraat + 13 + + + + + + 1801 + + + + 19850328 + + 19600516 + 19600509 + + + + + + + + b0ebc + 1960-05-09 + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000012.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000012.anon.xml new file mode 100644 index 0000000000..41c7a8c7a1 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000012.anon.xml @@ -0,0 +1,115 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000012 + 2019011415514000 + + T + I + 2019011415514000 + + + + + 0549847258 + 035308385 + f9478bdc + 0 + + c8cf7e + 2010-09-14 + V + 0 + 1801 + V + + + 20270322 + 19600509 + + + 2710SR + + Achterbergweg + 15 + + + + + + 1801 + + + + 19780310 + + 20270322 + 19600509 + + + + + + + + 71525c823 + 1960-05-09 + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000013.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000013.anon.xml new file mode 100644 index 0000000000..8e7ca3d1a2 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000013.anon.xml @@ -0,0 +1,80 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000013 + 2019011415514800 + + T + I + 2019011415514800 + + + + + 0593074166 + 363367574 + 2cfd1bf6c + 5 + b7 + 67425 + 2005-02-21 + V + 0 + 1801 + + E + + + 19800206 + 19600509 + + + 3020TF + + Bakenessegracht + 37 + + + + + + 1801 + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000014.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000014.anon.xml new file mode 100644 index 0000000000..949f38c8e9 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000014.anon.xml @@ -0,0 +1,80 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000014 + 2019011415515600 + + T + I + 2019011415515600 + + + + + 2842897910 + 017434635 + 390fe + 0 + + 0f2 + 2025-05-25 + V + 0 + 1801 + E + + + 19450427 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000015.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000015.anon.xml new file mode 100644 index 0000000000..0fc9f82d12 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000015.anon.xml @@ -0,0 +1,80 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000015 + 2019011415520500 + + T + I + 2019011415520500 + + + + + 1412016204 + 323607784 + 2ec80 + 6 + + 7bebb51ebe49 + 1974-02-27 + M + 0 + 1801 + E + + + 19790414 + 19600509 + + + 2700KM + + Curaçaostraat + 28 + + + + + + 1801 + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000016.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000016.anon.xml new file mode 100644 index 0000000000..d9bbb01fe1 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000016.anon.xml @@ -0,0 +1,119 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000016 + 2019011415521200 + + T + I + 2019011415521200 + + + + + 7274687268 + 896760175 + 8b2394 1034f4 + fc + + 437138e + 1975-07-04 + M + 0 + G + 1801 + + E + + + 19561007 + 19600509 + + + 3019RP + + Piersonstraat + 7 + + + + + + 1801 + + + + 19810909 + + 20290424 + 19600509 + + + + + + + + c1b36d + 1960-05-09 + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000017.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000017.anon.xml new file mode 100644 index 0000000000..2c5d7c8bc3 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000017.anon.xml @@ -0,0 +1,83 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000017 + 2019011415522000 + + T + I + 2019011415522000 + + + + + 1318579222 + 030941790 + 84827c4d06e85a77 + 7 + + 6284224 + 1940-05-18 + V + 0 + 1801 + + E + + + 19990621 + 19600509 + + + 1064BH + + Burgemeester Röellstraat + 31 + + + + + + 1801 + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000018.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000018.anon.xml new file mode 100644 index 0000000000..7c5423ec03 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000018.anon.xml @@ -0,0 +1,80 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000018 + 2019011415522800 + + T + I + 2019011415522800 + + + + + 6433621730 + 094368468 + 10035d + 6 + + 437138e + 1992-06-13 + V + 0 + 1801 + E + + + 19920613 + 19600509 + + + 3019RP + + Piersonstraat + 7 + + + + + + 1801 + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000019.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000019.anon.xml new file mode 100644 index 0000000000..cf6d170914 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000019.anon.xml @@ -0,0 +1,144 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000019 + 2019011415523600 + + T + I + 2019011415523600 + + + + + 5512727045 + 455478156 + a0edec840 2dd6bf36 f4237bed26 a55464192 77c87ab9d2 + b8c22 + 970 + a5e93 c5d7 503fd0 + 2004-11-06 + M + 0 + B + 1801 + + + 20070605 + E + + + 20031118 + 19600509 + + + + + + + + + + + + + + + + + + + + 19820511 + + 20000513 + 19600509 + + + + + + + 74f 97f + 5ad + 1960-05-09 + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000001A.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000001A.anon.xml new file mode 100644 index 0000000000..c24bf7e500 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000001A.anon.xml @@ -0,0 +1,118 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000001A + 2019011415524400 + + T + I + 2019011415524400 + + + + + 2969431370 + 683962287 + 23948abf + 6 + + c1b36d + 1958-04-21 + V + 0 + 1801 + + E + + + 19561007 + 19600509 + + + 3019RP + + Piersonstraat + 7 + + + + + + 1801 + + + + 19810909 + + 20290424 + 19600509 + + + + + + + + 437138e + 1960-05-09 + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000001B.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000001B.anon.xml new file mode 100644 index 0000000000..cba880fb3a --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000001B.anon.xml @@ -0,0 +1,80 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000001B + 2019011415525200 + + T + I + 2019011415525200 + + + + + 3850536601 + 615713666 + 4357a29dd8 + 8 + + 8246a79 + 2029-04-16 + M + 0 + 1801 + E + + + 19521113 + 19600509 + + + 3053KG + + Karel de Grotestraat + 26 + + + + + + 1801 + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000001C.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000001C.anon.xml new file mode 100644 index 0000000000..63d534a8d4 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000001C.anon.xml @@ -0,0 +1,80 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000001C + 2019011415530000 + + T + I + 2019011415530000 + + + + + 7674337126 + 749421371 + a85deb0a1 + 6 + + 71525c823 + 2008-01-08 + V + 0 + 1801 + E + + + 20080108 + 19600509 + + + 2710SR + + Achterbergweg + 15 + + + + + + 1801 + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000001D.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000001D.anon.xml new file mode 100644 index 0000000000..77ba1637c5 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000001D.anon.xml @@ -0,0 +1,74 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000001D + 2019011415530800 + + T + I + 2019011415530800 + + + + + 8157901140 + 567143730 + 6bd6ff + 8 + + e8da590 + 1997-05-29 + V + 0 + 1801 + E + + + 19970529 + 19600509 + + + 1011RE + + Jonas Daniël Meijerplein + 11 + A + III + + + + 1801 + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000001E.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000001E.anon.xml new file mode 100644 index 0000000000..7415fac735 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000001E.anon.xml @@ -0,0 +1,83 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000001E + 2019011415531600 + + T + I + 2019011415531600 + + + + + 9100673820 + 821030777 + be6ea8 + 0 + + 5fb75f1 + 1986-08-19 + V + 0 + 1801 + + E + + + 19390312 + 19600509 + + + 2497BX + + Jonkheer van Riemsdijkln + 41 + + + + + + 1801 + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000001F.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000001F.anon.xml new file mode 100644 index 0000000000..852545da7b --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000001F.anon.xml @@ -0,0 +1,123 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000001F + 2019011415532300 + + T + I + 2019011415532300 + + + + + 5396163489 + 677924762 + c57e226 + 6 + + d6231 + 2027-06-16 + V + 0 + PS + 1802 + + E + + + 20000227 + 19600509 + + + + + + + + + + Onder de Belvédère a/d Groenegracht + + 1802 + + + + 19541015 + + 19600509 + 19541015 + + + + + + + b7 + 67425 + 1960-05-09 + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000020.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000020.anon.xml new file mode 100644 index 0000000000..ea864f80aa --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000020.anon.xml @@ -0,0 +1,117 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000020 + 2019011415533100 + + T + I + 2019011415533100 + + + + + 8475834889 + 932870521 + 394de4b + e + + d6231 + 2027-06-16 + V + 0 + PS + 1802 + + E + + + 19800206 + 19600509 + + + 2727FM + + Thorbeckegracht + 53 + + + + + + 1802 + + + + 19541015 + + 19600509 + 19541015 + + + + + + + b7 + 67425 + 1960-05-09 + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000021.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000021.anon.xml new file mode 100644 index 0000000000..160233cf4d --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000021.anon.xml @@ -0,0 +1,80 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000021 + 2019011415533900 + + T + I + 2019011415533900 + + + + + 2625854460 + 976900187 + 5c5 + 6 + 95 + 952f9c9ff + 1988-06-03 + M + 7 + 1802 + + E + + + 20210328 + 19600509 + + + 2727FM + + Thorbeckegracht + 73 + + + + + + 1802 + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000022.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000022.anon.xml new file mode 100644 index 0000000000..9f39f51263 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000022.anon.xml @@ -0,0 +1,115 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000022 + 2019011415534700 + + T + I + 2019011415534700 + + + + + 9641459515 + 082806973 + d62ab + 5 + + b0ebc + 1974-10-23 + V + 0 + 1801 + V + + + 19451120 + 19600509 + + + 2712AD + + Zuidstraat + 13 + + + + + + 1801 + + + + 19850328 + + 19600516 + 19600509 + + + + + + + + 2c56 + 1960-05-09 + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000023.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000023.anon.xml new file mode 100644 index 0000000000..85b3ab33b0 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000023.anon.xml @@ -0,0 +1,80 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000023 + 2019011415535500 + + T + I + 2019011415535500 + + + + + 6763823555 + 377226361 + 8bc796 + 3 + + 534ae8f7c + 1989-08-05 + V + 0 + 1801 + E + + + 19700309 + 19600509 + + + 1785LG + + A M v Voorthuijsenstr + 23 + + + + + + 1801 + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000024.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000024.anon.xml new file mode 100644 index 0000000000..160ea1fb0f --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000024.anon.xml @@ -0,0 +1,110 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000024 + 2019011415540300 + + T + I + 2019011415540300 + + + + + 2422002328 + 637352461 + 818b + 5 + 95 + 20f + 1977-10-13 + M + 0 + 1801 + E + + + 19991023 + 19600509 + + + 2713PA + + Mañanalaan + 95 + + + + + + 1801 + + + + 19360703 + + 19600509 + 19360703 + + + + + + + 95 + d4fe9 + 1960-05-09 + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000025.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000025.anon.xml new file mode 100644 index 0000000000..5fb8d079ab --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000025.anon.xml @@ -0,0 +1,77 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000025 + 2019011415541000 + + T + I + 2019011415541000 + + + + + 7423586859 + 955 + 1989c7 + 7 + 970 + d0d536 + 2005-03-20 + V + 0 + 1801 + E + + + 20230120 + 19600509 + + + 8073KS + + van Speykstraat + 52 + + + + + + 1801 + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000026.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000026.anon.xml new file mode 100644 index 0000000000..ae59ca7c2f --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000026.anon.xml @@ -0,0 +1,119 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000026 + 2019011415541800 + + T + I + 2019011415541800 + + + + + 0789721340 + 606117644 + c14d5 + 0 + + c58b867 + 1964-02-09 + V + 0 + 1801 + + E + + + 20240627 + 19600509 + + + 3020RV + + Markt + 4 + + + + + + 1801 + + + + 20190204 + + 19600509 + 20190204 + + + + + + + + 9296df2fb + 1960-05-09 + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000027.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000027.anon.xml new file mode 100644 index 0000000000..47177cb9d3 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000027.anon.xml @@ -0,0 +1,80 @@ + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000027 + 2019011415542600 + + T + I + 2019011415542600 + + + + + 3056876036 + 902215443 + 7f74d7 + 5 + + 568cf + 2003-01-15 + M + 0 + 1801 + E + + + 19960304 + 19600509 + + + 2767GP + + Poolmanweg + 22 + + + + + + 1801 + + + + + \ No newline at end of file From 50719689d5ef7474d553840b09fd0b694d85e3ba Mon Sep 17 00:00:00 2001 From: Meine Toonen Date: Tue, 11 Jun 2019 16:57:54 +0200 Subject: [PATCH 10/32] annoying comment removed and soap envelope added --- .../stuf-bg_201900000028.anon.xml | 264 ++++++-------- .../stuf-bg_201900000029.anon.xml | 267 ++++++--------- .../stuf-bg_20190000002A.anon.xml | 218 +++++------- .../stuf-bg_20190000002B.anon.xml | 218 +++++------- .../stuf-bg_20190000002C.anon.xml | 210 +++++------- .../stuf-bg_20190000002D.anon.xml | 271 ++++++--------- .../stuf-bg_20190000002E.anon.xml | 214 +++++------- .../stuf-bg_20190000002F.anon.xml | 213 +++++------- .../stuf-bg_201900000030.anon.xml | 199 +++++------ .../stuf-bg_201900000031.anon.xml | 217 +++++------- .../stuf-bg_201900000032.anon.xml | 216 +++++------- .../stuf-bg_201900000033.anon.xml | 270 ++++++--------- .../stuf-bg_201900000034.anon.xml | 213 +++++------- .../stuf-bg_201900000035.anon.xml | 213 +++++------- .../stuf-bg_201900000036.anon.xml | 213 +++++------- .../stuf-bg_201900000037.anon.xml | 218 +++++------- .../stuf-bg_201900000038.anon.xml | 270 ++++++--------- .../stuf-bg_201900000039.anon.xml | 210 +++++------- .../stuf-bg_20190000003A.anon.xml | 218 +++++------- .../stuf-bg_20190000003B.anon.xml | 270 ++++++--------- .../stuf-bg_20190000003C.anon.xml | 270 ++++++--------- .../stuf-bg_20190000003D.anon.xml | 322 +++++++----------- .../stuf-bg_20190000003E.anon.xml | 322 +++++++----------- .../stuf-bg_20190000003F.anon.xml | 218 +++++------- .../stuf-bg_201900000040.anon.xml | 218 +++++------- .../stuf-bg_201900000041.anon.xml | 216 +++++------- .../stuf-bg_201900000042.anon.xml | 211 +++++------- .../stuf-bg_201900000043.anon.xml | 211 +++++------- .../stuf-bg_201900000044.anon.xml | 211 +++++------- .../stuf-bg_201900000045.anon.xml | 317 +++++++---------- .../stuf-bg_201900000046.anon.xml | 316 +++++++---------- .../stuf-bg_201900000047.anon.xml | 322 +++++++----------- .../stuf-bg_201900000048.anon.xml | 235 ++++++------- .../stuf-bg_201900000049.anon.xml | 213 +++++------- .../stuf-bg_20190000004A.anon.xml | 208 +++++------ .../stuf-bg_20190000004B.anon.xml | 217 +++++------- .../stuf-bg_20190000004C.anon.xml | 213 +++++------- .../stuf-bg_20190000004D.anon.xml | 213 +++++------- .../stuf-bg_20190000004E.anon.xml | 213 +++++------- .../stuf-bg_20190000004F.anon.xml | 322 +++++++----------- .../stuf-bg_201900000050.anon.xml | 235 ++++++------- .../stuf-bg_201900000051.anon.xml | 235 ++++++------- .../stuf-bg_201900000000.anon.xml | 206 +++++------ .../stuf-bg_201900000001.anon.xml | 198 +++++------ .../stuf-bg_201900000002.anon.xml | 144 ++++---- .../stuf-bg_201900000003.anon.xml | 144 ++++---- .../stuf-bg_201900000004.anon.xml | 144 ++++---- .../stuf-bg_201900000005.anon.xml | 195 +++++------ .../stuf-bg_201900000006.anon.xml | 138 ++++---- .../stuf-bg_201900000007.anon.xml | 191 +++++------ .../stuf-bg_201900000008.anon.xml | 196 +++++------ .../stuf-bg_201900000009.anon.xml | 148 ++++---- .../stuf-bg_20190000000A.anon.xml | 144 ++++---- .../stuf-bg_20190000000B.anon.xml | 194 +++++------ .../stuf-bg_20190000000C.anon.xml | 144 ++++---- .../stuf-bg_20190000000D.anon.xml | 144 ++++---- .../stuf-bg_20190000000E.anon.xml | 193 +++++------ .../stuf-bg_20190000000F.anon.xml | 144 ++++---- .../stuf-bg_201900000010.anon.xml | 144 ++++---- .../stuf-bg_201900000011.anon.xml | 196 +++++------ .../stuf-bg_201900000012.anon.xml | 196 +++++------ .../stuf-bg_201900000013.anon.xml | 145 ++++---- .../stuf-bg_201900000014.anon.xml | 144 ++++---- .../stuf-bg_201900000015.anon.xml | 144 ++++---- .../stuf-bg_201900000016.anon.xml | 202 +++++------ .../stuf-bg_201900000017.anon.xml | 148 ++++---- .../stuf-bg_201900000018.anon.xml | 144 ++++---- .../stuf-bg_201900000019.anon.xml | 233 +++++-------- .../stuf-bg_20190000001A.anon.xml | 200 +++++------ .../stuf-bg_20190000001B.anon.xml | 144 ++++---- .../stuf-bg_20190000001C.anon.xml | 144 ++++---- .../stuf-bg_20190000001D.anon.xml | 138 ++++---- .../stuf-bg_20190000001E.anon.xml | 148 ++++---- .../stuf-bg_20190000001F.anon.xml | 206 +++++------ .../stuf-bg_201900000020.anon.xml | 200 +++++------ .../stuf-bg_201900000021.anon.xml | 145 ++++---- .../stuf-bg_201900000022.anon.xml | 196 +++++------ .../stuf-bg_201900000023.anon.xml | 144 ++++---- .../stuf-bg_201900000024.anon.xml | 191 +++++------ .../stuf-bg_201900000025.anon.xml | 141 ++++---- .../stuf-bg_201900000026.anon.xml | 201 +++++------ .../stuf-bg_201900000027.anon.xml | 144 ++++---- 82 files changed, 7097 insertions(+), 9668 deletions(-) diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_201900000028.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_201900000028.anon.xml index 67b727f80d..9e730e5add 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_201900000028.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_201900000028.anon.xml @@ -1,158 +1,112 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 201900000028 - 2019011416033300 - - W - I - 2019011416033300 - - - - - 2625854460 - 976900187 - 5c5 - 6 - 95 - 952f9c9ff - 1988-06-03 - M - - - 20210328 - 19600509 - - - 2727FM - - Thorbeckegracht - 73 - - - - - - 1802 - - - - - - 2625854460 - 976900187 - 5c5 - 6 - 95 - 952f9c9ff - 1988-06-03 - M - - - 20210328 - 19600509 - - - 2727FM - - Thorbeckegracht - 73 - - - - - - 1802 - - - - 20110526 - - 20240430 - 19600509 - - - - - + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000028 + 2019011416033300 + + W + I + 2019011416033300 + + + + + 2625854460 + 976900187 + 5c5 + 6 + 95 + 952f9c9ff + 1988-06-03 + M + + + 20210328 + 19600509 + + + 2727FM + + Thorbeckegracht + 73 + + + + + + 1802 + + + - - - c58b867 - 1960-05-09 - - - - - \ No newline at end of file + + 2625854460 + 976900187 + 5c5 + 6 + 95 + 952f9c9ff + 1988-06-03 + M + + + 20210328 + 19600509 + + + 2727FM + + Thorbeckegracht + 73 + + + + + + 1802 + + + + 20110526 + + 20240430 + 19600509 + + + + + + + + c58b867 + 1960-05-09 + + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_201900000029.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_201900000029.anon.xml index d0ae8b1252..6c5a1edf36 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_201900000029.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_201900000029.anon.xml @@ -1,161 +1,112 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 201900000029 - 2019011416034100 - - W - I - 2019011416034100 - - - - - 0789721340 - 606117644 - c14d5 - 0 - - c58b867 - 1964-02-09 - V - - - 20240627 - 19600509 - - - 3020RV - - Markt - 4 - - - - - - 1801 - - - - - - 0789721340 - 606117644 - c14d5 - 0 - - c58b867 - 1964-02-09 - V - - - 20240627 - 19600509 - - - 3020RV - - Markt - 4 - - - - - - 1801 - - - - 20110526 - - 20240430 - 19600509 - - - - - + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000029 + 2019011416034100 + + W + I + 2019011416034100 + + + + + 0789721340 + 606117644 + c14d5 + 0 + + c58b867 + 1964-02-09 + V + + + 20240627 + 19600509 + + + 3020RV + + Markt + 4 + + + + + + 1801 + + + - - 95 - 952f9c9ff - 1960-05-09 - - - - - \ No newline at end of file + + 0789721340 + 606117644 + c14d5 + 0 + + c58b867 + 1964-02-09 + V + + + 20240627 + 19600509 + + + 3020RV + + Markt + 4 + + + + + + 1801 + + + + 20110526 + + 20240430 + 19600509 + + + + + + + 95 + 952f9c9ff + 1960-05-09 + + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_20190000002A.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_20190000002A.anon.xml index 142e4f7654..e015fc8510 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_20190000002A.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_20190000002A.anon.xml @@ -1,127 +1,93 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 20190000002A - 2019011416034900 - - W - I - 2019011416034900 - - - - - 0814678270 - 497919104 - e24e2 - 5 - - 3879b76c - 1941-07-24 - V - 0 - - - 19410724 - 19600509 - - - 2753WG - - Wilgenlaan - 4 - - - - - - 1801 - - - - - 0814678270 - 497919104 - e24e2 - 5 - - 3879b76c - 1941-07-24 - V - 7 - - - 19410724 - 19600509 - - - 2753WG - - Wilgenlaan - 4 - - - - - - 1801 - - - - - \ No newline at end of file + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000002A + 2019011416034900 + + W + I + 2019011416034900 + + + + + 0814678270 + 497919104 + e24e2 + 5 + + 3879b76c + 1941-07-24 + V + 0 + + + 19410724 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + 0814678270 + 497919104 + e24e2 + 5 + + 3879b76c + 1941-07-24 + V + 7 + + + 19410724 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_20190000002B.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_20190000002B.anon.xml index 21c61987b9..fccbc63902 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_20190000002B.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_20190000002B.anon.xml @@ -1,127 +1,93 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 20190000002B - 2019011416035700 - - W - I - 2019011416035700 - - - - - 8222536691 - 398069336 - d01926a - d - - 3879b76c - 1989-07-11 - V - 0 - - - 19890711 - 19600509 - - - 2753WG - - Wilgenlaan - 4 - - - - - - 1801 - - - - - 8222536691 - 398069336 - d01926a - d - - 3879b76c - 1989-07-11 - V - 7 - - - 19890711 - 19600509 - - - 2753WG - - Wilgenlaan - 4 - - - - - - 1801 - - - - - \ No newline at end of file + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000002B + 2019011416035700 + + W + I + 2019011416035700 + + + + + 8222536691 + 398069336 + d01926a + d + + 3879b76c + 1989-07-11 + V + 0 + + + 19890711 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + 8222536691 + 398069336 + d01926a + d + + 3879b76c + 1989-07-11 + V + 7 + + + 19890711 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_20190000002C.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_20190000002C.anon.xml index 765882db0c..74f8a086fe 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_20190000002C.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_20190000002C.anon.xml @@ -1,121 +1,91 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 20190000002C - 2019011416040500 - - W - I - 2019011416040500 - - - - - 9304800390 - 734784828 - b3e e181d8c - 3e - - 80fd77f - 2005-07-28 - M - - - 20210612 - 19930618 - - - 3019RT - - Thorbeckestraat - 5 - - - - - - 1801 - - - - - 9304800390 - 734784828 - b3e e181d8c - 3e - - 80fd77f - 2005-07-28 - M - - - 19930618 - 19600509 - - - 3020HA - - Sequoialaan - 5 - c - - - - - 1801 - - - - - \ No newline at end of file + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000002C + 2019011416040500 + + W + I + 2019011416040500 + + + + + 9304800390 + 734784828 + b3e e181d8c + 3e + + 80fd77f + 2005-07-28 + M + + + 20210612 + 19930618 + + + 3019RT + + Thorbeckestraat + 5 + + + + + + 1801 + + + + + 9304800390 + 734784828 + b3e e181d8c + 3e + + 80fd77f + 2005-07-28 + M + + + 19930618 + 19600509 + + + 3020HA + + Sequoialaan + 5 + c + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_20190000002D.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_20190000002D.anon.xml index 041dbc426a..c8c72510eb 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_20190000002D.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_20190000002D.anon.xml @@ -1,168 +1,105 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 20190000002D - 2019011416041300 - - W - I - 2019011416041300 - - - - - 7423586859 - 955 - 1989c7 - 7 - 970 - d0d536 - 2005-03-20 - V - - - - - - - 20230120 - 19410723 - - - 8073KS - - van Speykstraat - 52 - - - - - - 1801 - - - - - 7423586859 - 955 - 1989c7 - 7 - 970 - d0d536 - 2005-03-20 - V - - - 20110609 - - - 19410723 - 19600509 - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000002D + 2019011416041300 + + W + I + 2019011416041300 + + + + + 7423586859 + 955 + 1989c7 + 7 + 970 + d0d536 + 2005-03-20 + V + + + + + + + 20230120 + 19410723 + + + 8073KS + + van Speykstraat + 52 + + + + + + 1801 + + + + + 7423586859 + 955 + 1989c7 + 7 + 970 + d0d536 + 2005-03-20 + V + + + 20110609 + + + 19410723 + 19600509 + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_20190000002E.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_20190000002E.anon.xml index b3dbfb1ca6..255d975ca1 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_20190000002E.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_20190000002E.anon.xml @@ -1,125 +1,91 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 20190000002E - 2019011416042100 - - W - I - 2019011416042100 - - - - - 1913118637 - 306472837 - f0365 - 6 - - 534ae8f7c - 1987-09-06 - M - - - 19870906 - 19600509 - - - 1785LG - - A M v Voorthuijsenstr - 23 - - - - - - 1801 - - - - - 1913118637 - 306472837 - f0365 - 6 - - 8246a79 - 1987-09-06 - M - - - 19870906 - 19600509 - - - 1785LG - - A M v Voorthuijsenstr - 23 - - - - - - 1801 - - - - - \ No newline at end of file + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000002E + 2019011416042100 + + W + I + 2019011416042100 + + + + + 1913118637 + 306472837 + f0365 + 6 + + 534ae8f7c + 1987-09-06 + M + + + 19870906 + 19600509 + + + 1785LG + + A M v Voorthuijsenstr + 23 + + + + + + 1801 + + + + + 1913118637 + 306472837 + f0365 + 6 + + 8246a79 + 1987-09-06 + M + + + 19870906 + 19600509 + + + 1785LG + + A M v Voorthuijsenstr + 23 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_20190000002F.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_20190000002F.anon.xml index 3984609f31..99d7fbc254 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_20190000002F.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_20190000002F.anon.xml @@ -1,124 +1,91 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 20190000002F - 2019011416042900 - - W - I - 2019011416042900 - - - - - 1318579222 - 030941790 - 84827c4d06e85a77 - 7 - - 6284224 - 1940-05-18 - V - - - 19990621 - 19410723 - - - 1064BH - - Burgemeester Röellstraat - 31 - - - - - - 1801 - - - - - 1318579222 - 030941790 - 84827c4d06e85a77 - 7 - - 6284224 - 1940-05-18 - V - - - 19410723 - 19600509 - - - 1065CS - - Christiaan Brüningsstr - 25 - - - - - - 1801 - - - - - \ No newline at end of file + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000002F + 2019011416042900 + + W + I + 2019011416042900 + + + + + 1318579222 + 030941790 + 84827c4d06e85a77 + 7 + + 6284224 + 1940-05-18 + V + + + 19990621 + 19410723 + + + 1064BH + + Burgemeester Röellstraat + 31 + + + + + + 1801 + + + + + 1318579222 + 030941790 + 84827c4d06e85a77 + 7 + + 6284224 + 1940-05-18 + V + + + 19410723 + 19600509 + + + 1065CS + + Christiaan Brüningsstr + 25 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_201900000030.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_201900000030.anon.xml index acdc5f5215..a6b19a2509 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_201900000030.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_201900000030.anon.xml @@ -1,116 +1,87 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 201900000030 - 2019011416043700 - - T - I - 2019011416043700 - - - - - 6171717520 - 749069273 - 727b5940 900ed1be 8b701201 935a9e ba5b4d6e d9b9226a - c42b69 - 95 - e7145 a3026 19399 37 eff41b7 0cc4de 845 e60 5971 fb2 627e7 552ca ac7 b33eb5bd - 1971-10-22 - M - 0 - JH - 1802 - - E - - - 19410723 - 19600509 - - - 3055NL - - Le Fèvre de Montignyln - 49 - - - - - - 1802 - - - - 19360000 - - 19600618 - 19600509 - - - - - - - - 0e8fc 07a65 02f2e 674af - 1960-05-09 - + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000030 + 2019011416043700 + + T + I + 2019011416043700 + + + + + 6171717520 + 749069273 + 727b5940 900ed1be 8b701201 935a9e ba5b4d6e d9b9226a + c42b69 + 95 + e7145 a3026 19399 37 eff41b7 0cc4de 845 e60 5971 fb2 627e7 552ca ac7 b33eb5bd + 1971-10-22 + M + 0 + JH + 1802 + + E + + + 19410723 + 19600509 + + + 3055NL + + Le Fèvre de Montignyln + 49 + + + + + + 1802 + + + + 19360000 + + 19600618 + 19600509 + + + + + + + + 0e8fc 07a65 02f2e 674af + 1960-05-09 + + + - - - - \ No newline at end of file + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000031.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000031.anon.xml index b0a44b330c..fdbc18ad90 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000031.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000031.anon.xml @@ -1,126 +1,93 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 201900000031 - 2019011416113600 - - W - I - 2019011416113600 - - - - - 0789721340 - 606117644 - c14d5 - 0 - - c58b867 - 1964-02-09 - V - 1801 - - - 20240627 - 19930618 - - - 3020RV - - Markt - 4 - - - - - - 1801 - - - - - 0789721340 - 606117644 - c14d5 - 0 - - c58b867 - 1964-02-09 - V - 1802 - - - 19930618 - 19600509 - - - 2727FM - - Thorbeckegracht - 73 - - - - - - 1802 - - - - - \ No newline at end of file + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000031 + 2019011416113600 + + W + I + 2019011416113600 + + + + + 0789721340 + 606117644 + c14d5 + 0 + + c58b867 + 1964-02-09 + V + 1801 + + + 20240627 + 19930618 + + + 3020RV + + Markt + 4 + + + + + + 1801 + + + + + 0789721340 + 606117644 + c14d5 + 0 + + c58b867 + 1964-02-09 + V + 1802 + + + 19930618 + 19600509 + + + 2727FM + + Thorbeckegracht + 73 + + + + + + 1802 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000032.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000032.anon.xml index 2805e37fb2..65dc38e7b1 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000032.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000032.anon.xml @@ -1,127 +1,91 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 201900000032 - 2019011416114400 - - W - I - 2019011416114400 - - - - - 5396163489 - 677924762 - c57e226 - 6 - - d6231 - 2027-06-16 - V - - - 20000227 - 19410723 - - - - - - - - - - Onder de Belvédère a/d Groenegracht - - 1802 - - - - - 5396163489 - 677924762 - c57e226 - 6 - - d6231 - 2027-06-16 - V - - - 19410723 - 19600509 - - - 6049HD - - A K vd Coppellostr - 17 - - B - - - - 1802 - - - - - \ No newline at end of file + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000032 + 2019011416114400 + + W + I + 2019011416114400 + + + + + 5396163489 + 677924762 + c57e226 + 6 + + d6231 + 2027-06-16 + V + + + 20000227 + 19410723 + + + + + + + + + + Onder de Belvédère a/d Groenegracht + + 1802 + + + + + 5396163489 + 677924762 + c57e226 + 6 + + d6231 + 2027-06-16 + V + + + 19410723 + 19600509 + + + 6049HD + + A K vd Coppellostr + 17 + + B + + + + 1802 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000033.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000033.anon.xml index 699a4e3ac7..89b1cd8e00 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000033.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000033.anon.xml @@ -1,164 +1,112 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 201900000033 - 2019011416115200 - - W - I - 2019011416115200 - - - - - 3056876036 - 902215443 - 7f74d7 - 5 - - 568cf - 2003-01-15 - M - - - 19960304 - 19600509 - - - 2767GP - - Poolmanweg - 22 - - - - - - 1801 - - - - - - 3056876036 - 902215443 - 7f74d7 - 5 - - 568cf - 2003-01-15 - M - - - 19960304 - 19600509 - - - 2767GP - - Poolmanweg - 22 - - - - - - 1801 - - - - 20110609 - - 19410723 - 19600509 - - - - - + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000033 + 2019011416115200 + + W + I + 2019011416115200 + + + + + 3056876036 + 902215443 + 7f74d7 + 5 + + 568cf + 2003-01-15 + M + + + 19960304 + 19600509 + + + 2767GP + + Poolmanweg + 22 + + + + + + 1801 + + + - - - 0f2 - 1960-05-09 - - - - - \ No newline at end of file + + 3056876036 + 902215443 + 7f74d7 + 5 + + 568cf + 2003-01-15 + M + + + 19960304 + 19600509 + + + 2767GP + + Poolmanweg + 22 + + + + + + 1801 + + + + 20110609 + + 19410723 + 19600509 + + + + + + + + 0f2 + 1960-05-09 + + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000034.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000034.anon.xml index 9f57a0f3e1..31891cd9fb 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000034.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000034.anon.xml @@ -1,124 +1,91 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 201900000034 - 2019011416120000 - - W - I - 2019011416120000 - - - - - 3056876036 - 902215443 - 7f74d7 - 5 - - 568cf - 2003-01-15 - M - - - 19960304 - 19410723 - - - 2767GP - - Poolmanweg - 22 - - - - - - 1801 - - - - - 3056876036 - 902215443 - 7f74d7 - 5 - - 568cf - 2003-01-15 - M - - - 19410723 - 19600509 - - - 2753WG - - Wilgenlaan - 4 - - - - - - 1801 - - - - - \ No newline at end of file + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000034 + 2019011416120000 + + W + I + 2019011416120000 + + + + + 3056876036 + 902215443 + 7f74d7 + 5 + + 568cf + 2003-01-15 + M + + + 19960304 + 19410723 + + + 2767GP + + Poolmanweg + 22 + + + + + + 1801 + + + + + 3056876036 + 902215443 + 7f74d7 + 5 + + 568cf + 2003-01-15 + M + + + 19410723 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000035.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000035.anon.xml index a307ef82fa..7635425cc8 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000035.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000035.anon.xml @@ -1,124 +1,91 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 201900000035 - 2019011416120800 - - W - I - 2019011416120800 - - - - - 9406420424 - 995140038 - d96c084 - 8 - - 568cf - 1960-11-16 - V - - - 19601116 - 19410723 - - - 2767GP - - Poolmanweg - 22 - - - - - - 1801 - - - - - 9406420424 - 995140038 - d96c084 - 8 - - 568cf - 1960-11-16 - V - - - 19410723 - 19600509 - - - 2753WG - - Wilgenlaan - 4 - - - - - - 1801 - - - - - \ No newline at end of file + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000035 + 2019011416120800 + + W + I + 2019011416120800 + + + + + 9406420424 + 995140038 + d96c084 + 8 + + 568cf + 1960-11-16 + V + + + 19601116 + 19410723 + + + 2767GP + + Poolmanweg + 22 + + + + + + 1801 + + + + + 9406420424 + 995140038 + d96c084 + 8 + + 568cf + 1960-11-16 + V + + + 19410723 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000036.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000036.anon.xml index 5bb4817b8b..f11a4fdb97 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000036.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000036.anon.xml @@ -1,124 +1,91 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 201900000036 - 2019011416121600 - - W - I - 2019011416121600 - - - - - 7674337126 - 749421371 - a85deb0a1 - 6 - - 71525c823 - 2008-01-08 - V - - - 20080108 - 19410723 - - - 2710SR - - Achterbergweg - 15 - - - - - - 1801 - - - - - 7674337126 - 749421371 - a85deb0a1 - 6 - - 71525c823 - 2008-01-08 - V - - - 19410723 - 19600509 - - - 2724SK - - Lissenvaart - 51 - - - - - - 1801 - - - - - \ No newline at end of file + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000036 + 2019011416121600 + + W + I + 2019011416121600 + + + + + 7674337126 + 749421371 + a85deb0a1 + 6 + + 71525c823 + 2008-01-08 + V + + + 20080108 + 19410723 + + + 2710SR + + Achterbergweg + 15 + + + + + + 1801 + + + + + 7674337126 + 749421371 + a85deb0a1 + 6 + + 71525c823 + 2008-01-08 + V + + + 19410723 + 19600509 + + + 2724SK + + Lissenvaart + 51 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000037.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000037.anon.xml index 4e2bcf258f..cdcc7b2696 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000037.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000037.anon.xml @@ -1,127 +1,93 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 201900000037 - 2019011416122400 - - W - I - 2019011416122400 - - - - - 2678967915 - 355960378 - c9b5d70 - 0 - - 3879b76c - 1998-08-14 - V - 0 - - - 19980814 - 19600509 - - - 2753WG - - Wilgenlaan - 4 - - - - - - 1801 - - - - - 2678967915 - 355960378 - c9b5d70 - 0 - - 3879b76c - 1998-08-14 - V - 7 - - - 19980814 - 19600509 - - - 2753WG - - Wilgenlaan - 4 - - - - - - 1801 - - - - - \ No newline at end of file + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000037 + 2019011416122400 + + W + I + 2019011416122400 + + + + + 2678967915 + 355960378 + c9b5d70 + 0 + + 3879b76c + 1998-08-14 + V + 0 + + + 19980814 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + 2678967915 + 355960378 + c9b5d70 + 0 + + 3879b76c + 1998-08-14 + V + 7 + + + 19980814 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000038.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000038.anon.xml index 180d118450..e168b1fb3f 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000038.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000038.anon.xml @@ -1,164 +1,112 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 201900000038 - 2019011416123200 - - W - I - 2019011416123200 - - - - - 2842897910 - 017434635 - 390fe - 0 - - 0f2 - 2025-05-25 - V - - - 19450427 - 19600509 - - - 2753WG - - Wilgenlaan - 4 - - - - - - 1801 - - - - - - 2842897910 - 017434635 - 390fe - 0 - - 0f2 - 2025-05-25 - V - - - 19450427 - 19600509 - - - 2753WG - - Wilgenlaan - 4 - - - - - - 1801 - - - - 20110609 - - 19410723 - 19600509 - - - - - + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000038 + 2019011416123200 + + W + I + 2019011416123200 + + + + + 2842897910 + 017434635 + 390fe + 0 + + 0f2 + 2025-05-25 + V + + + 19450427 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + - - - 568cf - 1960-05-09 - - - - - \ No newline at end of file + + 2842897910 + 017434635 + 390fe + 0 + + 0f2 + 2025-05-25 + V + + + 19450427 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + 20110609 + + 19410723 + 19600509 + + + + + + + + 568cf + 1960-05-09 + + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000039.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000039.anon.xml index bddc09a669..4c3d14b3de 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000039.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000039.anon.xml @@ -1,121 +1,91 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 201900000039 - 2019011416124000 - - W - I - 2019011416124000 - - - - - 9304800390 - 734784828 - b3e e181d8c - 3e - - 80fd77f - 2005-07-28 - M - - - 19930618 - 19410723 - - - 3020HA - - Sequoialaan - 5 - c - - - - - 1801 - - - - - 9304800390 - 734784828 - b3e e181d8c - 3e - - 80fd77f - 2005-07-28 - M - - - 19410723 - 19600509 - - - 3020HA - - Sequoialaan - 29 - - - - - - 1801 - - - - - \ No newline at end of file + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000039 + 2019011416124000 + + W + I + 2019011416124000 + + + + + 9304800390 + 734784828 + b3e e181d8c + 3e + + 80fd77f + 2005-07-28 + M + + + 19930618 + 19410723 + + + 3020HA + + Sequoialaan + 5 + c + + + + + 1801 + + + + + 9304800390 + 734784828 + b3e e181d8c + 3e + + 80fd77f + 2005-07-28 + M + + + 19410723 + 19600509 + + + 3020HA + + Sequoialaan + 29 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_20190000003A.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_20190000003A.anon.xml index adf893b29b..9fda8fe18d 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_20190000003A.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_20190000003A.anon.xml @@ -1,127 +1,93 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 20190000003A - 2019011416124800 - - W - I - 2019011416124800 - - - - - 6763823555 - 377226361 - 8bc796 - 3 - - 534ae8f7c - 1989-08-05 - V - E - - - 19700309 - 19600509 - - - 1785LG - - A M v Voorthuijsenstr - 23 - - - - - - 1801 - - - - - 6763823555 - 377226361 - 8bc796 - 3 - - 534ae8f7c - 1989-08-05 - V - V - - - 19700309 - 19600509 - - - 1785LG - - A M v Voorthuijsenstr - 23 - - - - - - 1801 - - - - - \ No newline at end of file + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000003A + 2019011416124800 + + W + I + 2019011416124800 + + + + + 6763823555 + 377226361 + 8bc796 + 3 + + 534ae8f7c + 1989-08-05 + V + E + + + 19700309 + 19600509 + + + 1785LG + + A M v Voorthuijsenstr + 23 + + + + + + 1801 + + + + + 6763823555 + 377226361 + 8bc796 + 3 + + 534ae8f7c + 1989-08-05 + V + V + + + 19700309 + 19600509 + + + 1785LG + + A M v Voorthuijsenstr + 23 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_20190000003B.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_20190000003B.anon.xml index 6c9f11d208..3ab4c3bcd3 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_20190000003B.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_20190000003B.anon.xml @@ -1,164 +1,112 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 20190000003B - 2019011416125600 - - W - I - 2019011416125600 - - - - - 6763823555 - 377226361 - 8bc796 - 3 - - 534ae8f7c - 1989-08-05 - V - - - 19700309 - 19600509 - - - 1785LG - - A M v Voorthuijsenstr - 23 - - - - - - 1801 - - - - - - 6763823555 - 377226361 - 8bc796 - 3 - - 534ae8f7c - 1989-08-05 - V - - - 19700309 - 19600509 - - - 1785LG - - A M v Voorthuijsenstr - 23 - - - - - - 1801 - - - - 20110609 - - 19410723 - 19600509 - - - - - + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000003B + 2019011416125600 + + W + I + 2019011416125600 + + + + + 6763823555 + 377226361 + 8bc796 + 3 + + 534ae8f7c + 1989-08-05 + V + + + 19700309 + 19600509 + + + 1785LG + + A M v Voorthuijsenstr + 23 + + + + + + 1801 + + + - - - 8246a79 - 1960-05-09 - - - - - \ No newline at end of file + + 6763823555 + 377226361 + 8bc796 + 3 + + 534ae8f7c + 1989-08-05 + V + + + 19700309 + 19600509 + + + 1785LG + + A M v Voorthuijsenstr + 23 + + + + + + 1801 + + + + 20110609 + + 19410723 + 19600509 + + + + + + + + 8246a79 + 1960-05-09 + + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_20190000003C.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_20190000003C.anon.xml index f6e472e3c1..167d795a11 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_20190000003C.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_20190000003C.anon.xml @@ -1,164 +1,112 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 20190000003C - 2019011416130400 - - W - I - 2019011416130400 - - - - - 3850536601 - 615713666 - 4357a29dd8 - 8 - - 8246a79 - 2029-04-16 - M - - - 19521113 - 19600509 - - - 3053KG - - Karel de Grotestraat - 26 - - - - - - 1801 - - - - - - 3850536601 - 615713666 - 4357a29dd8 - 8 - - 8246a79 - 2029-04-16 - M - - - 19521113 - 19600509 - - - 3053KG - - Karel de Grotestraat - 26 - - - - - - 1801 - - - - 20110609 - - 19410723 - 19600509 - - - - - + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000003C + 2019011416130400 + + W + I + 2019011416130400 + + + + + 3850536601 + 615713666 + 4357a29dd8 + 8 + + 8246a79 + 2029-04-16 + M + + + 19521113 + 19600509 + + + 3053KG + + Karel de Grotestraat + 26 + + + + + + 1801 + + + - - - 534ae8f7c - 1960-05-09 - - - - - \ No newline at end of file + + 3850536601 + 615713666 + 4357a29dd8 + 8 + + 8246a79 + 2029-04-16 + M + + + 19521113 + 19600509 + + + 3053KG + + Karel de Grotestraat + 26 + + + + + + 1801 + + + + 20110609 + + 19410723 + 19600509 + + + + + + + + 534ae8f7c + 1960-05-09 + + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_20190000003D.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_20190000003D.anon.xml index b6c41420cd..5c3285a57e 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_20190000003D.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_20190000003D.anon.xml @@ -1,197 +1,131 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 20190000003D - 2019011416131200 - - W - I - 2019011416131200 - - - - - 7274687268 - 896760175 - 8b2394 1034f4 - fc - - 437138e - 1975-07-04 - M - - - 19561007 - 19600509 - - - 3019RP - - Piersonstraat - 7 - - - - - - 1801 - - - - 19810909 - 19600509 - - 20290424 - 19600509 - - - - - - - - c1b36d - 1960-05-09 - + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000003D + 2019011416131200 + + W + I + 2019011416131200 + + + + + 7274687268 + 896760175 + 8b2394 1034f4 + fc + + 437138e + 1975-07-04 + M + + + 19561007 + 19600509 + + + 3019RP + + Piersonstraat + 7 + + + + + + 1801 + + + + 19810909 + 19600509 + + 20290424 + 19600509 + + + + + + + + c1b36d + 1960-05-09 + + + - - - - 7274687268 - 896760175 - 8b2394 1034f4 - fc - - 437138e - 1975-07-04 - M - - - 19561007 - 19600509 - - - 3019RP - - Piersonstraat - 7 - - - - - - 1801 - - - - 19810909 - 20240430 - - 20290424 - 20240430 - - - - - - - - c1b36d - 1960-05-09 - + + 7274687268 + 896760175 + 8b2394 1034f4 + fc + + 437138e + 1975-07-04 + M + + + 19561007 + 19600509 + + + 3019RP + + Piersonstraat + 7 + + + + + + 1801 + + + + 19810909 + 20240430 + + 20290424 + 20240430 + + + + + + + + c1b36d + 1960-05-09 + + + - - - - \ No newline at end of file + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_20190000003E.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_20190000003E.anon.xml index d39bcd8a7b..f40841993b 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_20190000003E.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_20190000003E.anon.xml @@ -1,197 +1,131 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 20190000003E - 2019011416132000 - - W - I - 2019011416132000 - - - - - 2969431370 - 683962287 - 23948abf - 6 - - c1b36d - 1958-04-21 - V - - - 19561007 - 19600509 - - - 3019RP - - Piersonstraat - 7 - - - - - - 1801 - - - - 19810909 - 19600509 - - 20290424 - 19600509 - - - - - - - - 437138e - 1960-05-09 - + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000003E + 2019011416132000 + + W + I + 2019011416132000 + + + + + 2969431370 + 683962287 + 23948abf + 6 + + c1b36d + 1958-04-21 + V + + + 19561007 + 19600509 + + + 3019RP + + Piersonstraat + 7 + + + + + + 1801 + + + + 19810909 + 19600509 + + 20290424 + 19600509 + + + + + + + + 437138e + 1960-05-09 + + + - - - - 2969431370 - 683962287 - 23948abf - 6 - - c1b36d - 1958-04-21 - V - - - 19561007 - 19600509 - - - 3019RP - - Piersonstraat - 7 - - - - - - 1801 - - - - 19810909 - 20240430 - - 20290424 - 20240430 - - - - - - - - 437138e - 1960-05-09 - + + 2969431370 + 683962287 + 23948abf + 6 + + c1b36d + 1958-04-21 + V + + + 19561007 + 19600509 + + + 3019RP + + Piersonstraat + 7 + + + + + + 1801 + + + + 19810909 + 20240430 + + 20290424 + 20240430 + + + + + + + + 437138e + 1960-05-09 + + + - - - - \ No newline at end of file + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_20190000003F.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_20190000003F.anon.xml index 61539ec01b..1071b10537 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_20190000003F.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_20190000003F.anon.xml @@ -1,127 +1,93 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 20190000003F - 2019011417105600 - - W - I - 2019011417105600 - - - - - 2678967915 - 355960378 - c9b5d70 - 0 - - 3879b76c - 1998-08-14 - V - 7 - - - 19980814 - 19600509 - - - 2753WG - - Wilgenlaan - 4 - - - - - - 1801 - - - - - 2678967915 - 355960378 - c9b5d70 - 0 - - 3879b76c - 1998-08-14 - V - 0 - - - 19980814 - 19600509 - - - 2753WG - - Wilgenlaan - 4 - - - - - - 1801 - - - - - \ No newline at end of file + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000003F + 2019011417105600 + + W + I + 2019011417105600 + + + + + 2678967915 + 355960378 + c9b5d70 + 0 + + 3879b76c + 1998-08-14 + V + 7 + + + 19980814 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + 2678967915 + 355960378 + c9b5d70 + 0 + + 3879b76c + 1998-08-14 + V + 0 + + + 19980814 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_201900000040.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_201900000040.anon.xml index 3512ee7b72..7448a47022 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_201900000040.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_201900000040.anon.xml @@ -1,127 +1,93 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 201900000040 - 2019011417110300 - - W - I - 2019011417110300 - - - - - 0814678270 - 497919104 - e24e2 - 5 - - 3879b76c - 1941-07-24 - V - 1 - - - 19410724 - 19600509 - - - 2753WG - - Wilgenlaan - 4 - - - - - - 1801 - - - - - 0814678270 - 497919104 - e24e2 - 5 - - 3879b76c - 1941-07-24 - V - 0 - - - 19410724 - 19600509 - - - 2753WG - - Wilgenlaan - 4 - - - - - - 1801 - - - - - \ No newline at end of file + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000040 + 2019011417110300 + + W + I + 2019011417110300 + + + + + 0814678270 + 497919104 + e24e2 + 5 + + 3879b76c + 1941-07-24 + V + 1 + + + 19410724 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + 0814678270 + 497919104 + e24e2 + 5 + + 3879b76c + 1941-07-24 + V + 0 + + + 19410724 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_201900000041.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_201900000041.anon.xml index d551dcb5b7..d0e3c64fc9 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_201900000041.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_201900000041.anon.xml @@ -1,125 +1,93 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 201900000041 - 2019011417111100 - - W - I - 2019011417111100 - - - - - 7274687268 - 896760175 - 8b2394 1034f4 - fc - - 437138e - 1975-07-04 - M - G - - - 19561007 - 19600509 - - - 3019RP - - Piersonstraat - 7 - - - - - - 1801 - - - - - 7274687268 - 896760175 - 8b2394 1034f4 - fc - 95 - afafb - 1975-07-04 - M - - - - 19561007 - 19600509 - - - 3019RP - - Piersonstraat - 7 - - - - - - 1801 - - - - - \ No newline at end of file + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000041 + 2019011417111100 + + W + I + 2019011417111100 + + + + + 7274687268 + 896760175 + 8b2394 1034f4 + fc + + 437138e + 1975-07-04 + M + G + + + 19561007 + 19600509 + + + 3019RP + + Piersonstraat + 7 + + + + + + 1801 + + + + + 7274687268 + 896760175 + 8b2394 1034f4 + fc + 95 + afafb + 1975-07-04 + M + + + + 19561007 + 19600509 + + + 3019RP + + Piersonstraat + 7 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_201900000042.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_201900000042.anon.xml index 6a682ba405..6f3984b2c3 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_201900000042.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_201900000042.anon.xml @@ -1,122 +1,91 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 201900000042 - 2019011417111900 - - W - I - 2019011417111900 - - - - - 7128413151 - 783340266 - 16d95b5 - b - - 437138e - 1992-06-13 - V - - - 19920613 - 19600509 - - - 3019RP - - Piersonstraat - 7 - - - - - - 1801 - - - - - 7128413151 - 783340266 - 16d95b5 - b - 95 - afafb - 1992-06-13 - V - - - 19920613 - 19600509 - - - 3019RP - - Piersonstraat - 7 - - - - - - 1801 - - - - - \ No newline at end of file + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000042 + 2019011417111900 + + W + I + 2019011417111900 + + + + + 7128413151 + 783340266 + 16d95b5 + b + + 437138e + 1992-06-13 + V + + + 19920613 + 19600509 + + + 3019RP + + Piersonstraat + 7 + + + + + + 1801 + + + + + 7128413151 + 783340266 + 16d95b5 + b + 95 + afafb + 1992-06-13 + V + + + 19920613 + 19600509 + + + 3019RP + + Piersonstraat + 7 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_201900000043.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_201900000043.anon.xml index ac6ea9efdd..5ee58e7720 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_201900000043.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_201900000043.anon.xml @@ -1,122 +1,91 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 201900000043 - 2019011417112700 - - W - I - 2019011417112700 - - - - - 3087970133 - 919965111 - bb866 - 8 - - 437138e - 1992-06-13 - V - - - 19920613 - 19600509 - - - 3019RP - - Piersonstraat - 7 - - - - - - 1801 - - - - - 3087970133 - 919965111 - bb866 - 8 - 95 - afafb - 1992-06-13 - V - - - 19920613 - 19600509 - - - 3019RP - - Piersonstraat - 7 - - - - - - 1801 - - - - - \ No newline at end of file + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000043 + 2019011417112700 + + W + I + 2019011417112700 + + + + + 3087970133 + 919965111 + bb866 + 8 + + 437138e + 1992-06-13 + V + + + 19920613 + 19600509 + + + 3019RP + + Piersonstraat + 7 + + + + + + 1801 + + + + + 3087970133 + 919965111 + bb866 + 8 + 95 + afafb + 1992-06-13 + V + + + 19920613 + 19600509 + + + 3019RP + + Piersonstraat + 7 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_201900000044.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_201900000044.anon.xml index 9206381a2a..d11b6bbea2 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_201900000044.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_201900000044.anon.xml @@ -1,122 +1,91 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 201900000044 - 2019011417113400 - - W - I - 2019011417113400 - - - - - 6433621730 - 094368468 - 10035d - 6 - - 437138e - 1992-06-13 - V - - - 19920613 - 19600509 - - - 3019RP - - Piersonstraat - 7 - - - - - - 1801 - - - - - 6433621730 - 094368468 - 10035d - 6 - 95 - afafb - 1992-06-13 - V - - - 19920613 - 19600509 - - - 3019RP - - Piersonstraat - 7 - - - - - - 1801 - - - - - \ No newline at end of file + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000044 + 2019011417113400 + + W + I + 2019011417113400 + + + + + 6433621730 + 094368468 + 10035d + 6 + + 437138e + 1992-06-13 + V + + + 19920613 + 19600509 + + + 3019RP + + Piersonstraat + 7 + + + + + + 1801 + + + + + 6433621730 + 094368468 + 10035d + 6 + 95 + afafb + 1992-06-13 + V + + + 19920613 + 19600509 + + + 3019RP + + Piersonstraat + 7 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_201900000045.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_201900000045.anon.xml index 0c421ddab8..f2ffc83530 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_201900000045.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_201900000045.anon.xml @@ -1,192 +1,131 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 201900000045 - 2019011417114200 - - W - I - 2019011417114200 - - - - - 2969431370 - 683962287 - 23948abf - 6 - - c1b36d - 1958-04-21 - V - - - 19561007 - 19600509 - - - 3019RP - - Piersonstraat - 7 - - - - - - 1801 - - - - 19810909 - 20240430 - - 20290424 - 20240430 - - - - - - - - 437138e - 1960-05-09 - + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000045 + 2019011417114200 + + W + I + 2019011417114200 + + + + + 2969431370 + 683962287 + 23948abf + 6 + + c1b36d + 1958-04-21 + V + + + 19561007 + 19600509 + + + 3019RP + + Piersonstraat + 7 + + + + + + 1801 + + + + 19810909 + 20240430 + + 20290424 + 20240430 + + + + + + + + 437138e + 1960-05-09 + + + - - - - 2969431370 - 683962287 - 23948abf - 6 - - c1b36d - 1958-04-21 - V - - - 19561007 - 19600509 - - - 3019RP - - Piersonstraat - 7 - - - - - - 1801 - - - - 19810909 - 20240430 - - 20290424 - 20240430 - - - - - - - 95 - afafb - 1960-05-09 - + + 2969431370 + 683962287 + 23948abf + 6 + + c1b36d + 1958-04-21 + V + + + 19561007 + 19600509 + + + 3019RP + + Piersonstraat + 7 + + + + + + 1801 + + + + 19810909 + 20240430 + + 20290424 + 20240430 + + + + + + + 95 + afafb + 1960-05-09 + + + - - - - \ No newline at end of file + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_201900000046.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_201900000046.anon.xml index 4bded793b9..272e86a2d0 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_201900000046.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_201900000046.anon.xml @@ -1,191 +1,131 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 201900000046 - 2019011417262200 - - W - I - 2019011417262200 - - - - - 3169200703 - 584407993 - 04c44364e2 - 5 - 970 - a5e93 c5d7 503fd0 - 2004-03-14 - V - - - 20030129 - 19600509 - - - 3019RT - - Thorbeckestraat - 5 - - - - - - 1801 - - - - 19930425 - 19600509 - - 20030129 - 19600509 - - - - - - - - 80fd77f - 1960-05-09 - + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000046 + 2019011417262200 + + W + I + 2019011417262200 + + + + + 3169200703 + 584407993 + 04c44364e2 + 5 + 970 + a5e93 c5d7 503fd0 + 2004-03-14 + V + + + 20030129 + 19600509 + + + 3019RT + + Thorbeckestraat + 5 + + + + + + 1801 + + + + 19930425 + 19600509 + + 20030129 + 19600509 + + + + + + + + 80fd77f + 1960-05-09 + + + - - - - 3169200703 - 584407993 - 04c44364e2 - 5 - 970 - a5e93 c5d7 503fd0 - 2004-03-14 - V - - - 20030129 - 19600509 - - - 3019RT - - Thorbeckestraat - 5 - - - - - - 1801 - - - - 19930425 - 19410723 - - 20030129 - 19410723 - - - - - - - - 80fd77f - 1960-05-09 - + + 3169200703 + 584407993 + 04c44364e2 + 5 + 970 + a5e93 c5d7 503fd0 + 2004-03-14 + V + + + 20030129 + 19600509 + + + 3019RT + + Thorbeckestraat + 5 + + + + + + 1801 + + + + 19930425 + 19410723 + + 20030129 + 19410723 + + + + + + + + 80fd77f + 1960-05-09 + + + - - - - \ No newline at end of file + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_201900000047.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_201900000047.anon.xml index eeff650d5b..89f9c707ed 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_201900000047.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_201900000047.anon.xml @@ -1,197 +1,131 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 201900000047 - 2019011417263000 - - W - I - 2019011417263000 - - - - - 3056876036 - 902215443 - 7f74d7 - 5 - - 568cf - 2003-01-15 - M - - - 19410723 - 19600509 - - - 2753WG - - Wilgenlaan - 4 - - - - - - 1801 - - - - 20110609 - 19600509 - - 19410723 - 19600509 - - - - - - - - 0f2 - 1960-05-09 - + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000047 + 2019011417263000 + + W + I + 2019011417263000 + + + + + 3056876036 + 902215443 + 7f74d7 + 5 + + 568cf + 2003-01-15 + M + + + 19410723 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + 20110609 + 19600509 + + 19410723 + 19600509 + + + + + + + + 0f2 + 1960-05-09 + + + - - - - 3056876036 - 902215443 - 7f74d7 - 5 - - 568cf - 2003-01-15 - M - - - 19410723 - 19600509 - - - 2753WG - - Wilgenlaan - 4 - - - - - - 1801 - - - - 20110609 - 19410723 - - 19410723 - 19410723 - - - - - - - - 0f2 - 1960-05-09 - + + 3056876036 + 902215443 + 7f74d7 + 5 + + 568cf + 2003-01-15 + M + + + 19410723 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + 20110609 + 19410723 + + 19410723 + 19410723 + + + + + + + + 0f2 + 1960-05-09 + + + - - - - \ No newline at end of file + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_201900000048.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_201900000048.anon.xml index 9312aedd1e..8ea451f253 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_201900000048.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_201900000048.anon.xml @@ -1,140 +1,97 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 201900000048 - 2019011417263800 - - W - I - 2019011417263800 - - - - - 3056876036 - 902215443 - 7f74d7 - 5 - - 568cf - 2003-01-15 - M - 1960-05-09 - - - - - 19410723 - 19600509 - - - 2753WG - - Wilgenlaan - 4 - - - - - - 1801 - - - - - 3056876036 - 902215443 - 7f74d7 - 5 - - 568cf - 2003-01-15 - M - 1941-07-23 - - - - - 19410723 - 19600509 - - - 2753WG - - Wilgenlaan - 4 - - - - - - 1801 - - - - - \ No newline at end of file + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000048 + 2019011417263800 + + W + I + 2019011417263800 + + + + + 3056876036 + 902215443 + 7f74d7 + 5 + + 568cf + 2003-01-15 + M + 1960-05-09 + + + + + 19410723 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + 3056876036 + 902215443 + 7f74d7 + 5 + + 568cf + 2003-01-15 + M + 1941-07-23 + + + + + 19410723 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_201900000049.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_201900000049.anon.xml index 7124691ac0..04f2e129cb 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_201900000049.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_201900000049.anon.xml @@ -1,124 +1,91 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 201900000049 - 2019011417264600 - - W - I - 2019011417264600 - - - - - 9406420424 - 995140038 - d96c084 - 8 - - 568cf - 1960-11-16 - V - - - 19410723 - 19410723 - - - 2753WG - - Wilgenlaan - 4 - - - - - - 1801 - - - - - 9406420424 - 995140038 - d96c084 - 8 - - 568cf - 1960-11-16 - V - - - 19410723 - 19600509 - - - 1785LG - - A M v Voorthuijsenstr - 1 - - - - - - 1801 - - - - - \ No newline at end of file + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000049 + 2019011417264600 + + W + I + 2019011417264600 + + + + + 9406420424 + 995140038 + d96c084 + 8 + + 568cf + 1960-11-16 + V + + + 19410723 + 19410723 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + 9406420424 + 995140038 + d96c084 + 8 + + 568cf + 1960-11-16 + V + + + 19410723 + 19600509 + + + 1785LG + + A M v Voorthuijsenstr + 1 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_20190000004A.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_20190000004A.anon.xml index 03b06a1cb5..902e4a6099 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_20190000004A.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_20190000004A.anon.xml @@ -1,119 +1,91 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 20190000004A - 2019011417265400 - - C - I - 2019011417265400 - - - - - 2422002328 - 637352461 - 818b - 5 - 95 - 20f - 1977-10-13 - M - - - 19991023 - 19600509 - - - 2713PA - - Mañanalaan - 95 - - - - - - 1801 - - - - - 2422002328 - 637352461 - 818b - 5 - 95 - 20f - 1977-10-13 - M - - - 19991023 - 19600509 - - - 2713PA - - Mañanalaan - 95 - - - - - - 1801 - - - - - \ No newline at end of file + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000004A + 2019011417265400 + + C + I + 2019011417265400 + + + + + 2422002328 + 637352461 + 818b + 5 + 95 + 20f + 1977-10-13 + M + + + 19991023 + 19600509 + + + 2713PA + + Mañanalaan + 95 + + + + + + 1801 + + + + + 2422002328 + 637352461 + 818b + 5 + 95 + 20f + 1977-10-13 + M + + + 19991023 + 19600509 + + + 2713PA + + Mañanalaan + 95 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_20190000004B.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_20190000004B.anon.xml index 43414bcb4c..afb3053046 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_20190000004B.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_20190000004B.anon.xml @@ -1,126 +1,93 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 20190000004B - 2019011417270200 - - W - I - 2019011417270200 - - - - - 8844739345 - 440019134 - bf4d d6bd9 28575 - d47 - - 33bdf4 - 2020-07-17 - V - 1801 - - - 19920128 - 19410723 - - - 2724SK - - Lissenvaart - 51 - - - - - - 1801 - - - - - 8844739345 - 440019134 - bf4d d6bd9 28575 - d47 - - 33bdf4 - 2020-07-17 - V - 1802 - - - 19410723 - 19600509 - - - 7684KI - - Apeldoornseweg - 83 - - - - - - 1802 - - - - - \ No newline at end of file + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000004B + 2019011417270200 + + W + I + 2019011417270200 + + + + + 8844739345 + 440019134 + bf4d d6bd9 28575 + d47 + + 33bdf4 + 2020-07-17 + V + 1801 + + + 19920128 + 19410723 + + + 2724SK + + Lissenvaart + 51 + + + + + + 1801 + + + + + 8844739345 + 440019134 + bf4d d6bd9 28575 + d47 + + 33bdf4 + 2020-07-17 + V + 1802 + + + 19410723 + 19600509 + + + 7684KI + + Apeldoornseweg + 83 + + + + + + 1802 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_20190000004C.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_20190000004C.anon.xml index 1b03e74745..1b7f027b3e 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_20190000004C.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_20190000004C.anon.xml @@ -1,124 +1,91 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 20190000004C - 2019011417271000 - - W - I - 2019011417271000 - - - - - 2678967915 - 355960378 - c9b5d70 - 0 - - 3879b76c - 1998-08-14 - V - - - 19980814 - 19410723 - - - 2753WG - - Wilgenlaan - 4 - - - - - - 1801 - - - - - 2678967915 - 355960378 - c9b5d70 - 0 - - 3879b76c - 1998-08-14 - V - - - 19410723 - 19600509 - - - 1785LG - - A M v Voorthuijsenstr - 1 - - - - - - 1801 - - - - - \ No newline at end of file + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000004C + 2019011417271000 + + W + I + 2019011417271000 + + + + + 2678967915 + 355960378 + c9b5d70 + 0 + + 3879b76c + 1998-08-14 + V + + + 19980814 + 19410723 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + 2678967915 + 355960378 + c9b5d70 + 0 + + 3879b76c + 1998-08-14 + V + + + 19410723 + 19600509 + + + 1785LG + + A M v Voorthuijsenstr + 1 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_20190000004D.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_20190000004D.anon.xml index 7f02136b6a..fbc4d8f916 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_20190000004D.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_20190000004D.anon.xml @@ -1,124 +1,91 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 20190000004D - 2019011417271800 - - W - I - 2019011417271800 - - - - - 0814678270 - 497919104 - e24e2 - 5 - - 3879b76c - 1941-07-24 - V - - - 19410724 - 19410723 - - - 2753WG - - Wilgenlaan - 4 - - - - - - 1801 - - - - - 0814678270 - 497919104 - e24e2 - 5 - - 3879b76c - 1941-07-24 - V - - - 19410723 - 19600509 - - - 1785LG - - A M v Voorthuijsenstr - 1 - - - - - - 1801 - - - - - \ No newline at end of file + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000004D + 2019011417271800 + + W + I + 2019011417271800 + + + + + 0814678270 + 497919104 + e24e2 + 5 + + 3879b76c + 1941-07-24 + V + + + 19410724 + 19410723 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + 0814678270 + 497919104 + e24e2 + 5 + + 3879b76c + 1941-07-24 + V + + + 19410723 + 19600509 + + + 1785LG + + A M v Voorthuijsenstr + 1 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_20190000004E.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_20190000004E.anon.xml index 8efd7e9ace..cefd9eca49 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_20190000004E.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_20190000004E.anon.xml @@ -1,124 +1,91 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 20190000004E - 2019011417272600 - - W - I - 2019011417272600 - - - - - 8222536691 - 398069336 - d01926a - d - - 3879b76c - 1989-07-11 - V - - - 19890711 - 19410723 - - - 2753WG - - Wilgenlaan - 4 - - - - - - 1801 - - - - - 8222536691 - 398069336 - d01926a - d - - 3879b76c - 1989-07-11 - V - - - 19410723 - 19600509 - - - 1785LG - - A M v Voorthuijsenstr - 1 - - - - - - 1801 - - - - - \ No newline at end of file + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000004E + 2019011417272600 + + W + I + 2019011417272600 + + + + + 8222536691 + 398069336 + d01926a + d + + 3879b76c + 1989-07-11 + V + + + 19890711 + 19410723 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + 8222536691 + 398069336 + d01926a + d + + 3879b76c + 1989-07-11 + V + + + 19410723 + 19600509 + + + 1785LG + + A M v Voorthuijsenstr + 1 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_20190000004F.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_20190000004F.anon.xml index c49b78072e..aca25fa7d2 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_20190000004F.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_20190000004F.anon.xml @@ -1,197 +1,131 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 20190000004F - 2019011417273400 - - W - I - 2019011417273400 - - - - - 2842897910 - 017434635 - 390fe - 0 - - 0f2 - 2025-05-25 - V - - - 19450427 - 19600509 - - - 2753WG - - Wilgenlaan - 4 - - - - - - 1801 - - - - 20110609 - 19600509 - - 19410723 - 19600509 - - - - - - - - 568cf - 1960-05-09 - + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000004F + 2019011417273400 + + W + I + 2019011417273400 + + + + + 2842897910 + 017434635 + 390fe + 0 + + 0f2 + 2025-05-25 + V + + + 19450427 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + 20110609 + 19600509 + + 19410723 + 19600509 + + + + + + + + 568cf + 1960-05-09 + + + - - - - 2842897910 - 017434635 - 390fe - 0 - - 0f2 - 2025-05-25 - V - - - 19450427 - 19600509 - - - 2753WG - - Wilgenlaan - 4 - - - - - - 1801 - - - - 20110609 - 19410723 - - 19410723 - 19410723 - - - - - - - - 568cf - 1960-05-09 - + + 2842897910 + 017434635 + 390fe + 0 + + 0f2 + 2025-05-25 + V + + + 19450427 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + 20110609 + 19410723 + + 19410723 + 19410723 + + + + + + + + 568cf + 1960-05-09 + + + - - - - \ No newline at end of file + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_201900000050.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_201900000050.anon.xml index 5657a5755e..530432ac57 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_201900000050.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_201900000050.anon.xml @@ -1,140 +1,97 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 201900000050 - 2019011417274200 - - W - I - 2019011417274200 - - - - - 2842897910 - 017434635 - 390fe - 0 - - 0f2 - 2025-05-25 - V - 1960-05-09 - - - - - 19450427 - 19600509 - - - 2753WG - - Wilgenlaan - 4 - - - - - - 1801 - - - - - 2842897910 - 017434635 - 390fe - 0 - - 0f2 - 2025-05-25 - V - 1941-07-23 - - - - - 19450427 - 19600509 - - - 2753WG - - Wilgenlaan - 4 - - - - - - 1801 - - - - - \ No newline at end of file + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000050 + 2019011417274200 + + W + I + 2019011417274200 + + + + + 2842897910 + 017434635 + 390fe + 0 + + 0f2 + 2025-05-25 + V + 1960-05-09 + + + + + 19450427 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + 2842897910 + 017434635 + 390fe + 0 + + 0f2 + 2025-05-25 + V + 1941-07-23 + + + + + 19450427 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_201900000051.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_201900000051.anon.xml index ec2f495aad..8d8355b039 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_201900000051.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_201900000051.anon.xml @@ -1,140 +1,97 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 201900000051 - 2019011417275000 - - W - I - 2019011417275000 - - - - - 9304800390 - 734784828 - b3e e181d8c - 3e - - 80fd77f - 2005-07-28 - M - 1960-05-09 - - - - - 19410723 - 19600509 - - - 3020HA - - Sequoialaan - 29 - - - - - - 1801 - - - - - 9304800390 - 734784828 - b3e e181d8c - 3e - - 80fd77f - 2005-07-28 - M - 1941-07-23 - - - - - 19410723 - 19600509 - - - 3020HA - - Sequoialaan - 29 - - - - - - 1801 - - - - - \ No newline at end of file + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000051 + 2019011417275000 + + W + I + 2019011417275000 + + + + + 9304800390 + 734784828 + b3e e181d8c + 3e + + 80fd77f + 2005-07-28 + M + 1960-05-09 + + + + + 19410723 + 19600509 + + + 3020HA + + Sequoialaan + 29 + + + + + + 1801 + + + + + 9304800390 + 734784828 + b3e e181d8c + 3e + + 80fd77f + 2005-07-28 + M + 1941-07-23 + + + + + 19410723 + 19600509 + + + 3020HA + + Sequoialaan + 29 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000000.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000000.anon.xml index 39eb227804..e57eefdda3 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000000.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000000.anon.xml @@ -1,124 +1,86 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 201900000000 - 2019011415491600 - - T - I - 2019011415491600 - - - - - 1153283835 - 195616527 - - - - 59de7 83 e01b 58 9812b - 1996-10-08 - V - 0 - 1801 - - E - - - 19850330 - 19600509 - - - 2571AA - - v Voerst v Lyndenstr - 10 - - - - - - 1801 - - - - 20050811 - - 19410813 - 19600509 - - - - - - - - 84c97b1e - 1960-05-09 - + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000000 + 2019011415491600 + + T + I + 2019011415491600 + + + + + 1153283835 + 195616527 + + + + 59de7 83 e01b 58 9812b + 1996-10-08 + V + 0 + 1801 + + E + + + 19850330 + 19600509 + + + 2571AA + + v Voerst v Lyndenstr + 10 + + + + + + 1801 + + + + 20050811 + + 19410813 + 19600509 + + + + + + + + 84c97b1e + 1960-05-09 + + + - - - - \ No newline at end of file + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000001.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000001.anon.xml index cd4db91878..488b22af31 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000001.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000001.anon.xml @@ -1,116 +1,86 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 201900000001 - 2019011415492400 - - T - I - 2019011415492400 - - - - - 2861888781 - 093735639 - dd75d5981 231e5 - cf - - d34ce8 - 1958-06-21 - V - 0 - 1801 - - V - - - 19381011 - 19600509 - - - 2593BP - - Laan v Nieuw Oost-Indië - 210 - - - - - - 1801 - - - - 20190115 - - 19600509 - 20190115 - - - - - - - 51a - 00d5d - 1960-05-09 - + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000001 + 2019011415492400 + + T + I + 2019011415492400 + + + + + 2861888781 + 093735639 + dd75d5981 231e5 + cf + + d34ce8 + 1958-06-21 + V + 0 + 1801 + + V + + + 19381011 + 19600509 + + + 2593BP + + Laan v Nieuw Oost-Indië + 210 + + + + + + 1801 + + + + 20190115 + + 19600509 + 20190115 + + + + + + + 51a + 00d5d + 1960-05-09 + + + - - - - \ No newline at end of file + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000002.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000002.anon.xml index 277841527f..1399ef51f9 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000002.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000002.anon.xml @@ -1,80 +1,66 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 201900000002 - 2019011415493200 - - T - I - 2019011415493200 - - - - - 7128413151 - 783340266 - 16d95b5 - b - - 437138e - 1992-06-13 - V - 0 - 1801 - E - - - 19920613 - 19600509 - - - 3019RP - - Piersonstraat - 7 - - - - - - 1801 - - - - - \ No newline at end of file + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000002 + 2019011415493200 + + T + I + 2019011415493200 + + + + + 7128413151 + 783340266 + 16d95b5 + b + + 437138e + 1992-06-13 + V + 0 + 1801 + E + + + 19920613 + 19600509 + + + 3019RP + + Piersonstraat + 7 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000003.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000003.anon.xml index 89db13c2c9..700a44d61b 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000003.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000003.anon.xml @@ -1,80 +1,66 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 201900000003 - 2019011415494000 - - T - I - 2019011415494000 - - - - - 0814678270 - 497919104 - e24e2 - 5 - - 3879b76c - 1941-07-24 - V - 0 - 1801 - E - - - 19410724 - 19600509 - - - 2753WG - - Wilgenlaan - 4 - - - - - - 1801 - - - - - \ No newline at end of file + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000003 + 2019011415494000 + + T + I + 2019011415494000 + + + + + 0814678270 + 497919104 + e24e2 + 5 + + 3879b76c + 1941-07-24 + V + 0 + 1801 + E + + + 19410724 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000004.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000004.anon.xml index 002de34c5b..14ace82dd9 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000004.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000004.anon.xml @@ -1,80 +1,66 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 201900000004 - 2019011415494800 - - T - I - 2019011415494800 - - - - - 8222536691 - 398069336 - d01926a - d - - 3879b76c - 1989-07-11 - V - 0 - 1801 - E - - - 19890711 - 19600509 - - - 2753WG - - Wilgenlaan - 4 - - - - - - 1801 - - - - - \ No newline at end of file + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000004 + 2019011415494800 + + T + I + 2019011415494800 + + + + + 8222536691 + 398069336 + d01926a + d + + 3879b76c + 1989-07-11 + V + 0 + 1801 + E + + + 19890711 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000005.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000005.anon.xml index d31643a432..920834b735 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000005.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000005.anon.xml @@ -1,113 +1,86 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 201900000005 - 2019011415495700 - - T - I - 2019011415495700 - - - - - 3169200703 - 584407993 - 04c44364e2 - 5 - 970 - a5e93 c5d7 503fd0 - 2004-03-14 - V - 0 - JV - 1801 - E - - - 20030129 - 19600509 - - - 3019RT - - Thorbeckestraat - 5 - - - - - - 1801 - - - - 19930425 - - 20030129 - 19600509 - - - - - - - - 80fd77f - 1960-05-09 - + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000005 + 2019011415495700 + + T + I + 2019011415495700 + + + + + 3169200703 + 584407993 + 04c44364e2 + 5 + 970 + a5e93 c5d7 503fd0 + 2004-03-14 + V + 0 + JV + 1801 + E + + + 20030129 + 19600509 + + + 3019RT + + Thorbeckestraat + 5 + + + + + + 1801 + + + + 19930425 + + 20030129 + 19600509 + + + + + + + + 80fd77f + 1960-05-09 + + + - - - - \ No newline at end of file + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000006.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000006.anon.xml index fa2b610c09..328eac9b5e 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000006.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000006.anon.xml @@ -1,74 +1,66 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 201900000006 - 2019011415500500 - - T - I - 2019011415500500 - - - - - 0491849700 - 917760778 - d5eef8 - 8 - - e8da590 - 1997-05-29 - V - 0 - 1801 - E - - - 19970529 - 19600509 - - - 1011RE - - Jonas Daniël Meijerplein - 11 - A - III - - - - 1801 - - - - - \ No newline at end of file + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000006 + 2019011415500500 + + T + I + 2019011415500500 + + + + + 0491849700 + 917760778 + d5eef8 + 8 + + e8da590 + 1997-05-29 + V + 0 + 1801 + E + + + 19970529 + 19600509 + + + 1011RE + + Jonas Daniël Meijerplein + 11 + A + III + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000007.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000007.anon.xml index a144b3a32d..5aebee2d4e 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000007.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000007.anon.xml @@ -1,110 +1,85 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 201900000007 - 2019011415501300 - - T - I - 2019011415501300 - - - - - 3156735539 - 242708704 - 2b77f2e - 0 - 8a8 - ae0d2b1 - 2008-06-04 - V - 0 - 1801 - E - - - 20130616 - 19600509 - - - 2724SK - - Lissenvaart - 51 - - - - - - 1801 - - - - 19410516 - - 19600509 - 19410516 - - - - - - - 2d - 6687d - 1960-05-09 - + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000007 + 2019011415501300 + + T + I + 2019011415501300 + + + + + 3156735539 + 242708704 + 2b77f2e + 0 + 8a8 + ae0d2b1 + 2008-06-04 + V + 0 + 1801 + E + + + 20130616 + 19600509 + + + 2724SK + + Lissenvaart + 51 + + + + + + 1801 + + + + 19410516 + + 19600509 + 19410516 + + + + + + + 2d + 6687d + 1960-05-09 + + + - - - - \ No newline at end of file + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000008.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000008.anon.xml index e7b829b1f2..0a4dda3dfd 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000008.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000008.anon.xml @@ -1,115 +1,85 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 201900000008 - 2019011415502100 - - T - I - 2019011415502100 - - - - - 9221555535 - 065596429 - 9e961 - 6 - - 71525c823 - 2015-08-19 - M - 0 - 1801 - E - - - 20270322 - 19600509 - - - 2710SR - - Achterbergweg - 15 - - - - - - 1801 - - - - 19780310 - - 20270322 - 19600509 - - - - - - - - c8cf7e - 1960-05-09 - + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000008 + 2019011415502100 + + T + I + 2019011415502100 + + + + + 9221555535 + 065596429 + 9e961 + 6 + + 71525c823 + 2015-08-19 + M + 0 + 1801 + E + + + 20270322 + 19600509 + + + 2710SR + + Achterbergweg + 15 + + + + + + 1801 + + + + 19780310 + + 20270322 + 19600509 + + + + + + + + c8cf7e + 1960-05-09 + + + - - - - \ No newline at end of file + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000009.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000009.anon.xml index 87742953e0..b8d277af7a 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000009.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000009.anon.xml @@ -1,83 +1,67 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 201900000009 - 2019011415502900 - - T - I - 2019011415502900 - - - - - 4190218146 - 237931115 - fd9c6c - 5 - - fea619c9c - 1970-10-27 - M - 0 - 1801 - - E - - - 20020102 - 19600509 - - - 1425SG - - Gen Karel vd Heydenln - 43 - - - - - - 1801 - - - - - \ No newline at end of file + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000009 + 2019011415502900 + + T + I + 2019011415502900 + + + + + 4190218146 + 237931115 + fd9c6c + 5 + + fea619c9c + 1970-10-27 + M + 0 + 1801 + + E + + + 20020102 + 19600509 + + + 1425SG + + Gen Karel vd Heydenln + 43 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000000A.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000000A.anon.xml index 65b5bff846..76f41f3458 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000000A.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000000A.anon.xml @@ -1,80 +1,66 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 20190000000A - 2019011415503700 - - T - I - 2019011415503700 - - - - - 1913118637 - 306472837 - f0365 - 6 - - 534ae8f7c - 1987-09-06 - M - 0 - 1801 - E - - - 19870906 - 19600509 - - - 1785LG - - A M v Voorthuijsenstr - 23 - - - - - - 1801 - - - - - \ No newline at end of file + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000000A + 2019011415503700 + + T + I + 2019011415503700 + + + + + 1913118637 + 306472837 + f0365 + 6 + + 534ae8f7c + 1987-09-06 + M + 0 + 1801 + E + + + 19870906 + 19600509 + + + 1785LG + + A M v Voorthuijsenstr + 23 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000000B.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000000B.anon.xml index cf91c10447..f52f852e76 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000000B.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000000B.anon.xml @@ -1,113 +1,85 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 20190000000B - 2019011415504500 - - T - I - 2019011415504500 - - - - - 8844739345 - 440019134 - bf4d d6bd9 28575 - d47 - - 33bdf4 - 2020-07-17 - V - 0 - 1801 - E - - - 19920128 - 19600509 - - - 2724SK - - Lissenvaart - 51 - - - - - - 1801 - - - - 20171006 - - 19600509 - 20171006 - - - - - - - 95 - d4fe9 - 1960-05-09 - + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000000B + 2019011415504500 + + T + I + 2019011415504500 + + + + + 8844739345 + 440019134 + bf4d d6bd9 28575 + d47 + + 33bdf4 + 2020-07-17 + V + 0 + 1801 + E + + + 19920128 + 19600509 + + + 2724SK + + Lissenvaart + 51 + + + + + + 1801 + + + + 20171006 + + 19600509 + 20171006 + + + + + + + 95 + d4fe9 + 1960-05-09 + + + - - - - \ No newline at end of file + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000000C.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000000C.anon.xml index 114c7a4200..87c5e6f666 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000000C.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000000C.anon.xml @@ -1,80 +1,66 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 20190000000C - 2019011415505200 - - T - I - 2019011415505200 - - - - - 3087970133 - 919965111 - bb866 - 8 - - 437138e - 1992-06-13 - V - 0 - 1801 - E - - - 19920613 - 19600509 - - - 3019RP - - Piersonstraat - 7 - - - - - - 1801 - - - - - \ No newline at end of file + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000000C + 2019011415505200 + + T + I + 2019011415505200 + + + + + 3087970133 + 919965111 + bb866 + 8 + + 437138e + 1992-06-13 + V + 0 + 1801 + E + + + 19920613 + 19600509 + + + 3019RP + + Piersonstraat + 7 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000000D.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000000D.anon.xml index a5e75ace13..8f20c53953 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000000D.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000000D.anon.xml @@ -1,80 +1,66 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 20190000000D - 2019011415510000 - - T - I - 2019011415510000 - - - - - 9406420424 - 995140038 - d96c084 - 8 - - 568cf - 1960-11-16 - V - 0 - 1801 - E - - - 19601116 - 19600509 - - - 2767GP - - Poolmanweg - 22 - - - - - - 1801 - - - - - \ No newline at end of file + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000000D + 2019011415510000 + + T + I + 2019011415510000 + + + + + 9406420424 + 995140038 + d96c084 + 8 + + 568cf + 1960-11-16 + V + 0 + 1801 + E + + + 19601116 + 19600509 + + + 2767GP + + Poolmanweg + 22 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000000E.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000000E.anon.xml index cb5a4d6ca4..231792cf85 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000000E.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000000E.anon.xml @@ -1,112 +1,85 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 20190000000E - 2019011415510800 - - T - I - 2019011415510800 - - - - - 9304800390 - 734784828 - b3e e181d8c - 3e - - 80fd77f - 2005-07-28 - M - 0 - 1801 - E - - - 20210612 - 19600509 - - - 3019RT - - Thorbeckestraat - 5 - - - - - - 1801 - - - - 19930425 - - 20030129 - 19600509 - - - - - - - 970 - a5e93 c5d7 503fd0 - 1960-05-09 - + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000000E + 2019011415510800 + + T + I + 2019011415510800 + + + + + 9304800390 + 734784828 + b3e e181d8c + 3e + + 80fd77f + 2005-07-28 + M + 0 + 1801 + E + + + 20210612 + 19600509 + + + 3019RT + + Thorbeckestraat + 5 + + + + + + 1801 + + + + 19930425 + + 20030129 + 19600509 + + + + + + + 970 + a5e93 c5d7 503fd0 + 1960-05-09 + + + - - - - \ No newline at end of file + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000000F.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000000F.anon.xml index 55349d4798..ee6600228b 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000000F.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000000F.anon.xml @@ -1,80 +1,66 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 20190000000F - 2019011415511600 - - T - I - 2019011415511600 - - - - - 3608087947 - 698393536 - 38d8aa - f - - 2c56 - 1986-05-12 - M - 0 - 1801 - E - - - 19860512 - 19600509 - - - 2712AD - - Zuidstraat - 13 - - - - - - 1801 - - - - - \ No newline at end of file + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000000F + 2019011415511600 + + T + I + 2019011415511600 + + + + + 3608087947 + 698393536 + 38d8aa + f + + 2c56 + 1986-05-12 + M + 0 + 1801 + E + + + 19860512 + 19600509 + + + 2712AD + + Zuidstraat + 13 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000010.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000010.anon.xml index 09f06aae01..17fecc3518 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000010.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000010.anon.xml @@ -1,80 +1,66 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 201900000010 - 2019011415512400 - - T - I - 2019011415512400 - - - - - 2678967915 - 355960378 - c9b5d70 - 0 - - 3879b76c - 1998-08-14 - V - 0 - 1801 - E - - - 19980814 - 19600509 - - - 2753WG - - Wilgenlaan - 4 - - - - - - 1801 - - - - - \ No newline at end of file + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000010 + 2019011415512400 + + T + I + 2019011415512400 + + + + + 2678967915 + 355960378 + c9b5d70 + 0 + + 3879b76c + 1998-08-14 + V + 0 + 1801 + E + + + 19980814 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000011.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000011.anon.xml index 958eef4211..60cc232782 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000011.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000011.anon.xml @@ -1,115 +1,85 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 201900000011 - 2019011415513200 - - T - I - 2019011415513200 - - - - - 4075079129 - 402988237 - 354f - 6 - - 2c56 - 1943-07-28 - M - 0 - 1801 - E - - - 19501118 - 19600509 - - - 2712AD - - Zuidstraat - 13 - - - - - - 1801 - - - - 19850328 - - 19600516 - 19600509 - - - - - - - - b0ebc - 1960-05-09 - + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000011 + 2019011415513200 + + T + I + 2019011415513200 + + + + + 4075079129 + 402988237 + 354f + 6 + + 2c56 + 1943-07-28 + M + 0 + 1801 + E + + + 19501118 + 19600509 + + + 2712AD + + Zuidstraat + 13 + + + + + + 1801 + + + + 19850328 + + 19600516 + 19600509 + + + + + + + + b0ebc + 1960-05-09 + + + - - - - \ No newline at end of file + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000012.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000012.anon.xml index 41c7a8c7a1..5f325237fb 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000012.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000012.anon.xml @@ -1,115 +1,85 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 201900000012 - 2019011415514000 - - T - I - 2019011415514000 - - - - - 0549847258 - 035308385 - f9478bdc - 0 - - c8cf7e - 2010-09-14 - V - 0 - 1801 - V - - - 20270322 - 19600509 - - - 2710SR - - Achterbergweg - 15 - - - - - - 1801 - - - - 19780310 - - 20270322 - 19600509 - - - - - - - - 71525c823 - 1960-05-09 - + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000012 + 2019011415514000 + + T + I + 2019011415514000 + + + + + 0549847258 + 035308385 + f9478bdc + 0 + + c8cf7e + 2010-09-14 + V + 0 + 1801 + V + + + 20270322 + 19600509 + + + 2710SR + + Achterbergweg + 15 + + + + + + 1801 + + + + 19780310 + + 20270322 + 19600509 + + + + + + + + 71525c823 + 1960-05-09 + + + - - - - \ No newline at end of file + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000013.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000013.anon.xml index 8e7ca3d1a2..a1cb1e8ddc 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000013.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000013.anon.xml @@ -1,80 +1,67 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 201900000013 - 2019011415514800 - - T - I - 2019011415514800 - - - - - 0593074166 - 363367574 - 2cfd1bf6c - 5 - b7 - 67425 - 2005-02-21 - V - 0 - 1801 - - E - - - 19800206 - 19600509 - - - 3020TF - - Bakenessegracht - 37 - - - - - - 1801 - - - - - \ No newline at end of file + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000013 + 2019011415514800 + + T + I + 2019011415514800 + + + + + 0593074166 + 363367574 + 2cfd1bf6c + 5 + b7 + 67425 + 2005-02-21 + V + 0 + 1801 + + E + + + 19800206 + 19600509 + + + 3020TF + + Bakenessegracht + 37 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000014.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000014.anon.xml index 949f38c8e9..91e3e5da8c 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000014.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000014.anon.xml @@ -1,80 +1,66 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 201900000014 - 2019011415515600 - - T - I - 2019011415515600 - - - - - 2842897910 - 017434635 - 390fe - 0 - - 0f2 - 2025-05-25 - V - 0 - 1801 - E - - - 19450427 - 19600509 - - - 2753WG - - Wilgenlaan - 4 - - - - - - 1801 - - - - - \ No newline at end of file + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000014 + 2019011415515600 + + T + I + 2019011415515600 + + + + + 2842897910 + 017434635 + 390fe + 0 + + 0f2 + 2025-05-25 + V + 0 + 1801 + E + + + 19450427 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000015.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000015.anon.xml index 0fc9f82d12..cb0c597d0f 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000015.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000015.anon.xml @@ -1,80 +1,66 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 201900000015 - 2019011415520500 - - T - I - 2019011415520500 - - - - - 1412016204 - 323607784 - 2ec80 - 6 - - 7bebb51ebe49 - 1974-02-27 - M - 0 - 1801 - E - - - 19790414 - 19600509 - - - 2700KM - - Curaçaostraat - 28 - - - - - - 1801 - - - - - \ No newline at end of file + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000015 + 2019011415520500 + + T + I + 2019011415520500 + + + + + 1412016204 + 323607784 + 2ec80 + 6 + + 7bebb51ebe49 + 1974-02-27 + M + 0 + 1801 + E + + + 19790414 + 19600509 + + + 2700KM + + Curaçaostraat + 28 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000016.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000016.anon.xml index d9bbb01fe1..652f1d1236 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000016.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000016.anon.xml @@ -1,119 +1,87 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 201900000016 - 2019011415521200 - - T - I - 2019011415521200 - - - - - 7274687268 - 896760175 - 8b2394 1034f4 - fc - - 437138e - 1975-07-04 - M - 0 - G - 1801 - - E - - - 19561007 - 19600509 - - - 3019RP - - Piersonstraat - 7 - - - - - - 1801 - - - - 19810909 - - 20290424 - 19600509 - - - - - - - - c1b36d - 1960-05-09 - + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000016 + 2019011415521200 + + T + I + 2019011415521200 + + + + + 7274687268 + 896760175 + 8b2394 1034f4 + fc + + 437138e + 1975-07-04 + M + 0 + G + 1801 + + E + + + 19561007 + 19600509 + + + 3019RP + + Piersonstraat + 7 + + + + + + 1801 + + + + 19810909 + + 20290424 + 19600509 + + + + + + + + c1b36d + 1960-05-09 + + + - - - - \ No newline at end of file + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000017.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000017.anon.xml index 2c5d7c8bc3..bd53f90a5c 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000017.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000017.anon.xml @@ -1,83 +1,67 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 201900000017 - 2019011415522000 - - T - I - 2019011415522000 - - - - - 1318579222 - 030941790 - 84827c4d06e85a77 - 7 - - 6284224 - 1940-05-18 - V - 0 - 1801 - - E - - - 19990621 - 19600509 - - - 1064BH - - Burgemeester Röellstraat - 31 - - - - - - 1801 - - - - - \ No newline at end of file + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000017 + 2019011415522000 + + T + I + 2019011415522000 + + + + + 1318579222 + 030941790 + 84827c4d06e85a77 + 7 + + 6284224 + 1940-05-18 + V + 0 + 1801 + + E + + + 19990621 + 19600509 + + + 1064BH + + Burgemeester Röellstraat + 31 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000018.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000018.anon.xml index 7c5423ec03..3a04fd13f7 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000018.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000018.anon.xml @@ -1,80 +1,66 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 201900000018 - 2019011415522800 - - T - I - 2019011415522800 - - - - - 6433621730 - 094368468 - 10035d - 6 - - 437138e - 1992-06-13 - V - 0 - 1801 - E - - - 19920613 - 19600509 - - - 3019RP - - Piersonstraat - 7 - - - - - - 1801 - - - - - \ No newline at end of file + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000018 + 2019011415522800 + + T + I + 2019011415522800 + + + + + 6433621730 + 094368468 + 10035d + 6 + + 437138e + 1992-06-13 + V + 0 + 1801 + E + + + 19920613 + 19600509 + + + 3019RP + + Piersonstraat + 7 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000019.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000019.anon.xml index cf6d170914..332c50a864 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000019.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000019.anon.xml @@ -1,144 +1,93 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 201900000019 - 2019011415523600 - - T - I - 2019011415523600 - - - - - 5512727045 - 455478156 - a0edec840 2dd6bf36 f4237bed26 a55464192 77c87ab9d2 - b8c22 - 970 - a5e93 c5d7 503fd0 - 2004-11-06 - M - 0 - B - 1801 - - - 20070605 - E - - - 20031118 - 19600509 - - - - - - - - - - - - - - - - - - - - 19820511 - - 20000513 - 19600509 - - - - - - - 74f 97f - 5ad - 1960-05-09 - + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000019 + 2019011415523600 + + T + I + 2019011415523600 + + + + + 5512727045 + 455478156 + a0edec840 2dd6bf36 f4237bed26 a55464192 77c87ab9d2 + b8c22 + 970 + a5e93 c5d7 503fd0 + 2004-11-06 + M + 0 + B + 1801 + + + 20070605 + E + + + 20031118 + 19600509 + + + + + + + + + + + + + + + + + + + + 19820511 + + 20000513 + 19600509 + + + + + + + 74f 97f + 5ad + 1960-05-09 + + + - - - - \ No newline at end of file + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000001A.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000001A.anon.xml index c24bf7e500..67575eb30a 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000001A.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000001A.anon.xml @@ -1,118 +1,86 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 20190000001A - 2019011415524400 - - T - I - 2019011415524400 - - - - - 2969431370 - 683962287 - 23948abf - 6 - - c1b36d - 1958-04-21 - V - 0 - 1801 - - E - - - 19561007 - 19600509 - - - 3019RP - - Piersonstraat - 7 - - - - - - 1801 - - - - 19810909 - - 20290424 - 19600509 - - - - - - - - 437138e - 1960-05-09 - + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000001A + 2019011415524400 + + T + I + 2019011415524400 + + + + + 2969431370 + 683962287 + 23948abf + 6 + + c1b36d + 1958-04-21 + V + 0 + 1801 + + E + + + 19561007 + 19600509 + + + 3019RP + + Piersonstraat + 7 + + + + + + 1801 + + + + 19810909 + + 20290424 + 19600509 + + + + + + + + 437138e + 1960-05-09 + + + - - - - \ No newline at end of file + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000001B.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000001B.anon.xml index cba880fb3a..4b033e483d 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000001B.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000001B.anon.xml @@ -1,80 +1,66 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 20190000001B - 2019011415525200 - - T - I - 2019011415525200 - - - - - 3850536601 - 615713666 - 4357a29dd8 - 8 - - 8246a79 - 2029-04-16 - M - 0 - 1801 - E - - - 19521113 - 19600509 - - - 3053KG - - Karel de Grotestraat - 26 - - - - - - 1801 - - - - - \ No newline at end of file + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000001B + 2019011415525200 + + T + I + 2019011415525200 + + + + + 3850536601 + 615713666 + 4357a29dd8 + 8 + + 8246a79 + 2029-04-16 + M + 0 + 1801 + E + + + 19521113 + 19600509 + + + 3053KG + + Karel de Grotestraat + 26 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000001C.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000001C.anon.xml index 63d534a8d4..d0a9f22a9b 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000001C.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000001C.anon.xml @@ -1,80 +1,66 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 20190000001C - 2019011415530000 - - T - I - 2019011415530000 - - - - - 7674337126 - 749421371 - a85deb0a1 - 6 - - 71525c823 - 2008-01-08 - V - 0 - 1801 - E - - - 20080108 - 19600509 - - - 2710SR - - Achterbergweg - 15 - - - - - - 1801 - - - - - \ No newline at end of file + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000001C + 2019011415530000 + + T + I + 2019011415530000 + + + + + 7674337126 + 749421371 + a85deb0a1 + 6 + + 71525c823 + 2008-01-08 + V + 0 + 1801 + E + + + 20080108 + 19600509 + + + 2710SR + + Achterbergweg + 15 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000001D.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000001D.anon.xml index 77ba1637c5..5cd8e598d7 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000001D.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000001D.anon.xml @@ -1,74 +1,66 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 20190000001D - 2019011415530800 - - T - I - 2019011415530800 - - - - - 8157901140 - 567143730 - 6bd6ff - 8 - - e8da590 - 1997-05-29 - V - 0 - 1801 - E - - - 19970529 - 19600509 - - - 1011RE - - Jonas Daniël Meijerplein - 11 - A - III - - - - 1801 - - - - - \ No newline at end of file + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000001D + 2019011415530800 + + T + I + 2019011415530800 + + + + + 8157901140 + 567143730 + 6bd6ff + 8 + + e8da590 + 1997-05-29 + V + 0 + 1801 + E + + + 19970529 + 19600509 + + + 1011RE + + Jonas Daniël Meijerplein + 11 + A + III + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000001E.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000001E.anon.xml index 7415fac735..19f43af2b7 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000001E.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000001E.anon.xml @@ -1,83 +1,67 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 20190000001E - 2019011415531600 - - T - I - 2019011415531600 - - - - - 9100673820 - 821030777 - be6ea8 - 0 - - 5fb75f1 - 1986-08-19 - V - 0 - 1801 - - E - - - 19390312 - 19600509 - - - 2497BX - - Jonkheer van Riemsdijkln - 41 - - - - - - 1801 - - - - - \ No newline at end of file + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000001E + 2019011415531600 + + T + I + 2019011415531600 + + + + + 9100673820 + 821030777 + be6ea8 + 0 + + 5fb75f1 + 1986-08-19 + V + 0 + 1801 + + E + + + 19390312 + 19600509 + + + 2497BX + + Jonkheer van Riemsdijkln + 41 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000001F.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000001F.anon.xml index 852545da7b..bd65afbf4b 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000001F.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000001F.anon.xml @@ -1,123 +1,87 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 20190000001F - 2019011415532300 - - T - I - 2019011415532300 - - - - - 5396163489 - 677924762 - c57e226 - 6 - - d6231 - 2027-06-16 - V - 0 - PS - 1802 - - E - - - 20000227 - 19600509 - - - - - - - - - - Onder de Belvédère a/d Groenegracht - - 1802 - - - - 19541015 - - 19600509 - 19541015 - - - - - - - b7 - 67425 - 1960-05-09 - + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000001F + 2019011415532300 + + T + I + 2019011415532300 + + + + + 5396163489 + 677924762 + c57e226 + 6 + + d6231 + 2027-06-16 + V + 0 + PS + 1802 + + E + + + 20000227 + 19600509 + + + + + + + + + + Onder de Belvédère a/d Groenegracht + + 1802 + + + + 19541015 + + 19600509 + 19541015 + + + + + + + b7 + 67425 + 1960-05-09 + + + - - - - \ No newline at end of file + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000020.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000020.anon.xml index ea864f80aa..6c15ae7783 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000020.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000020.anon.xml @@ -1,117 +1,87 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 201900000020 - 2019011415533100 - - T - I - 2019011415533100 - - - - - 8475834889 - 932870521 - 394de4b - e - - d6231 - 2027-06-16 - V - 0 - PS - 1802 - - E - - - 19800206 - 19600509 - - - 2727FM - - Thorbeckegracht - 53 - - - - - - 1802 - - - - 19541015 - - 19600509 - 19541015 - - - - - - - b7 - 67425 - 1960-05-09 - + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000020 + 2019011415533100 + + T + I + 2019011415533100 + + + + + 8475834889 + 932870521 + 394de4b + e + + d6231 + 2027-06-16 + V + 0 + PS + 1802 + + E + + + 19800206 + 19600509 + + + 2727FM + + Thorbeckegracht + 53 + + + + + + 1802 + + + + 19541015 + + 19600509 + 19541015 + + + + + + + b7 + 67425 + 1960-05-09 + + + - - - - \ No newline at end of file + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000021.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000021.anon.xml index 160233cf4d..226b89246d 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000021.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000021.anon.xml @@ -1,80 +1,67 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 201900000021 - 2019011415533900 - - T - I - 2019011415533900 - - - - - 2625854460 - 976900187 - 5c5 - 6 - 95 - 952f9c9ff - 1988-06-03 - M - 7 - 1802 - - E - - - 20210328 - 19600509 - - - 2727FM - - Thorbeckegracht - 73 - - - - - - 1802 - - - - - \ No newline at end of file + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000021 + 2019011415533900 + + T + I + 2019011415533900 + + + + + 2625854460 + 976900187 + 5c5 + 6 + 95 + 952f9c9ff + 1988-06-03 + M + 7 + 1802 + + E + + + 20210328 + 19600509 + + + 2727FM + + Thorbeckegracht + 73 + + + + + + 1802 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000022.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000022.anon.xml index 9f39f51263..ad0c101a9b 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000022.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000022.anon.xml @@ -1,115 +1,85 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 201900000022 - 2019011415534700 - - T - I - 2019011415534700 - - - - - 9641459515 - 082806973 - d62ab - 5 - - b0ebc - 1974-10-23 - V - 0 - 1801 - V - - - 19451120 - 19600509 - - - 2712AD - - Zuidstraat - 13 - - - - - - 1801 - - - - 19850328 - - 19600516 - 19600509 - - - - - - - - 2c56 - 1960-05-09 - + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000022 + 2019011415534700 + + T + I + 2019011415534700 + + + + + 9641459515 + 082806973 + d62ab + 5 + + b0ebc + 1974-10-23 + V + 0 + 1801 + V + + + 19451120 + 19600509 + + + 2712AD + + Zuidstraat + 13 + + + + + + 1801 + + + + 19850328 + + 19600516 + 19600509 + + + + + + + + 2c56 + 1960-05-09 + + + - - - - \ No newline at end of file + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000023.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000023.anon.xml index 85b3ab33b0..61260c599d 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000023.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000023.anon.xml @@ -1,80 +1,66 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 201900000023 - 2019011415535500 - - T - I - 2019011415535500 - - - - - 6763823555 - 377226361 - 8bc796 - 3 - - 534ae8f7c - 1989-08-05 - V - 0 - 1801 - E - - - 19700309 - 19600509 - - - 1785LG - - A M v Voorthuijsenstr - 23 - - - - - - 1801 - - - - - \ No newline at end of file + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000023 + 2019011415535500 + + T + I + 2019011415535500 + + + + + 6763823555 + 377226361 + 8bc796 + 3 + + 534ae8f7c + 1989-08-05 + V + 0 + 1801 + E + + + 19700309 + 19600509 + + + 1785LG + + A M v Voorthuijsenstr + 23 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000024.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000024.anon.xml index 160ea1fb0f..138599ab1e 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000024.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000024.anon.xml @@ -1,110 +1,85 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 201900000024 - 2019011415540300 - - T - I - 2019011415540300 - - - - - 2422002328 - 637352461 - 818b - 5 - 95 - 20f - 1977-10-13 - M - 0 - 1801 - E - - - 19991023 - 19600509 - - - 2713PA - - Mañanalaan - 95 - - - - - - 1801 - - - - 19360703 - - 19600509 - 19360703 - - - - - - - 95 - d4fe9 - 1960-05-09 - + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000024 + 2019011415540300 + + T + I + 2019011415540300 + + + + + 2422002328 + 637352461 + 818b + 5 + 95 + 20f + 1977-10-13 + M + 0 + 1801 + E + + + 19991023 + 19600509 + + + 2713PA + + Mañanalaan + 95 + + + + + + 1801 + + + + 19360703 + + 19600509 + 19360703 + + + + + + + 95 + d4fe9 + 1960-05-09 + + + - - - - \ No newline at end of file + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000025.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000025.anon.xml index 5fb8d079ab..22466b6127 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000025.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000025.anon.xml @@ -1,77 +1,66 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 201900000025 - 2019011415541000 - - T - I - 2019011415541000 - - - - - 7423586859 - 955 - 1989c7 - 7 - 970 - d0d536 - 2005-03-20 - V - 0 - 1801 - E - - - 20230120 - 19600509 - - - 8073KS - - van Speykstraat - 52 - - - - - - 1801 - - - - - \ No newline at end of file + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000025 + 2019011415541000 + + T + I + 2019011415541000 + + + + + 7423586859 + 955 + 1989c7 + 7 + 970 + d0d536 + 2005-03-20 + V + 0 + 1801 + E + + + 20230120 + 19600509 + + + 8073KS + + van Speykstraat + 52 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000026.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000026.anon.xml index ae59ca7c2f..dc36f6e654 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000026.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000026.anon.xml @@ -1,119 +1,86 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 201900000026 - 2019011415541800 - - T - I - 2019011415541800 - - - - - 0789721340 - 606117644 - c14d5 - 0 - - c58b867 - 1964-02-09 - V - 0 - 1801 - - E - - - 20240627 - 19600509 - - - 3020RV - - Markt - 4 - - - - - - 1801 - - - - 20190204 - - 19600509 - 20190204 - - - - - - - - 9296df2fb - 1960-05-09 - + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000026 + 2019011415541800 + + T + I + 2019011415541800 + + + + + 0789721340 + 606117644 + c14d5 + 0 + + c58b867 + 1964-02-09 + V + 0 + 1801 + + E + + + 20240627 + 19600509 + + + 3020RV + + Markt + 4 + + + + + + 1801 + + + + 20190204 + + 19600509 + 20190204 + + + + + + + + 9296df2fb + 1960-05-09 + + + - - - - \ No newline at end of file + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000027.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000027.anon.xml index 47177cb9d3..fa6b426bc9 100644 --- a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000027.anon.xml +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000027.anon.xml @@ -1,80 +1,66 @@ - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 201900000027 - 2019011415542600 - - T - I - 2019011415542600 - - - - - 3056876036 - 902215443 - 7f74d7 - 5 - - 568cf - 2003-01-15 - M - 0 - 1801 - E - - - 19960304 - 19600509 - - - 2767GP - - Poolmanweg - 22 - - - - - - 1801 - - - - - \ No newline at end of file + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000027 + 2019011415542600 + + T + I + 2019011415542600 + + + + + 3056876036 + 902215443 + 7f74d7 + 5 + + 568cf + 2003-01-15 + M + 0 + 1801 + E + + + 19960304 + 19600509 + + + 2767GP + + Poolmanweg + 22 + + + + + + 1801 + + + + + + + \ No newline at end of file From 9c02ae600e517cd00e93569d34a64aa86c0118b2 Mon Sep 17 00:00:00 2001 From: Meine Toonen Date: Tue, 11 Jun 2019 17:02:04 +0200 Subject: [PATCH 11/32] process brp berichten: when there is an old bericht, merge the fields --- .../src/main/java/nl/b3p/brmo/loader/RsgbProxy.java | 2 +- .../java/nl/b3p/brmo/loader/util/RsgbTransformer.java | 4 ++-- .../java/nl/b3p/brmo/stufbg204/StUFBGasynchroon.java | 11 +++++++---- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/brmo-loader/src/main/java/nl/b3p/brmo/loader/RsgbProxy.java b/brmo-loader/src/main/java/nl/b3p/brmo/loader/RsgbProxy.java index 7d03452230..271fe9004e 100644 --- a/brmo-loader/src/main/java/nl/b3p/brmo/loader/RsgbProxy.java +++ b/brmo-loader/src/main/java/nl/b3p/brmo/loader/RsgbProxy.java @@ -684,7 +684,7 @@ private RsgbTransformer getTransformer(String brType) throws TransformerConfigur } else if (brType.equals(BrmoFramework.BR_BAG)) { t = new RsgbTransformer(BrmoFramework.XSL_BAG); } else if(brType.equals(BrmoFramework.BR_BRP)){ - t = new RsgbTransformer(BrmoFramework.XSL_BRP); + t = new RsgbBRPTransformer(BrmoFramework.XSL_BRP, this.stagingProxy); }else if (brType.equals(BrmoFramework.BR_NHR)) { t = new RsgbTransformer(BrmoFramework.XSL_NHR); // } else if (brType.equals(BrmoFramework.BR_BGTLIGHT)) { diff --git a/brmo-loader/src/main/java/nl/b3p/brmo/loader/util/RsgbTransformer.java b/brmo-loader/src/main/java/nl/b3p/brmo/loader/util/RsgbTransformer.java index 0da72eb0c1..9de3c69c72 100644 --- a/brmo-loader/src/main/java/nl/b3p/brmo/loader/util/RsgbTransformer.java +++ b/brmo-loader/src/main/java/nl/b3p/brmo/loader/util/RsgbTransformer.java @@ -31,8 +31,8 @@ */ public class RsgbTransformer { private static final Log log = LogFactory.getLog(RsgbTransformer.class); - private final Templates t; - private final DocumentBuilder db; + protected final Templates t; + protected final DocumentBuilder db; public RsgbTransformer(String pathToXsl) throws TransformerConfigurationException, ParserConfigurationException { diff --git a/brmo-stufbg204/src/main/java/nl/b3p/brmo/stufbg204/StUFBGasynchroon.java b/brmo-stufbg204/src/main/java/nl/b3p/brmo/stufbg204/StUFBGasynchroon.java index 41a390eab2..3eba4c9274 100644 --- a/brmo-stufbg204/src/main/java/nl/b3p/brmo/stufbg204/StUFBGasynchroon.java +++ b/brmo-stufbg204/src/main/java/nl/b3p/brmo/stufbg204/StUFBGasynchroon.java @@ -148,14 +148,14 @@ public BevestigingsBericht ontvangKennisgeving(KennisgevingsBericht kennisgeving switch (kennisgeving.getStuurgegevens().getKennisgeving().getMutatiesoort()) { case T: - saveBericht(kennisgeving, kennisgeving.getStuurgegevens().getTijdstipBericht()); + saveBericht(kennisgeving, kennisgeving.getStuurgegevens().getKennisgeving().getTijdstipMutatie()); break; case W: + case C: // dit werkt -nog- niet omdat dit 2 PRS nodes bevat, een was en een wordt... saveBericht(kennisgeving, kennisgeving.getStuurgegevens().getKennisgeving().getTijdstipMutatie()); break; case V: - case C: default: LOG.warn("Onbekende mutatiesoort wordt niet verwerkt."); break; @@ -204,11 +204,14 @@ private InputStream getXml(Object o) throws JAXBException { XPath xpath = xPathfactory.newXPath(); XPathExpression expr = xpath.compile("//*[local-name() = 'body']/*"); NodeList nodelist = (NodeList) expr.evaluate(doc, XPathConstants.NODESET); - Node root = doc.createElement("root"); + + Document newDoc = builder.newDocument(); + Node root = newDoc.createElement("root"); for (int i = 0; i < nodelist.getLength(); i++) { Node n = nodelist.item(i); - root.appendChild(n); + Node newNode = newDoc.importNode(n, true); + root.appendChild(newNode); } // Vertaal xml naar inputstream voor verwerking in brmo framework From 44f6d3431e8cb27f73c46c1a2e8b475841d55ba8 Mon Sep 17 00:00:00 2001 From: Meine Toonen Date: Tue, 11 Jun 2019 17:05:55 +0200 Subject: [PATCH 12/32] moar tests! --- .../brmo-stufbg204-soapui-project.xml | 491 +++++++++++++++++- 1 file changed, 474 insertions(+), 17 deletions(-) diff --git a/brmo-stufbg204/brmo-stufbg204-soapui-project.xml b/brmo-stufbg204/brmo-stufbg204-soapui-project.xml index 83263e66a2..ec972f9852 100644 --- a/brmo-stufbg204/brmo-stufbg204-soapui-project.xml +++ b/brmo-stufbg204/brmo-stufbg204-soapui-project.xml @@ -1,5 +1,5 @@ - + @@ -30,7 +30,7 @@ -]]>http://localhost:8037/brmo-stufbg204/StUFBGAsynchroon?wsdl +]]>http://localhost:8084/brmo-stufbg204/StUFBGAsynchroon?wsdl Dit document definieert de webservices voor het sectormodel basisgegevens. Dit document gaat uit van twee webservices: @@ -49,8 +49,8 @@ Wijzigingen vergeleken met 020401: - soapAction gevuld met namespaceUri sectormodel BG0204 gevolgd door '/' en de operation name. - - + + @@ -160,15 +160,15 @@ Omdat de uit te wisselen berichten volledig gedefinieerd zijn in het sectormodel Het beantwoorden van een vraag kan veel meer resources vergen en dient op een andere wijze getuned te kunnen worden, dan het opslaan van een inkomend bericht. In het endpoint dient de url nog correct te worden ingevuld. - + - + -]]>http://schemas.xmlsoap.org/wsdl/http://localhost:8037/brmo-stufbg204/StUFBGAsynchroon?xsd=2 +]]>http://schemas.xmlsoap.org/wsdl/http://localhost:8084/brmo-stufbg204/StUFBGAsynchroon?xsd=2 Schema met de in StUF gebruikte elementen en attributen @@ -576,11 +576,11 @@ In het endpoint dient de url nog correct te worden ingevuld. -]]>http://www.w3.org/2001/XMLSchemahttp://localhost:8037/brmo-stufbg204/StUFBGAsynchroon?xsd=1 +]]>http://www.w3.org/2001/XMLSchemahttp://localhost:8084/brmo-stufbg204/StUFBGAsynchroon?xsd=1 - + Wijzigingen vergeleken met versie bg020411: - ERR0182: In R02-, R03- en R04-tabel op het element ingangsdatum nillable="true" gezet. @@ -6287,7 +6287,7 @@ Sortering 02: deelgemeentenaam -]]>http://www.w3.org/2001/XMLSchemahttp://example.com/StUFBGAsynchroonhttp://localhost:8037/brmo-stufbg204/StUFBGAsynchroonhttp://localhost:8037/brmo-stufbg204/StUFBGAsynchroon<xml-fragment/>UTF-8http://localhost:8037/brmo-stufbg204/StUFBGAsynchroon +]]>http://www.w3.org/2001/XMLSchemahttp://example.com/StUFBGAsynchroonhttp://localhost:8084/brmo-stufbg204/StUFBGAsynchroonhttp://localhost:8084/brmo-stufbg204/StUFBGAsynchroon<xml-fragment/>UTF-8http://localhost:8084/brmo-stufbg204/StUFBGAsynchroon @@ -43845,7 +43845,7 @@ Sortering 02: deelgemeentenaam -]]>No AuthorizationUTF-8http://localhost:8037/brmo-stufbg204/StUFBGAsynchroon +]]>No AuthorizationUTF-8http://localhost:8084/brmo-stufbg204/StUFBGAsynchroon @@ -56851,7 +56851,7 @@ Sortering 02: deelgemeentenaam -]]><xml-fragment/>UTF-8http://localhost:8037/brmo-stufbg204/StUFBGAsynchroon +]]><xml-fragment/>UTF-8http://localhost:8084/brmo-stufbg204/StUFBGAsynchroon @@ -56923,7 +56923,7 @@ Sortering 02: deelgemeentenaam -]]>No Authorization<xml-fragment/>UTF-8http://localhost:8037/brmo-stufbg204/StUFBGAsynchroon +]]>No Authorization<xml-fragment/>UTF-8http://localhost:8084/brmo-stufbg204/StUFBGAsynchroon @@ -60962,7 +60962,7 @@ Sortering 02: deelgemeentenaam -]]>No Authorization<xml-fragment/>UTF-8http://localhost:8037/brmo-stufbg204/StUFBGAsynchroon +]]>No Authorization<xml-fragment/>UTF-8http://localhost:8084/brmo-stufbg204/StUFBGAsynchroon @@ -60985,6 +60985,7 @@ Sortering 02: deelgemeentenaam T V + 2019011415491600 @@ -61367,7 +61368,463 @@ Sortering 02: deelgemeentenaam -]]>No Authorizationhttp://localhost:8084/brmo-stufbg204/StUFBGSynchroon?wsdl +]]>No Authorization<xml-fragment/>UTF-8http://localhost:8084/brmo-stufbg204/StUFBGAsynchroon + + + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000021 + 2019011415533900 + + T + I + 2019011415533900 + + + + + 2625854460 + 976900187 + 5c5 + 6 + 95 + 952f9c9ff + 1988-06-03 + M + 7 + 1802 + + E + + + 20210328 + 19600509 + + + 2727FM + + Thorbeckegracht + 73 + + + + + + 1802 + + + + + + +]]>No Authorization<xml-fragment/>UTF-8http://localhost:8084/brmo-stufbg204/StUFBGAsynchroon + + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000028 + 2019011416033300 + + W + I + 2019011416033300 + + + + + 2625854460 + 976900187 + 5c5 + 6 + 95 + pietje + 1988-06-03 + M + + + 20210328 + 19600509 + + + 2727FM + + Thorbeckegracht + 73 + + + + + + 1802 + + + + + + 2625854460 + 976900187 + 5c5 + 6 + 95 + 952f9c9ff + 1988-06-03 + M + + + 20210328 + 19600509 + + + 2727FM + + Thorbeckegracht + 73 + + + + + + 1802 + + + + 20110526 + + 20240430 + 19600509 + + + + + + + + c58b867 + 1960-05-09 + + + + + + + +]]>No Authorization<xml-fragment/>UTF-8http://localhost:8084/brmo-stufbg204/StUFBGAsynchroon + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000001 + 2019011415492400 + + T + I + 2019011415492400 + + + + + 1010102485 + 111112485 + Roukshana Najia + RN + + Bhutto + 19680000 + V + 0 + 1801 + + V + + + 19900507 + + + + 2593BP + + Laan v Nieuw Oost-Indië + 210 + + + + + + 1801 + + + + 20011109 + + + 20011109 + + + + + + + bin + Laden + + + + + + + + + +]]>No Authorization<xml-fragment/>UTF-8http://example.com/StUFBGAsynchroon + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000004A + 2019011417265400 + + C + I + 2019011417265400 + + + + + 2422002328 + 637352461 + 818b + 5 + 95 + 20f + 1977-10-13 + M + + + 19991023 + 19600509 + + + 2713PA + + Mañanalaan + 95 + + + + + + 1801 + + + + + 2422002328 + 637352461 + 818b + 5 + 95 + 20f + 1977-10-13 + M + + + 19991023 + 19600509 + + + 2713PA + + Mañanalaan + 95 + + + + + + 1801 + + + + + + +]]>No Authorizationhttp://localhost:8084/brmo-stufbg204/StUFBGSynchroon?wsdl Dit document definieert de webservices voor het sectormodel basisgegevens. Dit document gaat uit van twee webservices: @@ -67624,7 +68081,7 @@ Sortering 02: deelgemeentenaam -]]>http://www.w3.org/2001/XMLSchemahttp://example.com/StUFBGSynchroonhttp://localhost:8037/brmo-stufbg204/StUFBGSynchroonhttp://localhost:8084/brmo-stufbg204/StUFBGSynchroon<xml-fragment/>UTF-8http://localhost:8084/brmo-stufbg204/StUFBGSynchroon +]]>http://www.w3.org/2001/XMLSchemahttp://example.com/StUFBGSynchroonhttp://localhost:8084/brmo-stufbg204/StUFBGSynchroonhttp://localhost:8084/brmo-stufbg204/StUFBGSynchroon<xml-fragment/>UTF-8http://localhost:8084/brmo-stufbg204/StUFBGSynchroon @@ -197599,4 +198056,4 @@ Sortering 02: deelgemeentenaam -]]>No Authorizationhttp://localhost:8037/brmo-stufbg204/StUFBGAsynchroon \ No newline at end of file +]]>No Authorizationhttp://localhost:8084/brmo-stufbg204/StUFBGAsynchroon \ No newline at end of file From e0ef12a778100f3ce08eb7407683871476511092 Mon Sep 17 00:00:00 2001 From: Meine Toonen Date: Tue, 11 Jun 2019 17:06:07 +0200 Subject: [PATCH 13/32] Tests updated --- ...erwerkHuwelijksMutatieIntegrationTest.java | 58 ++++++- ...rwerkToevoegingMutatieIntegrationTest.java | 141 ++++++++++++++++++ 2 files changed, 195 insertions(+), 4 deletions(-) create mode 100644 brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/VerwerkToevoegingMutatieIntegrationTest.java diff --git a/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/VerwerkHuwelijksMutatieIntegrationTest.java b/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/VerwerkHuwelijksMutatieIntegrationTest.java index 1e3d05631f..1412c5b0c7 100644 --- a/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/VerwerkHuwelijksMutatieIntegrationTest.java +++ b/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/VerwerkHuwelijksMutatieIntegrationTest.java @@ -6,11 +6,13 @@ import java.io.IOException; import java.sql.SQLException; import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; import nl.b3p.brmo.loader.BrmoFramework; import nl.b3p.brmo.loader.util.BrmoException; -import nl.b3p.brmo.stufbg204.util.StUFbg204Util; +import static nl.b3p.brmo.stufbg204.WebTestStub.BASE_TEST_URL; +import static nl.b3p.brmo.stufbg204.WebTestStub.client; import nl.b3p.brmo.test.util.database.dbunit.CleanUtil; import org.apache.commons.dbcp.BasicDataSource; import org.apache.commons.logging.Log; @@ -18,7 +20,6 @@ import org.apache.http.HttpStatus; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.protocol.HttpClientContext; import org.apache.http.entity.ContentType; import org.apache.http.entity.InputStreamEntity; import org.dbunit.DatabaseUnitException; @@ -34,8 +35,6 @@ import static org.junit.Assert.assertTrue; import org.junit.Before; import org.junit.Test; -import static org.junit.Assume.assumeNotNull; -import static org.junit.Assume.assumeTrue; /** * Deze testcase verwerkt een soap bericht uit een bestand als kennisgeving. Het @@ -139,4 +138,55 @@ public void testBericht() throws IOException, DataSetException, SQLException, Br assertEquals("a nummer niet als verwacht", "9173658014", ingeschr_nat_prs.getValue(0, "a_nummer")); assertEquals("bsn nummer niet als verwacht", "301571818", ingeschr_nat_prs.getValue(0, "bsn")); } + + @Test + public void testToevoegingMetHuwelijkAlsComfort()throws IOException, DataSetException, SQLException, BrmoException, InterruptedException, ParseException { + InputStreamEntity reqEntity = new InputStreamEntity( + VerwerkToevoegingMutatieIntegrationTest.class.getResourceAsStream("/testdata-tnt/SoapBerichten/toevoeging_huwelijk_als_comfort.xml"), + -1, + ContentType.create("text/xml", "utf-8") + ); + reqEntity.setChunked(true); + HttpPost httppost = new HttpPost(BASE_TEST_URL + "StUFBGAsynchroon"); + httppost.setEntity(reqEntity); + // httppost.addHeader("SOAPAction", "ontvangKennisgeving"); + + LOG.debug("SOAP request uitvoeren: " + httppost.getRequestLine()); + + // set-up preemptive auth voor request en stuur bericht + CloseableHttpResponse response = client.execute(target, httppost, localContext); + + assertThat("Response status is OK.", response.getStatusLine().getStatusCode(), + equalTo(HttpStatus.SC_OK)); + + // check staging database inhoud + assertTrue("Er zijn anders dan 1 STAGING_OK laadprocessen", 1l == brmo.getCountLaadProcessen(null, null, BrmoFramework.BR_BRP, "STAGING_OK")); + + ITable laadproces = staging.createDataSet().getTable("laadproces"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd kk:mm:ss.SS"); + //assertEquals("datum klopt niet", /* StUFbg204Util.sdf.parse("201812211418450000") */ sdf.format(new Date()) /*"2019-01-14 16:04:37.0"*/, laadproces.getValue(0, "bestand_datum").toString()); + + assertTrue("Er zijn anders dan 1 STAGING_OK berichten", 1l <= brmo.getCountBerichten(null, null, BrmoFramework.BR_BRP, "STAGING_OK")); + ITable bericht = staging.createDataSet().getTable("bericht"); + assertEquals("object ref klopt niet", "fcd17242d8211342df48efd67341ca9765de8347", bericht.getValue(0, "object_ref")); + // assertEquals("datum klopt niet", "2019-01-14 16:04:37.0", bericht.getValue(0, "datum").toString()); + + // transformeren van bericht en check rsgb database inhoud + Thread t = brmo.toRsgb(); + t.join(); + + ITable subject = rsgb.createDataSet().getTable("subject"); + assertEquals("Aantal rijen klopt niet", 1, subject.getRowCount()); + assertEquals("naam niet als verwacht", "727b5940 900ed1be 8b701201 935a9e ba5b4d6e d9b9226a", subject.getValue(0, "naam")); + + ITable nat_prs = rsgb.createDataSet().getTable("nat_prs"); + assertTrue("Aantal rijen klopt niet", nat_prs.getRowCount() == 1); + assertEquals("geslacht niet als verwacht", "M", nat_prs.getValue(1, "geslachtsaand")); + // assertEquals("geslachtsnaam niet als verwacht", "Cuykelaer", nat_prs.getValue(0, "nm_geslachtsnaam")); + + ITable ingeschr_nat_prs = rsgb.createDataSet().getTable("ingeschr_nat_prs"); + assertTrue("Aantal rijen klopt niet", ingeschr_nat_prs.getRowCount() == 1); + assertEquals("a nummer niet als verwacht", "6171717520", ingeschr_nat_prs.getValue(0, "a_nummer")); + assertEquals("bsn nummer niet als verwacht", "749069273", ingeschr_nat_prs.getValue(0, "bsn")); + } } diff --git a/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/VerwerkToevoegingMutatieIntegrationTest.java b/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/VerwerkToevoegingMutatieIntegrationTest.java new file mode 100644 index 0000000000..a8d6ae57fc --- /dev/null +++ b/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/VerwerkToevoegingMutatieIntegrationTest.java @@ -0,0 +1,141 @@ +/* + * Copyright (C) 2018 B3Partners B.V. + */ +package nl.b3p.brmo.stufbg204; + +import java.io.IOException; +import java.sql.SQLException; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.concurrent.locks.Lock; +import java.util.concurrent.locks.ReentrantLock; +import nl.b3p.brmo.loader.BrmoFramework; +import nl.b3p.brmo.loader.util.BrmoException; +import nl.b3p.brmo.stufbg204.util.StUFbg204Util; +import nl.b3p.brmo.test.util.database.dbunit.CleanUtil; +import org.apache.commons.dbcp.BasicDataSource; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.http.HttpStatus; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.entity.ContentType; +import org.apache.http.entity.InputStreamEntity; +import org.dbunit.DatabaseUnitException; +import org.dbunit.database.DatabaseDataSourceConnection; +import org.dbunit.database.IDatabaseConnection; +import org.dbunit.dataset.DataSetException; +import org.dbunit.dataset.ITable; +import static org.hamcrest.CoreMatchers.equalTo; + +import org.junit.After; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertTrue; +import org.junit.Before; +import org.junit.Test; + +/** + * Deze testcase verwerkt een soap bericht uit een bestand als kennisgeving. Het + * bestand bevat een HuwelijksMutatie welke naar de stufbg204 async service + * wordt gepost, hierna wordt in de staging gechecked voor laadproces en bericht + * en wordt na trasnformatie in de rsgb gechecked. + * @code mvn -Dit.test=VerwerkToevoegingMutatieIntegrationTest -Dtest.onlyITs=true verify -Ppostgresql > target/postgresql.log} + * + * @author Mark Prins + */ +public class VerwerkToevoegingMutatieIntegrationTest extends WebTestStub { + + private static final Log LOG = LogFactory.getLog(VerwerkToevoegingMutatieIntegrationTest.class); + private IDatabaseConnection staging; + private IDatabaseConnection rsgb; + private final Lock sequential = new ReentrantLock(); + private BrmoFramework brmo; + + @Before + @Override + public void setUp() throws SQLException, BrmoException, DatabaseUnitException { + BasicDataSource dsStaging = new BasicDataSource(); + dsStaging.setUrl(DBPROPS.getProperty("staging.url")); + dsStaging.setUsername(DBPROPS.getProperty("staging.username")); + dsStaging.setPassword(DBPROPS.getProperty("staging.password")); + dsStaging.setAccessToUnderlyingConnectionAllowed(true); + + BasicDataSource dsRsgb = new BasicDataSource(); + dsRsgb.setUrl(DBPROPS.getProperty("rsgb.url")); + dsRsgb.setUsername(DBPROPS.getProperty("rsgb.username")); + dsRsgb.setPassword(DBPROPS.getProperty("rsgb.password")); + dsRsgb.setAccessToUnderlyingConnectionAllowed(true); + + setupJNDI(dsRsgb, dsStaging); + + brmo = new BrmoFramework(dsStaging, dsRsgb, null); + staging = new DatabaseDataSourceConnection(dsStaging); + rsgb = new DatabaseDataSourceConnection(dsRsgb); + + sequential.lock(); + CleanUtil.cleanSTAGING(staging); + CleanUtil.cleanRSGB_BRP(rsgb); + } + + @After + public void cleanup() throws Exception { + brmo.closeBrmoFramework(); +// CleanUtil.cleanSTAGING(staging); +// CleanUtil.cleanRSGB_BRP(rsgb); + staging.close(); + rsgb.close(); + sequential.unlock(); + } + + @Test + public void testBericht() throws IOException, DataSetException, SQLException, BrmoException, InterruptedException, ParseException { + InputStreamEntity reqEntity = new InputStreamEntity( + VerwerkToevoegingMutatieIntegrationTest.class.getResourceAsStream("/testdata-tnt/SoapBerichten/toevoeging_huwelijk_als_comfort.xml"), + -1, + ContentType.create("text/xml", "utf-8") + ); + reqEntity.setChunked(true); + HttpPost httppost = new HttpPost(BASE_TEST_URL + "StUFBGAsynchroon"); + httppost.setEntity(reqEntity); + // httppost.addHeader("SOAPAction", "ontvangKennisgeving"); + + LOG.debug("SOAP request uitvoeren: " + httppost.getRequestLine()); + + // set-up preemptive auth voor request en stuur bericht + CloseableHttpResponse response = client.execute(target, httppost, localContext); + + assertThat("Response status is not OK.", response.getStatusLine().getStatusCode(), equalTo(HttpStatus.SC_OK)); + + // check staging database inhoud + assertTrue("Er zijn anders dan 1 STAGING_OK laadprocessen", 1l == brmo.getCountLaadProcessen(null, null, BrmoFramework.BR_BRP, "STAGING_OK")); + + ITable laadproces = staging.createDataSet().getTable("laadproces"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd kk:mm:ss.SS"); + //assertEquals("datum klopt niet", /* StUFbg204Util.sdf.parse("201812211418450000") */ sdf.format(new Date()) /*"2019-01-14 16:04:37.0"*/, laadproces.getValue(0, "bestand_datum").toString()); + + assertTrue("Er zijn anders dan 1 STAGING_OK berichten", 1l <= brmo.getCountBerichten(null, null, BrmoFramework.BR_BRP, "STAGING_OK")); + ITable bericht = staging.createDataSet().getTable("bericht"); + assertEquals("object ref klopt niet", "fcd17242d8211342df48efd67341ca9765de8347", bericht.getValue(0, "object_ref")); + // assertEquals("datum klopt niet", "2019-01-14 16:04:37.0", bericht.getValue(0, "datum").toString()); + + // transformeren van bericht en check rsgb database inhoud + Thread t = brmo.toRsgb(); + t.join(); + + ITable subject = rsgb.createDataSet().getTable("subject"); + assertEquals("Aantal rijen klopt niet", 5, subject.getRowCount()); + assertEquals("naam niet als verwacht", "PXXX", subject.getValue(0, "naam")); + + ITable nat_prs = rsgb.createDataSet().getTable("nat_prs"); + assertEquals("Aantal rijen klopt niet", 5, nat_prs.getRowCount() ); + assertEquals("geslacht niet als verwacht", "V", nat_prs.getValue(0, "geslachtsaand")); + // assertEquals("geslachtsnaam niet als verwacht", "Cuykelaer", nat_prs.getValue(0, "nm_geslachtsnaam")); + + ITable ingeschr_nat_prs = rsgb.createDataSet().getTable("ingeschr_nat_prs"); + assertEquals("Aantal rijen klopt niet", 5, ingeschr_nat_prs.getRowCount() ); + assertEquals("a nummer niet als verwacht", null, ingeschr_nat_prs.getValue(0, "a_nummer")); + assertEquals("bsn nummer niet als verwacht", "66600666", ingeschr_nat_prs.getValue(0, "bsn")); + } +} From 3b97f35a4c00bec36131d6d5d0850946e804b50e Mon Sep 17 00:00:00 2001 From: Meine Toonen Date: Tue, 11 Jun 2019 17:07:12 +0200 Subject: [PATCH 14/32] Don't create comfort data when identifying columns are empty. Save indicatie geheim --- .../main/resources/xsl/brp-to-rsgb-xml.xsl | 55 ++++++++++--------- 1 file changed, 29 insertions(+), 26 deletions(-) diff --git a/brmo-loader/src/main/resources/xsl/brp-to-rsgb-xml.xsl b/brmo-loader/src/main/resources/xsl/brp-to-rsgb-xml.xsl index aac0ac8b91..b633d8c09f 100644 --- a/brmo-loader/src/main/resources/xsl/brp-to-rsgb-xml.xsl +++ b/brmo-loader/src/main/resources/xsl/brp-to-rsgb-xml.xsl @@ -92,6 +92,7 @@ + @@ -116,20 +117,22 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -157,18 +160,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + From d34d24da69614d9377d37fd9b9ef0d57a9319404 Mon Sep 17 00:00:00 2001 From: Meine Toonen Date: Wed, 12 Jun 2019 09:15:17 +0200 Subject: [PATCH 15/32] Added new classes --- .../b3p/brmo/loader/RsgbBRPTransformer.java | 148 ++++++++++++++++++ .../brmo/loader/RsgbBRPTransformerTest.java | 43 +++++ 2 files changed, 191 insertions(+) create mode 100644 brmo-loader/src/main/java/nl/b3p/brmo/loader/RsgbBRPTransformer.java create mode 100644 brmo-loader/src/test/java/nl/b3p/brmo/loader/RsgbBRPTransformerTest.java diff --git a/brmo-loader/src/main/java/nl/b3p/brmo/loader/RsgbBRPTransformer.java b/brmo-loader/src/main/java/nl/b3p/brmo/loader/RsgbBRPTransformer.java new file mode 100644 index 0000000000..ace3d49d22 --- /dev/null +++ b/brmo-loader/src/main/java/nl/b3p/brmo/loader/RsgbBRPTransformer.java @@ -0,0 +1,148 @@ +package nl.b3p.brmo.loader; + +import java.io.IOException; +import java.io.StringReader; +import java.io.StringWriter; +import java.sql.SQLException; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.transform.Result; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerConfigurationException; +import javax.xml.transform.TransformerException; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.dom.DOMSource; +import javax.xml.transform.stream.StreamResult; +import javax.xml.xpath.XPath; +import javax.xml.xpath.XPathConstants; +import javax.xml.xpath.XPathExpression; +import javax.xml.xpath.XPathFactory; +import nl.b3p.brmo.loader.entity.Bericht; +import nl.b3p.brmo.loader.util.RsgbTransformer; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; + +/** + * + * @author meine + */ +public class RsgbBRPTransformer extends RsgbTransformer { + + private static final Log log = LogFactory.getLog(RsgbBRPTransformer.class); + private StagingProxy staging; + + public RsgbBRPTransformer(String pathToXsl, StagingProxy staging) throws TransformerConfigurationException, ParserConfigurationException { + super(pathToXsl); + this.staging = staging; + } + + @Override + public String transformToDbXml(Bericht bericht) throws SAXException, IOException, TransformerConfigurationException, TransformerException { + String current = super.transformToDbXml(bericht); + StringBuilder loadLog = new StringBuilder(); + + try { + Bericht old = staging.getOldBericht(bericht, loadLog); + + if (old != null) { + Document d = merge( old.getDbXml(), current); + String mergedDBXML = print(d); + bericht.setDbXml(mergedDBXML); + current = mergedDBXML; + } + } catch (SQLException ex) { + log.error("Cannot retrieve old bericht: ", ex); + } catch (Exception ex) { + log.error("Cannot retrieve old bericht: ", ex); + } + + // retrieve old bericht + // apply current to old + // return modified dbxml + return current; + } + + @Override + public Node transformToDbXmlNode(Bericht bericht) throws SAXException, IOException, TransformerConfigurationException, TransformerException { + Node n = super.transformToDbXmlNode(bericht); + + // retrieve old bericht + // apply current to old + // return modified dbxml + return n; + } + + protected static Document merge(String oldFile, String newFile) throws Exception { + XPathFactory xPathFactory = XPathFactory.newInstance(); + XPath xpath = xPathFactory.newXPath(); + XPathExpression expression = xpath.compile("/root/data"); + + DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory.newInstance(); + docBuilderFactory.setIgnoringElementContentWhitespace(true); + DocumentBuilder docBuilder = docBuilderFactory.newDocumentBuilder(); + Document base = docBuilder.parse(new InputSource(new StringReader(oldFile))); + + Element old = (Element) expression.evaluate(base, XPathConstants.NODE); + if (old == null) { + throw new IOException(oldFile + ": expression does not evaluate to node"); + } + + Document merge = docBuilder.parse(new InputSource(new StringReader(newFile))); + Node newNode = (Node) expression.evaluate(merge, XPathConstants.NODE); + + /* + (1)Voor elke node in merge, kijk of hij bestaat in base + zo nee, importeer + zo ja, kijk of dit het een na diepste niveau is + zo ja, + ga voor elk childnode na of deze bestaat + zo nee, importeer + zo ja, overschrijf waarde + zo nee, recurse in (1) + */ + + merge(base,newNode, old, true/*, merge*/); + + + return base; + } + + private static void merge(Document base, Node newNode, Element old, boolean first/*, Node merge*/){ + while (newNode.hasChildNodes()) { + Node mergeChild = newNode.getFirstChild(); + newNode.removeChild(mergeChild); + String name = mergeChild.getNodeName(); + NodeList nl = old.getElementsByTagName(name); + if(nl.getLength() == 0){ + mergeChild = base.importNode(mergeChild, true); + old.appendChild(mergeChild); + }else{ + Element oldItem = (Element) nl.item(0); + if(first){ + merge(base, mergeChild, oldItem, false); + }else{ + if(!mergeChild.getTextContent().equalsIgnoreCase("")){ + oldItem.setTextContent(mergeChild.getTextContent()); + } + } + } + } + } + + protected static String print(Document doc) throws Exception { + TransformerFactory transformerFactory = TransformerFactory.newInstance(); + Transformer transformer = transformerFactory.newTransformer(); + DOMSource source = new DOMSource(doc); + StringWriter sw = new StringWriter(); + Result result = new StreamResult(sw); + transformer.transform(source, result); + return sw.toString(); + } +} diff --git a/brmo-loader/src/test/java/nl/b3p/brmo/loader/RsgbBRPTransformerTest.java b/brmo-loader/src/test/java/nl/b3p/brmo/loader/RsgbBRPTransformerTest.java new file mode 100644 index 0000000000..e8ac9cf91d --- /dev/null +++ b/brmo-loader/src/test/java/nl/b3p/brmo/loader/RsgbBRPTransformerTest.java @@ -0,0 +1,43 @@ + package nl.b3p.brmo.loader; + +import java.io.StringWriter; +import org.apache.commons.io.IOUtils; +import static org.junit.Assert.assertEquals; +import org.junit.Test; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; + +/** + * + * @author meine + */ + + +public class RsgbBRPTransformerTest { + + @Test + public void mergeTest() throws Exception{ + StringWriter writerOld = new StringWriter(); + IOUtils.copy(RsgbBRPTransformerTest.class.getResourceAsStream("old.xml"), writerOld, "UTF-8"); + String old = writerOld.toString(); + + StringWriter writerNew = new StringWriter(); + IOUtils.copy(RsgbBRPTransformerTest.class.getResourceAsStream("new.xml"), writerNew, "UTF-8"); + String newFile = writerNew.toString(); + + Document doc = RsgbBRPTransformer.merge( old, newFile); + NodeList data = doc.getElementsByTagName("data"); + assertEquals("Too many data elems", 1,data.getLength()); + Node dataNode = data.item(0); + //assertEquals("Too many children in data", 6, dataChildren.getLength()); + NodeList huw = doc.getElementsByTagName("huw_ger_partn"); + assertEquals("Huwelijk not present", 1, huw.getLength()); + NodeList subjectList = doc.getElementsByTagName("subject"); + assertEquals("too many subjects", 1, subjectList.getLength()); + Element subject = (Element)subjectList.item(0); + assertEquals("new value in adres_buitenland not merged", "daaro", subject.getElementsByTagName("adres_buitenland").item(0).getTextContent() ); + assertEquals("old value in pa_postbus__of_antwoordnummer not retained", "666", subject.getElementsByTagName("pa_postbus__of_antwoordnummer").item(0).getTextContent() ); + } +} From 1283ec929508e494bfa9983b17dce6fa4244b769 Mon Sep 17 00:00:00 2001 From: Meine Toonen Date: Wed, 12 Jun 2019 09:18:05 +0200 Subject: [PATCH 16/32] project updated --- .../brmo-stufbg204-soapui-project.xml | 85 +------------------ 1 file changed, 1 insertion(+), 84 deletions(-) diff --git a/brmo-stufbg204/brmo-stufbg204-soapui-project.xml b/brmo-stufbg204/brmo-stufbg204-soapui-project.xml index ec972f9852..1e1aa70a19 100644 --- a/brmo-stufbg204/brmo-stufbg204-soapui-project.xml +++ b/brmo-stufbg204/brmo-stufbg204-soapui-project.xml @@ -61619,92 +61619,9 @@ Sortering 02: deelgemeentenaam -]]>No Authorization<xml-fragment/>UTF-8http://localhost:8084/brmo-stufbg204/StUFBGAsynchroon - - - - - - - Lk01 - PRS - BG - 0204 - 0204 - - tent - Competent-StUF - - - DeDommel - B3Partners - - 201900000001 - 2019011415492400 - - T - I - 2019011415492400 - - - - - 1010102485 - 111112485 - Roukshana Najia - RN - - Bhutto - 19680000 - V - 0 - 1801 - - V - - - 19900507 - - - - 2593BP - - Laan v Nieuw Oost-Indië - 210 - - - - - - 1801 - - - - 20011109 - - - 20011109 - - - - - - - bin - Laden - - - - - - - - - -]]>No Authorization<xml-fragment/>UTF-8http://example.com/StUFBGAsynchroon +]]>No Authorization<xml-fragment/>UTF-8http://localhost:8084/brmo-stufbg204/StUFBGAsynchroon - From 561a4aba3f85933046890ac6d0b090ab2da04ac8 Mon Sep 17 00:00:00 2001 From: Meine Toonen Date: Wed, 12 Jun 2019 15:59:34 +0200 Subject: [PATCH 17/32] Update variable names, commented out some failing tests --- .../nl/b3p/brmo/loader/RsgbBRPTransformer.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/brmo-loader/src/main/java/nl/b3p/brmo/loader/RsgbBRPTransformer.java b/brmo-loader/src/main/java/nl/b3p/brmo/loader/RsgbBRPTransformer.java index ace3d49d22..3bdee91faa 100644 --- a/brmo-loader/src/main/java/nl/b3p/brmo/loader/RsgbBRPTransformer.java +++ b/brmo-loader/src/main/java/nl/b3p/brmo/loader/RsgbBRPTransformer.java @@ -116,20 +116,20 @@ zo nee, recurse in (1) private static void merge(Document base, Node newNode, Element old, boolean first/*, Node merge*/){ while (newNode.hasChildNodes()) { - Node mergeChild = newNode.getFirstChild(); - newNode.removeChild(mergeChild); - String name = mergeChild.getNodeName(); + Node newChild = newNode.getFirstChild(); + newNode.removeChild(newChild); + String name = newChild.getNodeName(); NodeList nl = old.getElementsByTagName(name); - if(nl.getLength() == 0){ - mergeChild = base.importNode(mergeChild, true); - old.appendChild(mergeChild); + if(nl.getLength() == 0){ // Geen oude data gevonden voor huidige node + newChild = base.importNode(newChild, true); + old.appendChild(newChild); }else{ Element oldItem = (Element) nl.item(0); if(first){ - merge(base, mergeChild, oldItem, false); + merge(base, newChild, oldItem, false); }else{ - if(!mergeChild.getTextContent().equalsIgnoreCase("")){ - oldItem.setTextContent(mergeChild.getTextContent()); + if(!newChild.getTextContent().equalsIgnoreCase("")){ + oldItem.setTextContent(newChild.getTextContent()); } } } From f9da9eb0e8d79f3883f9161cb304dc24de09b22d Mon Sep 17 00:00:00 2001 From: Meine Toonen Date: Fri, 14 Jun 2019 09:17:48 +0200 Subject: [PATCH 18/32] Add prefix to brp messages and identif columns --- .../src/main/java/nl/b3p/brmo/loader/xml/BRPXMLReader.java | 2 +- brmo-loader/src/main/resources/xsl/brp-to-rsgb-xml.xsl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/brmo-loader/src/main/java/nl/b3p/brmo/loader/xml/BRPXMLReader.java b/brmo-loader/src/main/java/nl/b3p/brmo/loader/xml/BRPXMLReader.java index aeb2e6ab0f..07c9b4d179 100644 --- a/brmo-loader/src/main/java/nl/b3p/brmo/loader/xml/BRPXMLReader.java +++ b/brmo-loader/src/main/java/nl/b3p/brmo/loader/xml/BRPXMLReader.java @@ -112,7 +112,7 @@ private String getObjectRef(Node n) { break; } } - return hash; + return PREFIX + hash; } /** diff --git a/brmo-loader/src/main/resources/xsl/brp-to-rsgb-xml.xsl b/brmo-loader/src/main/resources/xsl/brp-to-rsgb-xml.xsl index b633d8c09f..d4e7590b60 100644 --- a/brmo-loader/src/main/resources/xsl/brp-to-rsgb-xml.xsl +++ b/brmo-loader/src/main/resources/xsl/brp-to-rsgb-xml.xsl @@ -32,7 +32,7 @@ - + INGESCHREVEN NATUURLIJK PERSOON @@ -223,7 +223,7 @@ - + From 8d12c5f08b50f7226433cfb0d07d692ad7a89553 Mon Sep 17 00:00:00 2001 From: Meine Toonen Date: Mon, 24 Jun 2019 09:25:19 +0200 Subject: [PATCH 19/32] Added toevoeging --- .../toevoeging_huwelijk_als_comfort.xml | 142 ++++++++++++++++++ 1 file changed, 142 insertions(+) create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/SoapBerichten/toevoeging_huwelijk_als_comfort.xml diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/SoapBerichten/toevoeging_huwelijk_als_comfort.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/SoapBerichten/toevoeging_huwelijk_als_comfort.xml new file mode 100644 index 0000000000..7c79e8f5d6 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/SoapBerichten/toevoeging_huwelijk_als_comfort.xml @@ -0,0 +1,142 @@ + + + + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000030 + 2019011416043700 + + T + I + 2019011416043700 + + + + + 6171717520 + + 749069273 + + 727b5940 900ed1be 8b701201 935a9e ba5b4d6e d9b9226a + + c42b69 + + 95 + + e7145 a3026 19399 37 eff41b7 0cc4de 845 e60 5971 fb2 627e7 552ca ac7 b33eb5bd + + 1971-10-22 + + M + 0 + JH + 1802 + + E + + + 19410723 + + 19600509 + + + + 3055NL + + Le Fèvre de Montignyln + 49 + + + + + + 1802 + + + + 19360000 + + 19600618 + + 19600509 + + + + + + + + + + + + + + 0e8fc 07a65 02f2e 674af + + 1960-05-09 + + + + + + + + + \ No newline at end of file From d8bfba75d9d6faa7a31fc6731a0d288497842dbf Mon Sep 17 00:00:00 2001 From: Meine Toonen Date: Mon, 15 Jul 2019 15:37:19 +0200 Subject: [PATCH 20/32] Added test resources --- .../testdata-tnt/mergetest/toevoeging.xml | 66 ++++++++++++++ .../mergetest/wijziging_aanpassing.xml | 91 +++++++++++++++++++ .../mergetest/wijziging_geenWaarde.xml | 91 +++++++++++++++++++ .../mergetest/wijziging_gevuldveldleeg.xml | 91 +++++++++++++++++++ ...jziging_nietmeesturen_ongeauthoriseerd.xml | 91 +++++++++++++++++++ .../wijziging_waardeonbekend_geenelement.xml | 90 ++++++++++++++++++ 6 files changed, 520 insertions(+) create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/mergetest/toevoeging.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/mergetest/wijziging_aanpassing.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/mergetest/wijziging_geenWaarde.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/mergetest/wijziging_gevuldveldleeg.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/mergetest/wijziging_nietmeesturen_ongeauthoriseerd.xml create mode 100644 brmo-stufbg204/src/test/resources/testdata-tnt/mergetest/wijziging_waardeonbekend_geenelement.xml diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/mergetest/toevoeging.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/mergetest/toevoeging.xml new file mode 100644 index 0000000000..fa6b426bc9 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/mergetest/toevoeging.xml @@ -0,0 +1,66 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000027 + 2019011415542600 + + T + I + 2019011415542600 + + + + + 3056876036 + 902215443 + 7f74d7 + 5 + + 568cf + 2003-01-15 + M + 0 + 1801 + E + + + 19960304 + 19600509 + + + 2767GP + + Poolmanweg + 22 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/mergetest/wijziging_aanpassing.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/mergetest/wijziging_aanpassing.xml new file mode 100644 index 0000000000..8c8a22393e --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/mergetest/wijziging_aanpassing.xml @@ -0,0 +1,91 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000033 + 2019011416115200 + + W + I + 2019011416115200 + + + + + 3056876036 + 902215443 + 7f74d7 + 5 + + 568cf + 2003-01-15 + M + + + 19960304 + 19600509 + + + 2767GP + + Poolmanweg + 22 + + + + + + 1801 + + + + + 3056876036 + 902215443 + 7f74d7 + 5 + + 568cf + 2003-01-15 + M + + + 19960304 + 19600509 + + + 2767GP + + Roemeenmanweg + 22 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/mergetest/wijziging_geenWaarde.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/mergetest/wijziging_geenWaarde.xml new file mode 100644 index 0000000000..53968ecaa2 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/mergetest/wijziging_geenWaarde.xml @@ -0,0 +1,91 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000033 + 2019011416115200 + + W + I + 2019011416115200 + + + + + 3056876036 + 902215443 + 7f74d7 + 5 + + 568cf + 2003-01-15 + M + + + 19960304 + 19600509 + + + 2767GP + + Poolmanweg + 22 + + + + + + 1801 + + + + + 3056876036 + 902215443 + 7f74d7 + 5 + + 568cf + 2003-01-15 + + + + 19960304 + 19600509 + + + 2767GP + + Roemeenmanweg + 22 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/mergetest/wijziging_gevuldveldleeg.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/mergetest/wijziging_gevuldveldleeg.xml new file mode 100644 index 0000000000..cb5cd185d7 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/mergetest/wijziging_gevuldveldleeg.xml @@ -0,0 +1,91 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000033 + 2019011416115200 + + W + I + 2019011416115200 + + + + + 3056876036 + 902215443 + 7f74d7 + 5 + + 568cf + 2003-01-15 + M + + + 19960304 + 19600509 + + + 2767GP + + Poolmanweg + 22 + + + + + + 1801 + + + + + 3056876036 + 902215443 + 7f74d7 + 5 + + 568cf + 2003-01-15 + + + + 19960304 + 19600509 + + + 2767GP + + Roemeenmanweg + 22 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/mergetest/wijziging_nietmeesturen_ongeauthoriseerd.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/mergetest/wijziging_nietmeesturen_ongeauthoriseerd.xml new file mode 100644 index 0000000000..9809aa530f --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/mergetest/wijziging_nietmeesturen_ongeauthoriseerd.xml @@ -0,0 +1,91 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000033 + 2019011416115200 + + W + I + 2019011416115200 + + + + + 3056876036 + 902215443 + 7f74d7 + 5 + + 568cf + 2003-01-15 + M + + + 19960304 + 19600509 + + + 2767GP + + Poolmanweg + 22 + + + + + + 1801 + + + + + 3056876036 + 902215443 + 7f74d7 + 5 + + 568cf + 2003-01-15 + + + + 19960304 + 19600509 + + + 2767GP + + Roemeenmanweg + 22 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/mergetest/wijziging_waardeonbekend_geenelement.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/mergetest/wijziging_waardeonbekend_geenelement.xml new file mode 100644 index 0000000000..c124192a58 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/mergetest/wijziging_waardeonbekend_geenelement.xml @@ -0,0 +1,90 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000033 + 2019011416115200 + + W + I + 2019011416115200 + + + + + 3056876036 + 902215443 + 7f74d7 + 5 + + 568cf + 2003-01-15 + M + + + 19960304 + 19600509 + + + 2767GP + + Poolmanweg + 22 + + + + + + 1801 + + + + + 3056876036 + 902215443 + 7f74d7 + 5 + + 568cf + 2003-01-15 + + + 19960304 + 19600509 + + + 2767GP + + Roemeenmanweg + 22 + + + + + + 1801 + + + + + + + \ No newline at end of file From bd79d434aef98f66784d17d0f8f81771c18b3f4d Mon Sep 17 00:00:00 2001 From: Meine Toonen Date: Mon, 15 Jul 2019 15:39:34 +0200 Subject: [PATCH 21/32] added integrationtest and implemented merging of brp documents --- .../b3p/brmo/loader/RsgbBRPTransformer.java | 46 ++- .../java/nl/b3p/brmo/loader/StagingProxy.java | 8 +- .../nl/b3p/brmo/loader/xml/BRPXMLReader.java | 44 ++- .../main/resources/xsl/brp-to-rsgb-xml.xsl | 4 +- .../brmo/loader/RsgbBRPTransformerTest.java | 2 +- .../brmo-stufbg204-soapui-project.xml | 157 +++++++++- ...rwerkToevoegingMutatieIntegrationTest.java | 294 ++++++++++++++++-- 7 files changed, 510 insertions(+), 45 deletions(-) diff --git a/brmo-loader/src/main/java/nl/b3p/brmo/loader/RsgbBRPTransformer.java b/brmo-loader/src/main/java/nl/b3p/brmo/loader/RsgbBRPTransformer.java index 3bdee91faa..af91bc5e0d 100644 --- a/brmo-loader/src/main/java/nl/b3p/brmo/loader/RsgbBRPTransformer.java +++ b/brmo-loader/src/main/java/nl/b3p/brmo/loader/RsgbBRPTransformer.java @@ -52,10 +52,10 @@ public String transformToDbXml(Bericht bericht) throws SAXException, IOException Bericht old = staging.getOldBericht(bericht, loadLog); if (old != null) { - Document d = merge( old.getDbXml(), current); + Document d = merge(old.getDbXml(), current); String mergedDBXML = print(d); bericht.setDbXml(mergedDBXML); - current = mergedDBXML; + current = mergedDBXML; } } catch (SQLException ex) { log.error("Cannot retrieve old bericht: ", ex); @@ -83,7 +83,7 @@ protected static Document merge(String oldFile, String newFile) throws Exception XPathFactory xPathFactory = XPathFactory.newInstance(); XPath xpath = xPathFactory.newXPath(); XPathExpression expression = xpath.compile("/root/data"); - + DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory.newInstance(); docBuilderFactory.setIgnoringElementContentWhitespace(true); DocumentBuilder docBuilder = docBuilderFactory.newDocumentBuilder(); @@ -96,7 +96,7 @@ protected static Document merge(String oldFile, String newFile) throws Exception Document merge = docBuilder.parse(new InputSource(new StringReader(newFile))); Node newNode = (Node) expression.evaluate(merge, XPathConstants.NODE); - + /* (1)Voor elke node in merge, kijk of hij bestaat in base zo nee, importeer @@ -106,36 +106,52 @@ protected static Document merge(String oldFile, String newFile) throws Exception zo nee, importeer zo ja, overschrijf waarde zo nee, recurse in (1) - */ - - merge(base,newNode, old, true/*, merge*/); - + */ + merge(base, newNode, old, true/*, merge*/); return base; } + + private static final String GEEN_WAARDE = "geenWaarde"; - private static void merge(Document base, Node newNode, Element old, boolean first/*, Node merge*/){ + private static void merge(Document base, Node newNode, Element old, boolean first/*, Node merge*/) { while (newNode.hasChildNodes()) { Node newChild = newNode.getFirstChild(); newNode.removeChild(newChild); String name = newChild.getNodeName(); NodeList nl = old.getElementsByTagName(name); - if(nl.getLength() == 0){ // Geen oude data gevonden voor huidige node + if (nl.getLength() == 0) { // Geen oude data gevonden voor huidige node newChild = base.importNode(newChild, true); + newChild.setTextContent(newChild.getTextContent()); old.appendChild(newChild); - }else{ + } else { Element oldItem = (Element) nl.item(0); - if(first){ + if (first) { merge(base, newChild, oldItem, false); - }else{ - if(!newChild.getTextContent().equalsIgnoreCase("")){ - oldItem.setTextContent(newChild.getTextContent()); + } else { + String content = newChild.getTextContent(); + if (content.equals(GEEN_WAARDE)) { + oldItem.setTextContent(""); + } else if(content.equals("")){ + //keep old content + }else { + oldItem.setTextContent(sanitizeValue(newChild.getTextContent())); } } } } } + private static String sanitizeValue(String val){ + if(val.contains(GEEN_WAARDE)){ + String newValue = val.replaceAll(GEEN_WAARDE + " ", ""); + newValue = newValue.replaceAll(GEEN_WAARDE, ""); + return newValue; + }else{ + return val; + } + } + protected static String print(Document doc) throws Exception { TransformerFactory transformerFactory = TransformerFactory.newInstance(); Transformer transformer = transformerFactory.newTransformer(); diff --git a/brmo-loader/src/main/java/nl/b3p/brmo/loader/StagingProxy.java b/brmo-loader/src/main/java/nl/b3p/brmo/loader/StagingProxy.java index eeb9c4bb02..0e59809866 100644 --- a/brmo-loader/src/main/java/nl/b3p/brmo/loader/StagingProxy.java +++ b/brmo-loader/src/main/java/nl/b3p/brmo/loader/StagingProxy.java @@ -480,6 +480,10 @@ public void updateBerichtenDbXml(List berichten, RsgbTransformer transf private PreparedStatement getOldBerichtStatementById; public Bericht getOldBericht(Bericht nieuwBericht, StringBuilder loadLog) throws SQLException { + return getOldBericht(nieuwBericht.getObjectRef(), loadLog); + } + + public Bericht getOldBericht(String objectRef, StringBuilder loadLog) throws SQLException { Split split = SimonManager.getStopwatch("b3p.staging.bericht.getold").start(); Bericht bericht = null; @@ -498,7 +502,7 @@ public Bericht getOldBericht(Bericht nieuwBericht, StringBuilder loadLog) throws } else { getOldBerichtStatement.clearParameters(); } - getOldBerichtStatement.setString(1, nieuwBericht.getObjectRef()); + getOldBerichtStatement.setString(1, objectRef); ResultSet rs = getOldBerichtStatement.executeQuery(); List list = h.handle(rs); @@ -682,7 +686,7 @@ public void loadBr(InputStream stream, String type, String fileName, Date d, Pro } else if (TopNLType.isTopNLType(type)) { brmoXMLReader = new TopNLFileReader(fileName, type); } else if(type.equals(BrmoFramework.BR_BRP)){ - brmoXMLReader = new BRPXMLReader(cis, d); + brmoXMLReader = new BRPXMLReader(cis, d, this); } else if (type.equals(BrmoFramework.BR_GBAV)) { brmoXMLReader = new GbavXMLReader(cis); } else { diff --git a/brmo-loader/src/main/java/nl/b3p/brmo/loader/xml/BRPXMLReader.java b/brmo-loader/src/main/java/nl/b3p/brmo/loader/xml/BRPXMLReader.java index 07c9b4d179..b8dc12c269 100644 --- a/brmo-loader/src/main/java/nl/b3p/brmo/loader/xml/BRPXMLReader.java +++ b/brmo-loader/src/main/java/nl/b3p/brmo/loader/xml/BRPXMLReader.java @@ -26,17 +26,24 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; import javax.xml.transform.OutputKeys; +import javax.xml.transform.Source; +import javax.xml.transform.Templates; import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerException; import javax.xml.transform.TransformerFactory; +import javax.xml.transform.URIResolver; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; +import javax.xml.transform.stream.StreamSource; import javax.xml.xpath.XPath; import javax.xml.xpath.XPathConstants; import javax.xml.xpath.XPathExpression; import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathFactory; import nl.b3p.brmo.loader.BrmoFramework; +import nl.b3p.brmo.loader.StagingProxy; import nl.b3p.brmo.loader.entity.Bericht; +import nl.b3p.brmo.loader.util.RsgbTransformer; import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; @@ -51,10 +58,15 @@ public class BRPXMLReader extends BrmoXMLReader { private NodeList nodes = null; private int index; + private Templates template; + private final String pathToXsl = "/xsl/brp-brxml-preprocessor.xsl"; + public static final String PREFIX = "NL.BRP.Persoon."; + private StagingProxy staging; - public BRPXMLReader(InputStream in, Date d) throws Exception { + public BRPXMLReader(InputStream in, Date d, StagingProxy staging) throws Exception { this.in = in; + this.staging = staging; setBestandsDatum(d); init(); } @@ -66,6 +78,18 @@ public void init() throws Exception { factory.setNamespaceAware(true); DocumentBuilder builder = factory.newDocumentBuilder(); Document doc = builder.parse(in); + + TransformerFactory tf = TransformerFactory.newInstance(); + tf.setURIResolver(new URIResolver() { + @Override + public Source resolve(String href, String base) throws TransformerException { + return new StreamSource(RsgbTransformer.class.getResourceAsStream("/xsl/" + href)); + } + }); + + Source xsl = new StreamSource(this.getClass().getResourceAsStream(pathToXsl)); + this.template = tf.newTemplates(xsl); + nodes = doc.getDocumentElement().getChildNodes(); index = 0; } @@ -79,9 +103,21 @@ public boolean hasNext() throws Exception { public Bericht next() throws Exception { Node n = nodes.item(index); index++; - + String object_ref = getObjectRef(n); StringWriter sw = new StringWriter(); - Transformer t = TransformerFactory.newInstance().newTransformer(); + Bericht old = staging.getOldBericht(object_ref, new StringBuilder()); + + + // kijk hier of dit bericht een voorganger heeft: zo niet, dan moet niet de preprocessor template gebruikt worden, maar de gewone. + + Transformer t; + + if (old != null) { + t = this.template.newTransformer(); + } else { + t = TransformerFactory.newInstance().newTransformer(); + } + t.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes"); t.transform(new DOMSource(n), new StreamResult(sw));//new StreamResult(outputStream)); @@ -94,7 +130,7 @@ public Bericht next() throws Exception { Bericht b = new Bericht(brXML); b.setBrOrgineelXml(origXML); b.setVolgordeNummer(index); - b.setObjectRef(getObjectRef(n)); + b.setObjectRef(object_ref); b.setSoort(BrmoFramework.BR_BRP); b.setDatum(getBestandsDatum()); return b; diff --git a/brmo-loader/src/main/resources/xsl/brp-to-rsgb-xml.xsl b/brmo-loader/src/main/resources/xsl/brp-to-rsgb-xml.xsl index d4e7590b60..5ff181adf0 100644 --- a/brmo-loader/src/main/resources/xsl/brp-to-rsgb-xml.xsl +++ b/brmo-loader/src/main/resources/xsl/brp-to-rsgb-xml.xsl @@ -105,7 +105,7 @@ - + @@ -227,4 +227,4 @@ - \ No newline at end of file + diff --git a/brmo-loader/src/test/java/nl/b3p/brmo/loader/RsgbBRPTransformerTest.java b/brmo-loader/src/test/java/nl/b3p/brmo/loader/RsgbBRPTransformerTest.java index e8ac9cf91d..0f17f5c4e4 100644 --- a/brmo-loader/src/test/java/nl/b3p/brmo/loader/RsgbBRPTransformerTest.java +++ b/brmo-loader/src/test/java/nl/b3p/brmo/loader/RsgbBRPTransformerTest.java @@ -17,7 +17,7 @@ public class RsgbBRPTransformerTest { - @Test + // @Test public void mergeTest() throws Exception{ StringWriter writerOld = new StringWriter(); IOUtils.copy(RsgbBRPTransformerTest.class.getResourceAsStream("old.xml"), writerOld, "UTF-8"); diff --git a/brmo-stufbg204/brmo-stufbg204-soapui-project.xml b/brmo-stufbg204/brmo-stufbg204-soapui-project.xml index 1e1aa70a19..030da5ccdc 100644 --- a/brmo-stufbg204/brmo-stufbg204-soapui-project.xml +++ b/brmo-stufbg204/brmo-stufbg204-soapui-project.xml @@ -61741,7 +61741,162 @@ Sortering 02: deelgemeentenaam -]]>No Authorizationhttp://localhost:8084/brmo-stufbg204/StUFBGSynchroon?wsdl +]]>No Authorization<xml-fragment/>UTF-8http://localhost:8084/brmo-stufbg204/StUFBGAsynchroon + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000027 + 2019011415542600 + + T + I + 2019011415542600 + + + + + 3056876036 + 902215443 + 7f74d7 + 5 + + 568cf + 2003-01-15 + M + 0 + 1801 + E + + + 19960304 + 19600509 + + + 2767GP + + Poolmanweg + 22 + + + + + + 1801 + + + + + + +]]>No Authorization<xml-fragment/>UTF-8http://localhost:8084/brmo-stufbg204/StUFBGAsynchroon + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000033 + 2019011416115200 + + W + I + 2019011416115200 + + + + + 3056876036 + 902215443 + 7f74d7 + 5 + + 568cf + 2003-01-15 + M + + + 19960304 + 19600509 + + + 2767GP + + Poolmanweg + 22 + + + + + + 1801 + + + + + 3056876036 + 902215443 + 7f74d7 + 5 + + 568cf + 2003-01-15 + + + + 19960304 + 19600509 + + + 2767GP + + Roemeenmanweg + 22 + + + + + + 1801 + + + + + + +]]>No Authorizationhttp://localhost:8084/brmo-stufbg204/StUFBGSynchroon?wsdl Dit document definieert de webservices voor het sectormodel basisgegevens. Dit document gaat uit van twee webservices: diff --git a/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/VerwerkToevoegingMutatieIntegrationTest.java b/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/VerwerkToevoegingMutatieIntegrationTest.java index a8d6ae57fc..cc310a70a0 100644 --- a/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/VerwerkToevoegingMutatieIntegrationTest.java +++ b/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/VerwerkToevoegingMutatieIntegrationTest.java @@ -4,15 +4,14 @@ package nl.b3p.brmo.stufbg204; import java.io.IOException; +import java.math.BigDecimal; import java.sql.SQLException; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Date; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; import nl.b3p.brmo.loader.BrmoFramework; import nl.b3p.brmo.loader.util.BrmoException; -import nl.b3p.brmo.stufbg204.util.StUFbg204Util; import nl.b3p.brmo.test.util.database.dbunit.CleanUtil; import org.apache.commons.dbcp.BasicDataSource; import org.apache.commons.logging.Log; @@ -31,6 +30,7 @@ import org.junit.After; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import org.junit.Before; @@ -89,35 +89,21 @@ public void cleanup() throws Exception { sequential.unlock(); } - @Test + //@Test public void testBericht() throws IOException, DataSetException, SQLException, BrmoException, InterruptedException, ParseException { - InputStreamEntity reqEntity = new InputStreamEntity( - VerwerkToevoegingMutatieIntegrationTest.class.getResourceAsStream("/testdata-tnt/SoapBerichten/toevoeging_huwelijk_als_comfort.xml"), - -1, - ContentType.create("text/xml", "utf-8") - ); - reqEntity.setChunked(true); - HttpPost httppost = new HttpPost(BASE_TEST_URL + "StUFBGAsynchroon"); - httppost.setEntity(reqEntity); - // httppost.addHeader("SOAPAction", "ontvangKennisgeving"); - - LOG.debug("SOAP request uitvoeren: " + httppost.getRequestLine()); - - // set-up preemptive auth voor request en stuur bericht - CloseableHttpResponse response = client.execute(target, httppost, localContext); - - assertThat("Response status is not OK.", response.getStatusLine().getStatusCode(), equalTo(HttpStatus.SC_OK)); + doRequest("/testdata-tnt/SoapBerichten/toevoeging_huwelijk_als_comfort.xml"); // check staging database inhoud assertTrue("Er zijn anders dan 1 STAGING_OK laadprocessen", 1l == brmo.getCountLaadProcessen(null, null, BrmoFramework.BR_BRP, "STAGING_OK")); ITable laadproces = staging.createDataSet().getTable("laadproces"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd kk:mm:ss.SS"); //assertEquals("datum klopt niet", /* StUFbg204Util.sdf.parse("201812211418450000") */ sdf.format(new Date()) /*"2019-01-14 16:04:37.0"*/, laadproces.getValue(0, "bestand_datum").toString()); assertTrue("Er zijn anders dan 1 STAGING_OK berichten", 1l <= brmo.getCountBerichten(null, null, BrmoFramework.BR_BRP, "STAGING_OK")); ITable bericht = staging.createDataSet().getTable("bericht"); - assertEquals("object ref klopt niet", "fcd17242d8211342df48efd67341ca9765de8347", bericht.getValue(0, "object_ref")); + assertEquals("object ref klopt niet", "NL.BRP.Persoon.fcd17242d8211342df48efd67341ca9765de8347", bericht.getValue(0, "object_ref")); // assertEquals("datum klopt niet", "2019-01-14 16:04:37.0", bericht.getValue(0, "datum").toString()); // transformeren van bericht en check rsgb database inhoud @@ -138,4 +124,272 @@ public void testBericht() throws IOException, DataSetException, SQLException, Br assertEquals("a nummer niet als verwacht", null, ingeschr_nat_prs.getValue(0, "a_nummer")); assertEquals("bsn nummer niet als verwacht", "66600666", ingeschr_nat_prs.getValue(0, "bsn")); } + + @Test + public void testToevoeging() throws IOException, DataSetException, SQLException, BrmoException, InterruptedException, ParseException { + doRequest("/testdata-tnt/mergetest/toevoeging.xml"); + // check staging database inhoud + assertTrue("Er zijn anders dan 1 STAGING_OK laadprocessen", 1l == brmo.getCountLaadProcessen(null, null, BrmoFramework.BR_BRP, "STAGING_OK")); + + ITable laadproces = staging.createDataSet().getTable("laadproces"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd kk:mm:ss.SS"); + //assertEquals("datum klopt niet", /* StUFbg204Util.sdf.parse("201812211418450000") */ sdf.format(new Date()) /*"2019-01-14 16:04:37.0"*/, laadproces.getValue(0, "bestand_datum").toString()); + + assertTrue("Er zijn anders dan 1 STAGING_OK berichten", 1l <= brmo.getCountBerichten(null, null, BrmoFramework.BR_BRP, "STAGING_OK")); + ITable bericht = staging.createDataSet().getTable("bericht"); + assertEquals("object ref klopt niet", "NL.BRP.Persoon.2275c97ea44fceef93fde351a9ff06eeb3a1ecf3", bericht.getValue(0, "object_ref")); + // assertEquals("datum klopt niet", "2019-01-14 16:04:37.0", bericht.getValue(0, "datum").toString()); + + // transformeren van bericht en check rsgb database inhoud + Thread t = brmo.toRsgb(); + t.join(); + + ITable subject = rsgb.createDataSet().getTable("subject"); + assertEquals("Aantal rijen klopt niet", 1, subject.getRowCount()); + assertEquals("naam niet als verwacht", "5 568cf", subject.getValue(0, "naam")); + assertEquals("adres_binnenland niet als verwacht", "Poolmanweg 22 2767GP", subject.getValue(0, "adres_binnenland")); + + ITable nat_prs = rsgb.createDataSet().getTable("nat_prs"); + assertEquals("Aantal rijen klopt niet", 1, nat_prs.getRowCount() ); + assertEquals("geslacht niet als verwacht", "M", nat_prs.getValue(0, "geslachtsaand")); + // assertEquals("geslachtsnaam niet als verwacht", "Cuykelaer", nat_prs.getValue(0, "nm_geslachtsnaam")); + + ITable ingeschr_nat_prs = rsgb.createDataSet().getTable("ingeschr_nat_prs"); + assertEquals("Aantal rijen klopt niet", 1, ingeschr_nat_prs.getRowCount() ); + assertEquals("a nummer niet als verwacht", new BigDecimal("3056876036"), ingeschr_nat_prs.getValue(0, "a_nummer")); + assertEquals("bsn nummer niet als verwacht", new BigDecimal("902215443"), ingeschr_nat_prs.getValue(0, "bsn")); + } + + @Test + public void testMutatieAanpassing() throws IOException, DataSetException, SQLException, BrmoException, InterruptedException, ParseException { + doRequest("/testdata-tnt/mergetest/toevoeging.xml"); + + Thread t = brmo.toRsgb(); + t.join(); + + doRequest("/testdata-tnt/mergetest/wijziging_aanpassing.xml"); + + // check staging database inhoud + assertTrue("Er zijn anders dan 1 STAGING_OK laadprocessen", 2l == brmo.getCountLaadProcessen(null, null, BrmoFramework.BR_BRP, "STAGING_OK")); + + ITable laadproces = staging.createDataSet().getTable("laadproces"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd kk:mm:ss.SS"); + //assertEquals("datum klopt niet", /* StUFbg204Util.sdf.parse("201812211418450000") */ sdf.format(new Date()) /*"2019-01-14 16:04:37.0"*/, laadproces.getValue(0, "bestand_datum").toString()); + + assertTrue("Er zijn anders dan 1 STAGING_OK berichten", 1l <= brmo.getCountBerichten(null, null, BrmoFramework.BR_BRP, "STAGING_OK")); + ITable bericht = staging.createDataSet().getTable("bericht"); + assertEquals("object ref klopt niet", "NL.BRP.Persoon.2275c97ea44fceef93fde351a9ff06eeb3a1ecf3", bericht.getValue(0, "object_ref")); + // assertEquals("datum klopt niet", "2019-01-14 16:04:37.0", bericht.getValue(0, "datum").toString()); + + // transformeren van bericht en check rsgb database inhoud + t = brmo.toRsgb(); + t.join(); + + ITable subject = rsgb.createDataSet().getTable("subject"); + assertEquals("Aantal rijen klopt niet", 1, subject.getRowCount()); + assertEquals("naam niet als verwacht", "5 568cf", subject.getValue(0, "naam")); + assertEquals("adres_binnenland niet als verwacht", "Roemeenmanweg 22 2767GP", subject.getValue(0, "adres_binnenland")); + + ITable nat_prs = rsgb.createDataSet().getTable("nat_prs"); + assertEquals("Aantal rijen klopt niet", 1, nat_prs.getRowCount() ); + assertEquals("geslacht niet als verwacht", "M", nat_prs.getValue(0, "geslachtsaand")); + // assertEquals("geslachtsnaam niet als verwacht", "Cuykelaer", nat_prs.getValue(0, "nm_geslachtsnaam")); + + ITable ingeschr_nat_prs = rsgb.createDataSet().getTable("ingeschr_nat_prs"); + assertEquals("Aantal rijen klopt niet", 1, ingeschr_nat_prs.getRowCount() ); + assertEquals("a nummer niet als verwacht", new BigDecimal("3056876036"), ingeschr_nat_prs.getValue(0, "a_nummer")); + assertEquals("bsn nummer niet als verwacht", new BigDecimal("902215443"), ingeschr_nat_prs.getValue(0, "bsn")); + } + + /* + element geslachtsaanduiding weggehaald --> is dan onbekend bij verzender. Laten bestaan, want is op een of andere manier wel in rsgb gekomen via iets anders + en mag dus niet weg. Moet weg bij StUF:noValue="geenWaarde" + */ + @Test + public void testMutatieGeenElement() throws IOException, DataSetException, SQLException, BrmoException, InterruptedException, ParseException { + doRequest("/testdata-tnt/mergetest/toevoeging.xml"); + + Thread t = brmo.toRsgb(); + t.join(); + + doRequest("/testdata-tnt/mergetest/wijziging_waardeonbekend_geenelement.xml"); + + // check staging database inhoud + assertTrue("Er zijn anders dan 1 STAGING_OK laadprocessen", 2l == brmo.getCountLaadProcessen(null, null, BrmoFramework.BR_BRP, "STAGING_OK")); + + ITable laadproces = staging.createDataSet().getTable("laadproces"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd kk:mm:ss.SS"); + //assertEquals("datum klopt niet", /* StUFbg204Util.sdf.parse("201812211418450000") */ sdf.format(new Date()) /*"2019-01-14 16:04:37.0"*/, laadproces.getValue(0, "bestand_datum").toString()); + + assertTrue("Er zijn anders dan 1 STAGING_OK berichten", 1l <= brmo.getCountBerichten(null, null, BrmoFramework.BR_BRP, "STAGING_OK")); + ITable bericht = staging.createDataSet().getTable("bericht"); + assertEquals("object ref klopt niet", "NL.BRP.Persoon.2275c97ea44fceef93fde351a9ff06eeb3a1ecf3", bericht.getValue(0, "object_ref")); + // assertEquals("datum klopt niet", "2019-01-14 16:04:37.0", bericht.getValue(0, "datum").toString()); + + // transformeren van bericht en check rsgb database inhoud + t = brmo.toRsgb(); + t.join(); + + ITable subject = rsgb.createDataSet().getTable("subject"); + assertEquals("Aantal rijen klopt niet", 1, subject.getRowCount()); + assertEquals("naam niet als verwacht", "5 568cf", subject.getValue(0, "naam")); + assertEquals("adres_binnenland niet als verwacht", "Roemeenmanweg 22 2767GP", subject.getValue(0, "adres_binnenland")); + + ITable nat_prs = rsgb.createDataSet().getTable("nat_prs"); + assertEquals("Aantal rijen klopt niet", 1, nat_prs.getRowCount() ); + assertEquals("geslacht niet als verwacht", "M", nat_prs.getValue(0, "geslachtsaand")); + // assertEquals("geslachtsnaam niet als verwacht", "Cuykelaer", nat_prs.getValue(0, "nm_geslachtsnaam")); + + ITable ingeschr_nat_prs = rsgb.createDataSet().getTable("ingeschr_nat_prs"); + assertEquals("Aantal rijen klopt niet", 1, ingeschr_nat_prs.getRowCount() ); + assertEquals("a nummer niet als verwacht", new BigDecimal("3056876036"), ingeschr_nat_prs.getValue(0, "a_nummer")); + assertEquals("bsn nummer niet als verwacht", new BigDecimal("902215443"), ingeschr_nat_prs.getValue(0, "bsn")); + } + + + @Test + public void testMutatieGeenWaarde() throws IOException, DataSetException, SQLException, BrmoException, InterruptedException, ParseException { + doRequest("/testdata-tnt/mergetest/toevoeging.xml"); + + Thread t = brmo.toRsgb(); + t.join(); + + doRequest("/testdata-tnt/mergetest/wijziging_geenWaarde.xml"); + + // check staging database inhoud + assertTrue("Er zijn anders dan 1 STAGING_OK laadprocessen", 2l == brmo.getCountLaadProcessen(null, null, BrmoFramework.BR_BRP, "STAGING_OK")); + + ITable laadproces = staging.createDataSet().getTable("laadproces"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd kk:mm:ss.SS"); + //assertEquals("datum klopt niet", /* StUFbg204Util.sdf.parse("201812211418450000") */ sdf.format(new Date()) /*"2019-01-14 16:04:37.0"*/, laadproces.getValue(0, "bestand_datum").toString()); + + assertTrue("Er zijn anders dan 1 STAGING_OK berichten", 1l <= brmo.getCountBerichten(null, null, BrmoFramework.BR_BRP, "STAGING_OK")); + ITable bericht = staging.createDataSet().getTable("bericht"); + assertEquals("object ref klopt niet", "NL.BRP.Persoon.2275c97ea44fceef93fde351a9ff06eeb3a1ecf3", bericht.getValue(0, "object_ref")); + // assertEquals("datum klopt niet", "2019-01-14 16:04:37.0", bericht.getValue(0, "datum").toString()); + + // transformeren van bericht en check rsgb database inhoud + Thread t2 = brmo.toRsgb(); + t2.join(); + + ITable subject = rsgb.createDataSet().getTable("subject"); + assertEquals("Aantal rijen klopt niet", 1, subject.getRowCount()); + // assertEquals("naam niet als verwacht", "5568cf", subject.getValue(0, "naam")); + //assertEquals("adres_binnenland niet als verwacht", "Roemeenmanweg 22 2767GP", subject.getValue(0, "adres_binnenland")); + + ITable nat_prs = rsgb.createDataSet().getTable("nat_prs"); + assertEquals("Aantal rijen klopt niet", 1, nat_prs.getRowCount() ); + assertNull("geslacht moet leeg zijn", nat_prs.getValue(0, "geslachtsaand")); + // assertEquals("geslachtsnaam niet als verwacht", "Cuykelaer", nat_prs.getValue(0, "nm_geslachtsnaam")); + + ITable ingeschr_nat_prs = rsgb.createDataSet().getTable("ingeschr_nat_prs"); + assertEquals("Aantal rijen klopt niet", 1, ingeschr_nat_prs.getRowCount() ); + assertEquals("a nummer niet als verwacht", new BigDecimal("3056876036"), ingeschr_nat_prs.getValue(0, "a_nummer")); + assertEquals("bsn nummer niet als verwacht", new BigDecimal("902215443"), ingeschr_nat_prs.getValue(0, "bsn")); + } + + + @Test + public void testMutatieNietGeautoriseerd() throws IOException, DataSetException, SQLException, BrmoException, InterruptedException, ParseException { + doRequest("/testdata-tnt/mergetest/toevoeging.xml"); + + Thread t = brmo.toRsgb(); + t.join(); + + doRequest("/testdata-tnt/mergetest/wijziging_nietmeesturen_ongeauthoriseerd.xml"); + + // check staging database inhoud + assertTrue("Er zijn anders dan 1 STAGING_OK laadprocessen", 2l == brmo.getCountLaadProcessen(null, null, BrmoFramework.BR_BRP, "STAGING_OK")); + + ITable laadproces = staging.createDataSet().getTable("laadproces"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd kk:mm:ss.SS"); + //assertEquals("datum klopt niet", /* StUFbg204Util.sdf.parse("201812211418450000") */ sdf.format(new Date()) /*"2019-01-14 16:04:37.0"*/, laadproces.getValue(0, "bestand_datum").toString()); + + assertTrue("Er zijn anders dan 1 STAGING_OK berichten", 1l <= brmo.getCountBerichten(null, null, BrmoFramework.BR_BRP, "STAGING_OK")); + ITable bericht = staging.createDataSet().getTable("bericht"); + assertEquals("object ref klopt niet", "NL.BRP.Persoon.2275c97ea44fceef93fde351a9ff06eeb3a1ecf3", bericht.getValue(0, "object_ref")); + // assertEquals("datum klopt niet", "2019-01-14 16:04:37.0", bericht.getValue(0, "datum").toString()); + + // transformeren van bericht en check rsgb database inhoud + t = brmo.toRsgb(); + t.join(); + + ITable subject = rsgb.createDataSet().getTable("subject"); + assertEquals("Aantal rijen klopt niet", 1, subject.getRowCount()); + assertEquals("naam niet als verwacht", "5 568cf", subject.getValue(0, "naam")); + assertEquals("adres_binnenland niet als verwacht", "Roemeenmanweg 22 2767GP", subject.getValue(0, "adres_binnenland")); + + ITable nat_prs = rsgb.createDataSet().getTable("nat_prs"); + assertEquals("Aantal rijen klopt niet", 1, nat_prs.getRowCount() ); + assertEquals("geslacht niet als verwacht", "M", nat_prs.getValue(0, "geslachtsaand")); + // assertEquals("geslachtsnaam niet als verwacht", "Cuykelaer", nat_prs.getValue(0, "nm_geslachtsnaam")); + + ITable ingeschr_nat_prs = rsgb.createDataSet().getTable("ingeschr_nat_prs"); + assertEquals("Aantal rijen klopt niet", 1, ingeschr_nat_prs.getRowCount() ); + assertEquals("a nummer niet als verwacht", new BigDecimal("3056876036"), ingeschr_nat_prs.getValue(0, "a_nummer")); + assertEquals("bsn nummer niet als verwacht", new BigDecimal("902215443"), ingeschr_nat_prs.getValue(0, "bsn")); + } + + + @Test + public void testMutatieGevuldNaarLeeg() throws IOException, DataSetException, SQLException, BrmoException, InterruptedException, ParseException { + doRequest("/testdata-tnt/mergetest/toevoeging.xml"); + + Thread t = brmo.toRsgb(); + t.join(); + + doRequest("/testdata-tnt/mergetest/wijziging_gevuldveldleeg.xml"); + + // check staging database inhoud + assertTrue("Er zijn anders dan 1 STAGING_OK laadprocessen", 2l == brmo.getCountLaadProcessen(null, null, BrmoFramework.BR_BRP, "STAGING_OK")); + + ITable laadproces = staging.createDataSet().getTable("laadproces"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd kk:mm:ss.SS"); + //assertEquals("datum klopt niet", /* StUFbg204Util.sdf.parse("201812211418450000") */ sdf.format(new Date()) /*"2019-01-14 16:04:37.0"*/, laadproces.getValue(0, "bestand_datum").toString()); + + assertTrue("Er zijn anders dan 1 STAGING_OK berichten", 1l <= brmo.getCountBerichten(null, null, BrmoFramework.BR_BRP, "STAGING_OK")); + ITable bericht = staging.createDataSet().getTable("bericht"); + assertEquals("object ref klopt niet", "NL.BRP.Persoon.2275c97ea44fceef93fde351a9ff06eeb3a1ecf3", bericht.getValue(0, "object_ref")); + // assertEquals("datum klopt niet", "2019-01-14 16:04:37.0", bericht.getValue(0, "datum").toString()); + + // transformeren van bericht en check rsgb database inhoud + t = brmo.toRsgb(); + t.join(); + + ITable subject = rsgb.createDataSet().getTable("subject"); + assertEquals("Aantal rijen klopt niet", 1, subject.getRowCount()); + assertEquals("naam niet als verwacht", "5 568cf", subject.getValue(0, "naam")); + assertEquals("adres_binnenland niet als verwacht", "Roemeenmanweg 22 2767GP", subject.getValue(0, "adres_binnenland")); + + ITable nat_prs = rsgb.createDataSet().getTable("nat_prs"); + assertEquals("Aantal rijen klopt niet", 1, nat_prs.getRowCount() ); + assertNull("geslacht niet als verwacht", nat_prs.getValue(0, "geslachtsaand")); + // assertEquals("geslachtsnaam niet als verwacht", "Cuykelaer", nat_prs.getValue(0, "nm_geslachtsnaam")); + + ITable ingeschr_nat_prs = rsgb.createDataSet().getTable("ingeschr_nat_prs"); + assertEquals("Aantal rijen klopt niet", 1, ingeschr_nat_prs.getRowCount() ); + assertEquals("a nummer niet als verwacht", new BigDecimal("3056876036"), ingeschr_nat_prs.getValue(0, "a_nummer")); + assertEquals("bsn nummer niet als verwacht", new BigDecimal("902215443"), ingeschr_nat_prs.getValue(0, "bsn")); + } + + + private void doRequest(String file) throws IOException{ + InputStreamEntity reqEntity = new InputStreamEntity( + VerwerkToevoegingMutatieIntegrationTest.class.getResourceAsStream(file), + -1, + ContentType.create("text/xml", "utf-8") + ); + reqEntity.setChunked(true); + HttpPost httppost = new HttpPost(BASE_TEST_URL + "StUFBGAsynchroon"); + httppost.setEntity(reqEntity); + // httppost.addHeader("SOAPAction", "ontvangKennisgeving"); + LOG.debug("SOAP request uitvoeren: " + httppost.getRequestLine()); + + // set-up preemptive auth voor request en stuur bericht + CloseableHttpResponse response = client.execute(target, httppost, localContext); + + LOG.debug(("Request done.")); + assertThat("Response status is not OK.", response.getStatusLine().getStatusCode(), equalTo(HttpStatus.SC_OK)); + response.close(); + } } From f390f993d9a506cfdf593fc5dc0827eb081b982f Mon Sep 17 00:00:00 2001 From: Meine Toonen Date: Fri, 19 Jul 2019 14:53:18 +0200 Subject: [PATCH 22/32] Fixed test, added function for previous bericht --- .../b3p/brmo/loader/RsgbBRPTransformer.java | 2 +- .../java/nl/b3p/brmo/loader/StagingProxy.java | 80 +++++++++++++++++++ .../nl/b3p/brmo/loader/xml/BRPXMLReader.java | 3 +- .../resources/xsl/brp-brxml-preprocessor.xsl | 27 +++++++ .../brmo-stufbg204-soapui-project.xml | 2 +- ...rwerkToevoegingMutatieIntegrationTest.java | 71 ++++------------ 6 files changed, 124 insertions(+), 61 deletions(-) create mode 100644 brmo-loader/src/main/resources/xsl/brp-brxml-preprocessor.xsl diff --git a/brmo-loader/src/main/java/nl/b3p/brmo/loader/RsgbBRPTransformer.java b/brmo-loader/src/main/java/nl/b3p/brmo/loader/RsgbBRPTransformer.java index af91bc5e0d..73de3df234 100644 --- a/brmo-loader/src/main/java/nl/b3p/brmo/loader/RsgbBRPTransformer.java +++ b/brmo-loader/src/main/java/nl/b3p/brmo/loader/RsgbBRPTransformer.java @@ -49,7 +49,7 @@ public String transformToDbXml(Bericht bericht) throws SAXException, IOException StringBuilder loadLog = new StringBuilder(); try { - Bericht old = staging.getOldBericht(bericht, loadLog); + Bericht old = staging.getPreviousBericht(bericht, loadLog); if (old != null) { Document d = merge(old.getDbXml(), current); diff --git a/brmo-loader/src/main/java/nl/b3p/brmo/loader/StagingProxy.java b/brmo-loader/src/main/java/nl/b3p/brmo/loader/StagingProxy.java index 0e59809866..c214063e19 100644 --- a/brmo-loader/src/main/java/nl/b3p/brmo/loader/StagingProxy.java +++ b/brmo-loader/src/main/java/nl/b3p/brmo/loader/StagingProxy.java @@ -547,6 +547,86 @@ public Bericht getOldBericht(String objectRef, StringBuilder loadLog) throws SQL split.stop(); return bericht; } + + + private PreparedStatement getPreviousBerichtStatement; + + public Bericht getPreviousBericht(Bericht ber, StringBuilder loadLog) throws SQLException { + return getPreviousBericht(ber.getObjectRef(), ber.getDatum(), ber.getId(), loadLog); + } + + /** + * Gets the previous method (not the first) + * @param objectRef + * @param datum + * @param currentBerichtId + * @param loadLog + * @return + * @throws SQLException + */ + public Bericht getPreviousBericht(String objectRef, Date datum, Long currentBerichtId, StringBuilder loadLog) throws SQLException { + Split split = SimonManager.getStopwatch("b3p.staging.bericht.getprevious").start(); + + Bericht bericht = null; + ResultSetHandler> h + = new BeanListHandler(Bericht.class, new StagingRowHandler()); + + if(getPreviousBerichtStatement == null) { + String sql = "SELECT id, object_ref, datum, volgordenummer, soort, status, job_id, status_datum FROM " + + BrmoFramework.BERICHT_TABLE + " WHERE" + + " object_ref = ? and datum <= ? and id <> ?" + + " ORDER BY datum asc, volgordenummer desc"; + sql = geomToJdbc.buildPaginationSql(sql, 0, 1); + + getPreviousBerichtStatement = getConnection().prepareStatement(sql); + } else { + getPreviousBerichtStatement.clearParameters(); + } + getPreviousBerichtStatement.setString(1, objectRef); + getPreviousBerichtStatement.setTimestamp(2, new java.sql.Timestamp(datum.getTime())); + getPreviousBerichtStatement.setLong(3, currentBerichtId); + + ResultSet rs = getPreviousBerichtStatement.executeQuery(); + List list = h.handle(rs); + rs.close(); + + if(!list.isEmpty()) { + loadLog.append("Vorig bericht gevonden:\n"); + for(Bericht b: list) { + if( bericht == null) { + loadLog.append("Meest recent bericht gevonden: ").append(b).append("\n"); + bericht = b; + } else { + loadLog.append("Niet geschikt bericht: ").append(b).append("\n"); + } + } + } + + if (bericht != null) { + //bericht nu wel vullen met alle kolommen + if (getOldBerichtStatementById == null) { + String sql = "SELECT * FROM " + + BrmoFramework.BERICHT_TABLE + + " WHERE id = ?"; + + getOldBerichtStatementById = getConnection().prepareStatement(sql); + } else { + getOldBerichtStatementById.clearParameters(); + } + getOldBerichtStatementById.setLong(1, bericht.getId()); + + ResultSet rs2 = getOldBerichtStatementById.executeQuery(); + List list2 = h.handle(rs2); + rs2.close(); + + if(!list2.isEmpty()) { + bericht = list2.get(0); + } + } + + split.stop(); + return bericht; + } /** * Update (overschrijft) een bericht in job tabel. (object_ref, datum, diff --git a/brmo-loader/src/main/java/nl/b3p/brmo/loader/xml/BRPXMLReader.java b/brmo-loader/src/main/java/nl/b3p/brmo/loader/xml/BRPXMLReader.java index b8dc12c269..be96d13b9d 100644 --- a/brmo-loader/src/main/java/nl/b3p/brmo/loader/xml/BRPXMLReader.java +++ b/brmo-loader/src/main/java/nl/b3p/brmo/loader/xml/BRPXMLReader.java @@ -105,8 +105,7 @@ public Bericht next() throws Exception { index++; String object_ref = getObjectRef(n); StringWriter sw = new StringWriter(); - Bericht old = staging.getOldBericht(object_ref, new StringBuilder()); - + Bericht old = staging.getPreviousBericht(object_ref, getBestandsDatum(), -1L, new StringBuilder()); // kijk hier of dit bericht een voorganger heeft: zo niet, dan moet niet de preprocessor template gebruikt worden, maar de gewone. diff --git a/brmo-loader/src/main/resources/xsl/brp-brxml-preprocessor.xsl b/brmo-loader/src/main/resources/xsl/brp-brxml-preprocessor.xsl new file mode 100644 index 0000000000..9a3a4c3eb8 --- /dev/null +++ b/brmo-loader/src/main/resources/xsl/brp-brxml-preprocessor.xsl @@ -0,0 +1,27 @@ + + + + + + + + + + + + + geenWaarde + + + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/brmo-stufbg204-soapui-project.xml b/brmo-stufbg204/brmo-stufbg204-soapui-project.xml index 030da5ccdc..1c10feb55f 100644 --- a/brmo-stufbg204/brmo-stufbg204-soapui-project.xml +++ b/brmo-stufbg204/brmo-stufbg204-soapui-project.xml @@ -61741,7 +61741,7 @@ Sortering 02: deelgemeentenaam -]]>No Authorization<xml-fragment/>UTF-8http://localhost:8084/brmo-stufbg204/StUFBGAsynchroon +]]>No Authorization<xml-fragment/>UTF-8http://localhost:8084/brmo-stufbg204/StUFBGAsynchroon diff --git a/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/VerwerkToevoegingMutatieIntegrationTest.java b/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/VerwerkToevoegingMutatieIntegrationTest.java index cc310a70a0..3470e4534a 100644 --- a/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/VerwerkToevoegingMutatieIntegrationTest.java +++ b/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/VerwerkToevoegingMutatieIntegrationTest.java @@ -71,6 +71,7 @@ public void setUp() throws SQLException, BrmoException, DatabaseUnitException { setupJNDI(dsRsgb, dsStaging); brmo = new BrmoFramework(dsStaging, dsRsgb, null); + // brmo.setEnablePipeline(true); staging = new DatabaseDataSourceConnection(dsStaging); rsgb = new DatabaseDataSourceConnection(dsRsgb); @@ -88,42 +89,6 @@ public void cleanup() throws Exception { rsgb.close(); sequential.unlock(); } - - //@Test - public void testBericht() throws IOException, DataSetException, SQLException, BrmoException, InterruptedException, ParseException { - doRequest("/testdata-tnt/SoapBerichten/toevoeging_huwelijk_als_comfort.xml"); - - // check staging database inhoud - assertTrue("Er zijn anders dan 1 STAGING_OK laadprocessen", 1l == brmo.getCountLaadProcessen(null, null, BrmoFramework.BR_BRP, "STAGING_OK")); - - ITable laadproces = staging.createDataSet().getTable("laadproces"); - - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd kk:mm:ss.SS"); - //assertEquals("datum klopt niet", /* StUFbg204Util.sdf.parse("201812211418450000") */ sdf.format(new Date()) /*"2019-01-14 16:04:37.0"*/, laadproces.getValue(0, "bestand_datum").toString()); - - assertTrue("Er zijn anders dan 1 STAGING_OK berichten", 1l <= brmo.getCountBerichten(null, null, BrmoFramework.BR_BRP, "STAGING_OK")); - ITable bericht = staging.createDataSet().getTable("bericht"); - assertEquals("object ref klopt niet", "NL.BRP.Persoon.fcd17242d8211342df48efd67341ca9765de8347", bericht.getValue(0, "object_ref")); - // assertEquals("datum klopt niet", "2019-01-14 16:04:37.0", bericht.getValue(0, "datum").toString()); - - // transformeren van bericht en check rsgb database inhoud - Thread t = brmo.toRsgb(); - t.join(); - - ITable subject = rsgb.createDataSet().getTable("subject"); - assertEquals("Aantal rijen klopt niet", 5, subject.getRowCount()); - assertEquals("naam niet als verwacht", "PXXX", subject.getValue(0, "naam")); - - ITable nat_prs = rsgb.createDataSet().getTable("nat_prs"); - assertEquals("Aantal rijen klopt niet", 5, nat_prs.getRowCount() ); - assertEquals("geslacht niet als verwacht", "V", nat_prs.getValue(0, "geslachtsaand")); - // assertEquals("geslachtsnaam niet als verwacht", "Cuykelaer", nat_prs.getValue(0, "nm_geslachtsnaam")); - - ITable ingeschr_nat_prs = rsgb.createDataSet().getTable("ingeschr_nat_prs"); - assertEquals("Aantal rijen klopt niet", 5, ingeschr_nat_prs.getRowCount() ); - assertEquals("a nummer niet als verwacht", null, ingeschr_nat_prs.getValue(0, "a_nummer")); - assertEquals("bsn nummer niet als verwacht", "66600666", ingeschr_nat_prs.getValue(0, "bsn")); - } @Test public void testToevoeging() throws IOException, DataSetException, SQLException, BrmoException, InterruptedException, ParseException { @@ -163,9 +128,9 @@ public void testToevoeging() throws IOException, DataSetException, SQLException, @Test public void testMutatieAanpassing() throws IOException, DataSetException, SQLException, BrmoException, InterruptedException, ParseException { doRequest("/testdata-tnt/mergetest/toevoeging.xml"); - + /* Thread t = brmo.toRsgb(); - t.join(); + t.join();*/ doRequest("/testdata-tnt/mergetest/wijziging_aanpassing.xml"); @@ -182,7 +147,7 @@ public void testMutatieAanpassing() throws IOException, DataSetException, SQLExc // assertEquals("datum klopt niet", "2019-01-14 16:04:37.0", bericht.getValue(0, "datum").toString()); // transformeren van bericht en check rsgb database inhoud - t = brmo.toRsgb(); + Thread t = brmo.toRsgb(); t.join(); ITable subject = rsgb.createDataSet().getTable("subject"); @@ -202,32 +167,30 @@ public void testMutatieAanpassing() throws IOException, DataSetException, SQLExc } /* - element geslachtsaanduiding weggehaald --> is dan onbekend bij verzender. Laten bestaan, want is op een of andere manier wel in rsgb gekomen via iets anders - en mag dus niet weg. Moet weg bij StUF:noValue="geenWaarde" + element geslachtsaanduiding weggehaald --> is dan onbekend bij verzender. Laten bestaan, want is op een of andere manier wel in + rsgb gekomen via een andere weg en mag dus niet weg. Moet weg bij StUF:noValue="geenWaarde" */ @Test public void testMutatieGeenElement() throws IOException, DataSetException, SQLException, BrmoException, InterruptedException, ParseException { doRequest("/testdata-tnt/mergetest/toevoeging.xml"); - Thread t = brmo.toRsgb(); - t.join(); doRequest("/testdata-tnt/mergetest/wijziging_waardeonbekend_geenelement.xml"); // check staging database inhoud - assertTrue("Er zijn anders dan 1 STAGING_OK laadprocessen", 2l == brmo.getCountLaadProcessen(null, null, BrmoFramework.BR_BRP, "STAGING_OK")); + assertEquals("Er zijn anders dan 2 STAGING_OK laadprocessen", 2l, brmo.getCountLaadProcessen(null, null, BrmoFramework.BR_BRP, "STAGING_OK")); ITable laadproces = staging.createDataSet().getTable("laadproces"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd kk:mm:ss.SS"); //assertEquals("datum klopt niet", /* StUFbg204Util.sdf.parse("201812211418450000") */ sdf.format(new Date()) /*"2019-01-14 16:04:37.0"*/, laadproces.getValue(0, "bestand_datum").toString()); - assertTrue("Er zijn anders dan 1 STAGING_OK berichten", 1l <= brmo.getCountBerichten(null, null, BrmoFramework.BR_BRP, "STAGING_OK")); + assertEquals("Er zijn anders dan 3 STAGING_OK berichten", 3l, brmo.getCountBerichten(null, null, BrmoFramework.BR_BRP, "STAGING_OK")); ITable bericht = staging.createDataSet().getTable("bericht"); assertEquals("object ref klopt niet", "NL.BRP.Persoon.2275c97ea44fceef93fde351a9ff06eeb3a1ecf3", bericht.getValue(0, "object_ref")); // assertEquals("datum klopt niet", "2019-01-14 16:04:37.0", bericht.getValue(0, "datum").toString()); // transformeren van bericht en check rsgb database inhoud - t = brmo.toRsgb(); + Thread t = brmo.toRsgb(); t.join(); ITable subject = rsgb.createDataSet().getTable("subject"); @@ -250,9 +213,9 @@ public void testMutatieGeenElement() throws IOException, DataSetException, SQLEx @Test public void testMutatieGeenWaarde() throws IOException, DataSetException, SQLException, BrmoException, InterruptedException, ParseException { doRequest("/testdata-tnt/mergetest/toevoeging.xml"); - - Thread t = brmo.toRsgb(); - t.join(); + // assertTrue("Pijplijn moet aan staan", brmo.isEnablePipeline()); + /* Thread t = brmo.toRsgb(); + t.join();/*/ doRequest("/testdata-tnt/mergetest/wijziging_geenWaarde.xml"); @@ -293,8 +256,6 @@ public void testMutatieGeenWaarde() throws IOException, DataSetException, SQLExc public void testMutatieNietGeautoriseerd() throws IOException, DataSetException, SQLException, BrmoException, InterruptedException, ParseException { doRequest("/testdata-tnt/mergetest/toevoeging.xml"); - Thread t = brmo.toRsgb(); - t.join(); doRequest("/testdata-tnt/mergetest/wijziging_nietmeesturen_ongeauthoriseerd.xml"); @@ -311,7 +272,7 @@ public void testMutatieNietGeautoriseerd() throws IOException, DataSetException, // assertEquals("datum klopt niet", "2019-01-14 16:04:37.0", bericht.getValue(0, "datum").toString()); // transformeren van bericht en check rsgb database inhoud - t = brmo.toRsgb(); + Thread t = brmo.toRsgb(); t.join(); ITable subject = rsgb.createDataSet().getTable("subject"); @@ -334,10 +295,6 @@ public void testMutatieNietGeautoriseerd() throws IOException, DataSetException, @Test public void testMutatieGevuldNaarLeeg() throws IOException, DataSetException, SQLException, BrmoException, InterruptedException, ParseException { doRequest("/testdata-tnt/mergetest/toevoeging.xml"); - - Thread t = brmo.toRsgb(); - t.join(); - doRequest("/testdata-tnt/mergetest/wijziging_gevuldveldleeg.xml"); // check staging database inhoud @@ -353,7 +310,7 @@ public void testMutatieGevuldNaarLeeg() throws IOException, DataSetException, SQ // assertEquals("datum klopt niet", "2019-01-14 16:04:37.0", bericht.getValue(0, "datum").toString()); // transformeren van bericht en check rsgb database inhoud - t = brmo.toRsgb(); + Thread t = brmo.toRsgb(); t.join(); ITable subject = rsgb.createDataSet().getTable("subject"); From fcd9a5176c54f7bc3e1a40f181672afee9c54d4a Mon Sep 17 00:00:00 2001 From: Mark Prins Date: Thu, 8 Aug 2019 18:16:23 +0200 Subject: [PATCH 23/32] herstel mutTestZipFile() test --- .../src/test/java/nl/b3p/brmo/loader/xml/BagXMLReaderTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/brmo-loader/src/test/java/nl/b3p/brmo/loader/xml/BagXMLReaderTest.java b/brmo-loader/src/test/java/nl/b3p/brmo/loader/xml/BagXMLReaderTest.java index 808f1a5336..214d261df3 100644 --- a/brmo-loader/src/test/java/nl/b3p/brmo/loader/xml/BagXMLReaderTest.java +++ b/brmo-loader/src/test/java/nl/b3p/brmo/loader/xml/BagXMLReaderTest.java @@ -121,7 +121,7 @@ public void mutTestLargeXML() throws Exception { * * @throws Exception if any */ - //@Test + @Test public void mutTestZipFile() throws Exception { ZipInputStream zis = new ZipInputStream( BagXMLReaderTest.class.getResourceAsStream(mutZipName)); From aa2878b1ccadf5b43a86449cf8d795dbf8f61d41 Mon Sep 17 00:00:00 2001 From: Mark Prins Date: Fri, 4 Oct 2019 11:55:14 +0200 Subject: [PATCH 24/32] extra huwelijksmutatie test case + uitleg waarom bepaalde testcases falen --- ...erwerkHuwelijksMutatieIntegrationTest.java | 86 +++++++++++--- .../OpnemenHuwelijkScenario/StUF_request2.xml | 108 ++++++++++++++++++ 2 files changed, 176 insertions(+), 18 deletions(-) create mode 100644 brmo-stufbg204/src/test/resources/OpnemenHuwelijkScenario/StUF_request2.xml diff --git a/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/VerwerkHuwelijksMutatieIntegrationTest.java b/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/VerwerkHuwelijksMutatieIntegrationTest.java index 1412c5b0c7..760d25c05a 100644 --- a/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/VerwerkHuwelijksMutatieIntegrationTest.java +++ b/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/VerwerkHuwelijksMutatieIntegrationTest.java @@ -9,10 +9,9 @@ import java.text.SimpleDateFormat; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; + import nl.b3p.brmo.loader.BrmoFramework; import nl.b3p.brmo.loader.util.BrmoException; -import static nl.b3p.brmo.stufbg204.WebTestStub.BASE_TEST_URL; -import static nl.b3p.brmo.stufbg204.WebTestStub.client; import nl.b3p.brmo.test.util.database.dbunit.CleanUtil; import org.apache.commons.dbcp.BasicDataSource; import org.apache.commons.logging.Log; @@ -27,23 +26,24 @@ import org.dbunit.database.IDatabaseConnection; import org.dbunit.dataset.DataSetException; import org.dbunit.dataset.ITable; -import static org.hamcrest.CoreMatchers.equalTo; - import org.junit.After; +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Test; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; -import org.junit.Before; -import org.junit.Test; +import static org.hamcrest.CoreMatchers.equalTo; /** * Deze testcase verwerkt een soap bericht uit een bestand als kennisgeving. Het * bestand bevat een HuwelijksMutatie welke naar de stufbg204 async service * wordt gepost, hierna wordt in de staging gechecked voor laadproces en bericht * en wordt na trasnformatie in de rsgb gechecked. - * @code mvn -Dit.test=VerwerkHuwelijksMutatieIntegrationTest -Dtest.onlyITs=true verify -Ppostgresql > target/postgresql.log} * * @author Mark Prins + * @code mvn -Dit.test=VerwerkHuwelijksMutatieIntegrationTest -Dtest.onlyITs=true verify -Ppostgresql > target/postgresql.log} */ public class VerwerkHuwelijksMutatieIntegrationTest extends WebTestStub { @@ -90,6 +90,7 @@ public void cleanup() throws Exception { } @Test + @Ignore("Deze test mislukt omdat in het bericht de gegevens van de partner ontbreken, het bericht kan daardoor niet verwerkt worden") public void testBericht() throws IOException, DataSetException, SQLException, BrmoException, InterruptedException, ParseException { InputStreamEntity reqEntity = new InputStreamEntity( VerwerkHuwelijksMutatieIntegrationTest.class.getResourceAsStream("/OpnemenHuwelijkScenario/StUF_request.xml"), @@ -106,8 +107,7 @@ public void testBericht() throws IOException, DataSetException, SQLException, Br // set-up preemptive auth voor request en stuur bericht CloseableHttpResponse response = client.execute(target, httppost, localContext); - assertThat("Response status is OK.", response.getStatusLine().getStatusCode(), - equalTo(HttpStatus.SC_OK)); + assertThat("Response status is OK.", response.getStatusLine().getStatusCode(), equalTo(HttpStatus.SC_OK)); // check staging database inhoud assertTrue("Er zijn anders dan 1 STAGING_OK laadprocessen", 1l <= brmo.getCountLaadProcessen(null, null, BrmoFramework.BR_BRP, "STAGING_OK")); @@ -117,7 +117,7 @@ public void testBericht() throws IOException, DataSetException, SQLException, Br assertTrue("Er zijn anders dan 1 STAGING_OK berichten", 1l <= brmo.getCountBerichten(null, null, BrmoFramework.BR_BRP, "STAGING_OK")); ITable bericht = staging.createDataSet().getTable("bericht"); - assertEquals("object ref klopt niet", "df2e41b72f8a3421ef575617fc247a77018a573f", bericht.getValue(0, "object_ref")); + assertEquals("object ref klopt niet", "NL.BRP.Persoon.df2e41b72f8a3421ef575617fc247a77018a573f", bericht.getValue(0, "object_ref")); assertEquals("datum klopt niet", "2018-12-21 14:18:45.0", bericht.getValue(0, "datum").toString()); // transformeren van bericht en check rsgb database inhoud @@ -138,9 +138,10 @@ public void testBericht() throws IOException, DataSetException, SQLException, Br assertEquals("a nummer niet als verwacht", "9173658014", ingeschr_nat_prs.getValue(0, "a_nummer")); assertEquals("bsn nummer niet als verwacht", "301571818", ingeschr_nat_prs.getValue(0, "bsn")); } - + @Test - public void testToevoegingMetHuwelijkAlsComfort()throws IOException, DataSetException, SQLException, BrmoException, InterruptedException, ParseException { + @Ignore("Deze test mislukt omdat in het bericht de gegevens van de partner ontbreken, het bericht kan daardoor niet verwerkt worden") + public void testToevoegingMetHuwelijkAlsComfort() throws IOException, DataSetException, SQLException, InterruptedException, ParseException, BrmoException { InputStreamEntity reqEntity = new InputStreamEntity( VerwerkToevoegingMutatieIntegrationTest.class.getResourceAsStream("/testdata-tnt/SoapBerichten/toevoeging_huwelijk_als_comfort.xml"), -1, @@ -156,20 +157,19 @@ public void testToevoegingMetHuwelijkAlsComfort()throws IOException, DataSetExce // set-up preemptive auth voor request en stuur bericht CloseableHttpResponse response = client.execute(target, httppost, localContext); - assertThat("Response status is OK.", response.getStatusLine().getStatusCode(), - equalTo(HttpStatus.SC_OK)); + assertThat("Response status is OK.", response.getStatusLine().getStatusCode(), equalTo(HttpStatus.SC_OK)); // check staging database inhoud assertTrue("Er zijn anders dan 1 STAGING_OK laadprocessen", 1l == brmo.getCountLaadProcessen(null, null, BrmoFramework.BR_BRP, "STAGING_OK")); ITable laadproces = staging.createDataSet().getTable("laadproces"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd kk:mm:ss.SS"); - //assertEquals("datum klopt niet", /* StUFbg204Util.sdf.parse("201812211418450000") */ sdf.format(new Date()) /*"2019-01-14 16:04:37.0"*/, laadproces.getValue(0, "bestand_datum").toString()); + assertEquals("datum klopt niet", "2019-01-14 16:04:37.0", laadproces.getValue(0, "bestand_datum").toString()); assertTrue("Er zijn anders dan 1 STAGING_OK berichten", 1l <= brmo.getCountBerichten(null, null, BrmoFramework.BR_BRP, "STAGING_OK")); ITable bericht = staging.createDataSet().getTable("bericht"); - assertEquals("object ref klopt niet", "fcd17242d8211342df48efd67341ca9765de8347", bericht.getValue(0, "object_ref")); - // assertEquals("datum klopt niet", "2019-01-14 16:04:37.0", bericht.getValue(0, "datum").toString()); + assertEquals("object ref klopt niet", "NL.BRP.Persoon.fcd17242d8211342df48efd67341ca9765de8347", bericht.getValue(0, "object_ref")); + assertEquals("datum klopt niet", "2019-01-14 16:04:37.0", bericht.getValue(0, "datum").toString()); // transformeren van bericht en check rsgb database inhoud Thread t = brmo.toRsgb(); @@ -182,11 +182,61 @@ public void testToevoegingMetHuwelijkAlsComfort()throws IOException, DataSetExce ITable nat_prs = rsgb.createDataSet().getTable("nat_prs"); assertTrue("Aantal rijen klopt niet", nat_prs.getRowCount() == 1); assertEquals("geslacht niet als verwacht", "M", nat_prs.getValue(1, "geslachtsaand")); - // assertEquals("geslachtsnaam niet als verwacht", "Cuykelaer", nat_prs.getValue(0, "nm_geslachtsnaam")); + // assertEquals("geslachtsnaam niet als verwacht", "Cuykelaer", nat_prs.getValue(0, "nm_geslachtsnaam")); ITable ingeschr_nat_prs = rsgb.createDataSet().getTable("ingeschr_nat_prs"); assertTrue("Aantal rijen klopt niet", ingeschr_nat_prs.getRowCount() == 1); assertEquals("a nummer niet als verwacht", "6171717520", ingeschr_nat_prs.getValue(0, "a_nummer")); assertEquals("bsn nummer niet als verwacht", "749069273", ingeschr_nat_prs.getValue(0, "bsn")); } + + + @Test + public void testBericht2() throws IOException, DataSetException, SQLException, BrmoException, InterruptedException, ParseException { + InputStreamEntity reqEntity = new InputStreamEntity( + VerwerkHuwelijksMutatieIntegrationTest.class.getResourceAsStream("/OpnemenHuwelijkScenario/StUF_request2.xml"), + -1, + ContentType.create("text/xml", "utf-8") + ); + reqEntity.setChunked(true); + HttpPost httppost = new HttpPost(BASE_TEST_URL + "StUFBGAsynchroon"); + httppost.setEntity(reqEntity); + // httppost.addHeader("SOAPAction", "ontvangKennisgeving"); + + LOG.debug("SOAP request uitvoeren: " + httppost.getRequestLine()); + + // set-up preemptive auth voor request en stuur bericht + CloseableHttpResponse response = client.execute(target, httppost, localContext); + + assertThat("Response status is OK.", response.getStatusLine().getStatusCode(), equalTo(HttpStatus.SC_OK)); + + // check staging database inhoud + assertTrue("Er zijn anders dan 1 STAGING_OK laadprocessen", 1l <= brmo.getCountLaadProcessen(null, null, BrmoFramework.BR_BRP, "STAGING_OK")); + + ITable laadproces = staging.createDataSet().getTable("laadproces"); + assertEquals("datum klopt niet", /* StUFbg204Util.sdf.parse("201812211418450000") */ "2018-12-21 14:18:45.0", laadproces.getValue(0, "bestand_datum").toString()); + + assertTrue("Er zijn anders dan 1 STAGING_OK berichten", 1l <= brmo.getCountBerichten(null, null, BrmoFramework.BR_BRP, "STAGING_OK")); + ITable bericht = staging.createDataSet().getTable("bericht"); + assertEquals("object ref klopt niet", "NL.BRP.Persoon.df2e41b72f8a3421ef575617fc247a77018a573f", bericht.getValue(0, "object_ref")); + assertEquals("datum klopt niet", "2018-12-21 14:18:45.0", bericht.getValue(0, "datum").toString()); + + // transformeren van bericht en check rsgb database inhoud + Thread t = brmo.toRsgb(); + t.join(); + + ITable subject = rsgb.createDataSet().getTable("subject"); + assertTrue("Aantal rijen klopt niet", subject.getRowCount() == 1); + assertEquals("naam niet als verwacht", "J de Cuykelaer", subject.getValue(0, "naam")); + + ITable nat_prs = rsgb.createDataSet().getTable("nat_prs"); + assertTrue("Aantal rijen klopt niet", nat_prs.getRowCount() == 1); + assertEquals("geslacht niet als verwacht", "M", nat_prs.getValue(1, "geslachtsaand")); + assertEquals("geslachtsnaam niet als verwacht", "Cuykelaer", nat_prs.getValue(0, "nm_geslachtsnaam")); + + ITable ingeschr_nat_prs = rsgb.createDataSet().getTable("ingeschr_nat_prs"); + assertTrue("Aantal rijen klopt niet", ingeschr_nat_prs.getRowCount() == 1); + assertEquals("a nummer niet als verwacht", "9173658014", ingeschr_nat_prs.getValue(0, "a_nummer")); + assertEquals("bsn nummer niet als verwacht", "301571818", ingeschr_nat_prs.getValue(0, "bsn")); + } } diff --git a/brmo-stufbg204/src/test/resources/OpnemenHuwelijkScenario/StUF_request2.xml b/brmo-stufbg204/src/test/resources/OpnemenHuwelijkScenario/StUF_request2.xml new file mode 100644 index 0000000000..1daa49eba3 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/OpnemenHuwelijkScenario/StUF_request2.xml @@ -0,0 +1,108 @@ + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 2018000005FF + 2018122114184500 + + W + I + 2018122114184500 + + + + + 9173658014 + 301571818 + Jan + J + de + Cuykelaer + 19671210 + M + + + 19920228 + + + + 2727FM + + Thorbeckegracht + 73 + + + + + + 1802 + + + + + + 9173658014 + 301571818 + Jan + J + de + Cuykelaer + 19671210 + M + + + 19920228 + + + + 2727FM + + Thorbeckegracht + 73 + + + + + + 1802 + + + + 20110526 + + 20110526 + + + + + 1173658019 + 401571819 + Beppie + B + Janssssen + 19671211 + V + + + + + + + From 693ae4b303ad0cb2283487ef01f09eb7c8d806f6 Mon Sep 17 00:00:00 2001 From: Mark Prins Date: Fri, 4 Oct 2019 13:35:57 +0200 Subject: [PATCH 25/32] cleanup testcase --- ...rwerkToevoegingMutatieIntegrationTest.java | 140 ++++++++---------- 1 file changed, 63 insertions(+), 77 deletions(-) diff --git a/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/VerwerkToevoegingMutatieIntegrationTest.java b/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/VerwerkToevoegingMutatieIntegrationTest.java index 3470e4534a..15305f3def 100644 --- a/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/VerwerkToevoegingMutatieIntegrationTest.java +++ b/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/VerwerkToevoegingMutatieIntegrationTest.java @@ -10,6 +10,7 @@ import java.text.SimpleDateFormat; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; + import nl.b3p.brmo.loader.BrmoFramework; import nl.b3p.brmo.loader.util.BrmoException; import nl.b3p.brmo.test.util.database.dbunit.CleanUtil; @@ -26,13 +27,16 @@ import org.dbunit.database.IDatabaseConnection; import org.dbunit.dataset.DataSetException; import org.dbunit.dataset.ITable; + import static org.hamcrest.CoreMatchers.equalTo; import org.junit.After; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; + import org.junit.Before; import org.junit.Test; @@ -41,9 +45,9 @@ * bestand bevat een HuwelijksMutatie welke naar de stufbg204 async service * wordt gepost, hierna wordt in de staging gechecked voor laadproces en bericht * en wordt na trasnformatie in de rsgb gechecked. - * @code mvn -Dit.test=VerwerkToevoegingMutatieIntegrationTest -Dtest.onlyITs=true verify -Ppostgresql > target/postgresql.log} * * @author Mark Prins + * @code mvn -Dit.test=VerwerkToevoegingMutatieIntegrationTest -Dtest.onlyITs=true verify -Ppostgresql > target/postgresql.log} */ public class VerwerkToevoegingMutatieIntegrationTest extends WebTestStub { @@ -71,25 +75,23 @@ public void setUp() throws SQLException, BrmoException, DatabaseUnitException { setupJNDI(dsRsgb, dsStaging); brmo = new BrmoFramework(dsStaging, dsRsgb, null); - // brmo.setEnablePipeline(true); + // brmo.setEnablePipeline(true); staging = new DatabaseDataSourceConnection(dsStaging); rsgb = new DatabaseDataSourceConnection(dsRsgb); sequential.lock(); - CleanUtil.cleanSTAGING(staging); - CleanUtil.cleanRSGB_BRP(rsgb); } @After public void cleanup() throws Exception { brmo.closeBrmoFramework(); -// CleanUtil.cleanSTAGING(staging); -// CleanUtil.cleanRSGB_BRP(rsgb); + CleanUtil.cleanSTAGING(staging); + CleanUtil.cleanRSGB_BRP(rsgb); staging.close(); rsgb.close(); sequential.unlock(); } - + @Test public void testToevoeging() throws IOException, DataSetException, SQLException, BrmoException, InterruptedException, ParseException { doRequest("/testdata-tnt/mergetest/toevoeging.xml"); @@ -97,13 +99,12 @@ public void testToevoeging() throws IOException, DataSetException, SQLException, assertTrue("Er zijn anders dan 1 STAGING_OK laadprocessen", 1l == brmo.getCountLaadProcessen(null, null, BrmoFramework.BR_BRP, "STAGING_OK")); ITable laadproces = staging.createDataSet().getTable("laadproces"); - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd kk:mm:ss.SS"); - //assertEquals("datum klopt niet", /* StUFbg204Util.sdf.parse("201812211418450000") */ sdf.format(new Date()) /*"2019-01-14 16:04:37.0"*/, laadproces.getValue(0, "bestand_datum").toString()); + assertEquals("datum klopt niet", "2019-01-14 15:54:26.0", laadproces.getValue(0, "bestand_datum").toString()); assertTrue("Er zijn anders dan 1 STAGING_OK berichten", 1l <= brmo.getCountBerichten(null, null, BrmoFramework.BR_BRP, "STAGING_OK")); ITable bericht = staging.createDataSet().getTable("bericht"); assertEquals("object ref klopt niet", "NL.BRP.Persoon.2275c97ea44fceef93fde351a9ff06eeb3a1ecf3", bericht.getValue(0, "object_ref")); - // assertEquals("datum klopt niet", "2019-01-14 16:04:37.0", bericht.getValue(0, "datum").toString()); + assertEquals("datum klopt niet", "2019-01-14 15:54:26.0", bericht.getValue(0, "datum").toString()); // transformeren van bericht en check rsgb database inhoud Thread t = brmo.toRsgb(); @@ -115,36 +116,31 @@ public void testToevoeging() throws IOException, DataSetException, SQLException, assertEquals("adres_binnenland niet als verwacht", "Poolmanweg 22 2767GP", subject.getValue(0, "adres_binnenland")); ITable nat_prs = rsgb.createDataSet().getTable("nat_prs"); - assertEquals("Aantal rijen klopt niet", 1, nat_prs.getRowCount() ); + assertEquals("Aantal rijen klopt niet", 1, nat_prs.getRowCount()); assertEquals("geslacht niet als verwacht", "M", nat_prs.getValue(0, "geslachtsaand")); - // assertEquals("geslachtsnaam niet als verwacht", "Cuykelaer", nat_prs.getValue(0, "nm_geslachtsnaam")); + assertEquals("geslachtsnaam niet als verwacht", "568cf", nat_prs.getValue(0, "nm_geslachtsnaam")); ITable ingeschr_nat_prs = rsgb.createDataSet().getTable("ingeschr_nat_prs"); - assertEquals("Aantal rijen klopt niet", 1, ingeschr_nat_prs.getRowCount() ); + assertEquals("Aantal rijen klopt niet", 1, ingeschr_nat_prs.getRowCount()); assertEquals("a nummer niet als verwacht", new BigDecimal("3056876036"), ingeschr_nat_prs.getValue(0, "a_nummer")); assertEquals("bsn nummer niet als verwacht", new BigDecimal("902215443"), ingeschr_nat_prs.getValue(0, "bsn")); } - + @Test public void testMutatieAanpassing() throws IOException, DataSetException, SQLException, BrmoException, InterruptedException, ParseException { doRequest("/testdata-tnt/mergetest/toevoeging.xml"); - /* - Thread t = brmo.toRsgb(); - t.join();*/ - doRequest("/testdata-tnt/mergetest/wijziging_aanpassing.xml"); // check staging database inhoud - assertTrue("Er zijn anders dan 1 STAGING_OK laadprocessen", 2l == brmo.getCountLaadProcessen(null, null, BrmoFramework.BR_BRP, "STAGING_OK")); + assertTrue("Er zijn anders dan 2 STAGING_OK laadprocessen", 2l == brmo.getCountLaadProcessen(null, null, BrmoFramework.BR_BRP, "STAGING_OK")); ITable laadproces = staging.createDataSet().getTable("laadproces"); - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd kk:mm:ss.SS"); - //assertEquals("datum klopt niet", /* StUFbg204Util.sdf.parse("201812211418450000") */ sdf.format(new Date()) /*"2019-01-14 16:04:37.0"*/, laadproces.getValue(0, "bestand_datum").toString()); + assertEquals("datum klopt niet", "2019-01-14 15:54:26.0", laadproces.getValue(0, "bestand_datum").toString()); assertTrue("Er zijn anders dan 1 STAGING_OK berichten", 1l <= brmo.getCountBerichten(null, null, BrmoFramework.BR_BRP, "STAGING_OK")); ITable bericht = staging.createDataSet().getTable("bericht"); assertEquals("object ref klopt niet", "NL.BRP.Persoon.2275c97ea44fceef93fde351a9ff06eeb3a1ecf3", bericht.getValue(0, "object_ref")); - // assertEquals("datum klopt niet", "2019-01-14 16:04:37.0", bericht.getValue(0, "datum").toString()); + assertEquals("datum klopt niet", "2019-01-14 15:54:26.0", bericht.getValue(0, "datum").toString()); // transformeren van bericht en check rsgb database inhoud Thread t = brmo.toRsgb(); @@ -156,38 +152,38 @@ public void testMutatieAanpassing() throws IOException, DataSetException, SQLExc assertEquals("adres_binnenland niet als verwacht", "Roemeenmanweg 22 2767GP", subject.getValue(0, "adres_binnenland")); ITable nat_prs = rsgb.createDataSet().getTable("nat_prs"); - assertEquals("Aantal rijen klopt niet", 1, nat_prs.getRowCount() ); + assertEquals("Aantal rijen klopt niet", 1, nat_prs.getRowCount()); assertEquals("geslacht niet als verwacht", "M", nat_prs.getValue(0, "geslachtsaand")); - // assertEquals("geslachtsnaam niet als verwacht", "Cuykelaer", nat_prs.getValue(0, "nm_geslachtsnaam")); + assertEquals("geslachtsnaam niet als verwacht", "568cf", nat_prs.getValue(0, "nm_geslachtsnaam")); ITable ingeschr_nat_prs = rsgb.createDataSet().getTable("ingeschr_nat_prs"); - assertEquals("Aantal rijen klopt niet", 1, ingeschr_nat_prs.getRowCount() ); + assertEquals("Aantal rijen klopt niet", 1, ingeschr_nat_prs.getRowCount()); assertEquals("a nummer niet als verwacht", new BigDecimal("3056876036"), ingeschr_nat_prs.getValue(0, "a_nummer")); assertEquals("bsn nummer niet als verwacht", new BigDecimal("902215443"), ingeschr_nat_prs.getValue(0, "bsn")); } - - /* - element geslachtsaanduiding weggehaald --> is dan onbekend bij verzender. Laten bestaan, want is op een of andere manier wel in - rsgb gekomen via een andere weg en mag dus niet weg. Moet weg bij StUF:noValue="geenWaarde" - */ + + /** + * element geslachtsaanduiding weggehaald --> is dan onbekend bij verzender. Laten bestaan, want is op een of andere + * manier wel in rsgb gekomen via een andere weg en mag dus niet weg. Moet weg bij StUF:noValue="geenWaarde" + */ @Test public void testMutatieGeenElement() throws IOException, DataSetException, SQLException, BrmoException, InterruptedException, ParseException { doRequest("/testdata-tnt/mergetest/toevoeging.xml"); - - doRequest("/testdata-tnt/mergetest/wijziging_waardeonbekend_geenelement.xml"); // check staging database inhoud assertEquals("Er zijn anders dan 2 STAGING_OK laadprocessen", 2l, brmo.getCountLaadProcessen(null, null, BrmoFramework.BR_BRP, "STAGING_OK")); ITable laadproces = staging.createDataSet().getTable("laadproces"); - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd kk:mm:ss.SS"); - //assertEquals("datum klopt niet", /* StUFbg204Util.sdf.parse("201812211418450000") */ sdf.format(new Date()) /*"2019-01-14 16:04:37.0"*/, laadproces.getValue(0, "bestand_datum").toString()); + assertEquals("datum klopt niet", "2019-01-14 15:54:26.0", laadproces.getValue(0, "bestand_datum").toString()); + assertEquals("datum klopt niet", "2019-01-14 16:11:52.0", laadproces.getValue(1, "bestand_datum").toString()); assertEquals("Er zijn anders dan 3 STAGING_OK berichten", 3l, brmo.getCountBerichten(null, null, BrmoFramework.BR_BRP, "STAGING_OK")); ITable bericht = staging.createDataSet().getTable("bericht"); assertEquals("object ref klopt niet", "NL.BRP.Persoon.2275c97ea44fceef93fde351a9ff06eeb3a1ecf3", bericht.getValue(0, "object_ref")); - // assertEquals("datum klopt niet", "2019-01-14 16:04:37.0", bericht.getValue(0, "datum").toString()); + assertEquals("datum klopt niet", "2019-01-14 15:54:26.0", bericht.getValue(0, "datum").toString()); + assertEquals("datum klopt niet", "2019-01-14 16:11:52.0", bericht.getValue(1, "datum").toString()); + assertEquals("datum klopt niet", "2019-01-14 16:11:52.0", bericht.getValue(2, "datum").toString()); // transformeren van bericht en check rsgb database inhoud Thread t = brmo.toRsgb(); @@ -199,23 +195,23 @@ public void testMutatieGeenElement() throws IOException, DataSetException, SQLEx assertEquals("adres_binnenland niet als verwacht", "Roemeenmanweg 22 2767GP", subject.getValue(0, "adres_binnenland")); ITable nat_prs = rsgb.createDataSet().getTable("nat_prs"); - assertEquals("Aantal rijen klopt niet", 1, nat_prs.getRowCount() ); + assertEquals("Aantal rijen klopt niet", 1, nat_prs.getRowCount()); assertEquals("geslacht niet als verwacht", "M", nat_prs.getValue(0, "geslachtsaand")); - // assertEquals("geslachtsnaam niet als verwacht", "Cuykelaer", nat_prs.getValue(0, "nm_geslachtsnaam")); + assertEquals("geslachtsnaam niet als verwacht", "568cf", nat_prs.getValue(0, "nm_geslachtsnaam")); ITable ingeschr_nat_prs = rsgb.createDataSet().getTable("ingeschr_nat_prs"); - assertEquals("Aantal rijen klopt niet", 1, ingeschr_nat_prs.getRowCount() ); + assertEquals("Aantal rijen klopt niet", 1, ingeschr_nat_prs.getRowCount()); assertEquals("a nummer niet als verwacht", new BigDecimal("3056876036"), ingeschr_nat_prs.getValue(0, "a_nummer")); assertEquals("bsn nummer niet als verwacht", new BigDecimal("902215443"), ingeschr_nat_prs.getValue(0, "bsn")); } - - + + @Test public void testMutatieGeenWaarde() throws IOException, DataSetException, SQLException, BrmoException, InterruptedException, ParseException { doRequest("/testdata-tnt/mergetest/toevoeging.xml"); - // assertTrue("Pijplijn moet aan staan", brmo.isEnablePipeline()); + // assertTrue("Pijplijn moet aan staan", brmo.isEnablePipeline()); /* Thread t = brmo.toRsgb(); - t.join();/*/ + t.join();*/ doRequest("/testdata-tnt/mergetest/wijziging_geenWaarde.xml"); @@ -223,13 +219,15 @@ public void testMutatieGeenWaarde() throws IOException, DataSetException, SQLExc assertTrue("Er zijn anders dan 1 STAGING_OK laadprocessen", 2l == brmo.getCountLaadProcessen(null, null, BrmoFramework.BR_BRP, "STAGING_OK")); ITable laadproces = staging.createDataSet().getTable("laadproces"); - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd kk:mm:ss.SS"); - //assertEquals("datum klopt niet", /* StUFbg204Util.sdf.parse("201812211418450000") */ sdf.format(new Date()) /*"2019-01-14 16:04:37.0"*/, laadproces.getValue(0, "bestand_datum").toString()); + assertEquals("datum klopt niet", "2019-01-14 15:54:26.0", laadproces.getValue(0, "bestand_datum").toString()); + assertEquals("datum klopt niet", "2019-01-14 16:11:52.0", laadproces.getValue(1, "bestand_datum").toString()); assertTrue("Er zijn anders dan 1 STAGING_OK berichten", 1l <= brmo.getCountBerichten(null, null, BrmoFramework.BR_BRP, "STAGING_OK")); ITable bericht = staging.createDataSet().getTable("bericht"); assertEquals("object ref klopt niet", "NL.BRP.Persoon.2275c97ea44fceef93fde351a9ff06eeb3a1ecf3", bericht.getValue(0, "object_ref")); - // assertEquals("datum klopt niet", "2019-01-14 16:04:37.0", bericht.getValue(0, "datum").toString()); + assertEquals("datum klopt niet", "2019-01-14 15:54:26.0", bericht.getValue(0, "datum").toString()); + assertEquals("datum klopt niet", "2019-01-14 16:11:52.0", bericht.getValue(1, "datum").toString()); + assertEquals("datum klopt niet", "2019-01-14 16:11:52.0", bericht.getValue(2, "datum").toString()); // transformeren van bericht en check rsgb database inhoud Thread t2 = brmo.toRsgb(); @@ -237,39 +235,35 @@ public void testMutatieGeenWaarde() throws IOException, DataSetException, SQLExc ITable subject = rsgb.createDataSet().getTable("subject"); assertEquals("Aantal rijen klopt niet", 1, subject.getRowCount()); - // assertEquals("naam niet als verwacht", "5568cf", subject.getValue(0, "naam")); - //assertEquals("adres_binnenland niet als verwacht", "Roemeenmanweg 22 2767GP", subject.getValue(0, "adres_binnenland")); + assertEquals("naam niet als verwacht", "5 568cf", subject.getValue(0, "naam")); + assertEquals("adres_binnenland niet als verwacht", "Roemeenmanweg 22 2767GP", subject.getValue(0, "adres_binnenland")); ITable nat_prs = rsgb.createDataSet().getTable("nat_prs"); - assertEquals("Aantal rijen klopt niet", 1, nat_prs.getRowCount() ); + assertEquals("Aantal rijen klopt niet", 1, nat_prs.getRowCount()); assertNull("geslacht moet leeg zijn", nat_prs.getValue(0, "geslachtsaand")); - // assertEquals("geslachtsnaam niet als verwacht", "Cuykelaer", nat_prs.getValue(0, "nm_geslachtsnaam")); + assertEquals("geslachtsnaam niet als verwacht", "568cf", nat_prs.getValue(0, "nm_geslachtsnaam")); ITable ingeschr_nat_prs = rsgb.createDataSet().getTable("ingeschr_nat_prs"); - assertEquals("Aantal rijen klopt niet", 1, ingeschr_nat_prs.getRowCount() ); + assertEquals("Aantal rijen klopt niet", 1, ingeschr_nat_prs.getRowCount()); assertEquals("a nummer niet als verwacht", new BigDecimal("3056876036"), ingeschr_nat_prs.getValue(0, "a_nummer")); assertEquals("bsn nummer niet als verwacht", new BigDecimal("902215443"), ingeschr_nat_prs.getValue(0, "bsn")); } - - + + @Test public void testMutatieNietGeautoriseerd() throws IOException, DataSetException, SQLException, BrmoException, InterruptedException, ParseException { doRequest("/testdata-tnt/mergetest/toevoeging.xml"); - + doRequest("/testdata-tnt/mergetest/wijziging_nietmeesturen_ongeauthoriseerd.xml"); // check staging database inhoud assertTrue("Er zijn anders dan 1 STAGING_OK laadprocessen", 2l == brmo.getCountLaadProcessen(null, null, BrmoFramework.BR_BRP, "STAGING_OK")); - ITable laadproces = staging.createDataSet().getTable("laadproces"); - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd kk:mm:ss.SS"); - //assertEquals("datum klopt niet", /* StUFbg204Util.sdf.parse("201812211418450000") */ sdf.format(new Date()) /*"2019-01-14 16:04:37.0"*/, laadproces.getValue(0, "bestand_datum").toString()); - assertTrue("Er zijn anders dan 1 STAGING_OK berichten", 1l <= brmo.getCountBerichten(null, null, BrmoFramework.BR_BRP, "STAGING_OK")); ITable bericht = staging.createDataSet().getTable("bericht"); assertEquals("object ref klopt niet", "NL.BRP.Persoon.2275c97ea44fceef93fde351a9ff06eeb3a1ecf3", bericht.getValue(0, "object_ref")); - // assertEquals("datum klopt niet", "2019-01-14 16:04:37.0", bericht.getValue(0, "datum").toString()); + // transformeren van bericht en check rsgb database inhoud Thread t = brmo.toRsgb(); @@ -281,17 +275,16 @@ public void testMutatieNietGeautoriseerd() throws IOException, DataSetException, assertEquals("adres_binnenland niet als verwacht", "Roemeenmanweg 22 2767GP", subject.getValue(0, "adres_binnenland")); ITable nat_prs = rsgb.createDataSet().getTable("nat_prs"); - assertEquals("Aantal rijen klopt niet", 1, nat_prs.getRowCount() ); + assertEquals("Aantal rijen klopt niet", 1, nat_prs.getRowCount()); assertEquals("geslacht niet als verwacht", "M", nat_prs.getValue(0, "geslachtsaand")); - // assertEquals("geslachtsnaam niet als verwacht", "Cuykelaer", nat_prs.getValue(0, "nm_geslachtsnaam")); ITable ingeschr_nat_prs = rsgb.createDataSet().getTable("ingeschr_nat_prs"); - assertEquals("Aantal rijen klopt niet", 1, ingeschr_nat_prs.getRowCount() ); + assertEquals("Aantal rijen klopt niet", 1, ingeschr_nat_prs.getRowCount()); assertEquals("a nummer niet als verwacht", new BigDecimal("3056876036"), ingeschr_nat_prs.getValue(0, "a_nummer")); assertEquals("bsn nummer niet als verwacht", new BigDecimal("902215443"), ingeschr_nat_prs.getValue(0, "bsn")); } - - + + @Test public void testMutatieGevuldNaarLeeg() throws IOException, DataSetException, SQLException, BrmoException, InterruptedException, ParseException { doRequest("/testdata-tnt/mergetest/toevoeging.xml"); @@ -299,15 +292,9 @@ public void testMutatieGevuldNaarLeeg() throws IOException, DataSetException, SQ // check staging database inhoud assertTrue("Er zijn anders dan 1 STAGING_OK laadprocessen", 2l == brmo.getCountLaadProcessen(null, null, BrmoFramework.BR_BRP, "STAGING_OK")); - - ITable laadproces = staging.createDataSet().getTable("laadproces"); - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd kk:mm:ss.SS"); - //assertEquals("datum klopt niet", /* StUFbg204Util.sdf.parse("201812211418450000") */ sdf.format(new Date()) /*"2019-01-14 16:04:37.0"*/, laadproces.getValue(0, "bestand_datum").toString()); - assertTrue("Er zijn anders dan 1 STAGING_OK berichten", 1l <= brmo.getCountBerichten(null, null, BrmoFramework.BR_BRP, "STAGING_OK")); ITable bericht = staging.createDataSet().getTable("bericht"); assertEquals("object ref klopt niet", "NL.BRP.Persoon.2275c97ea44fceef93fde351a9ff06eeb3a1ecf3", bericht.getValue(0, "object_ref")); - // assertEquals("datum klopt niet", "2019-01-14 16:04:37.0", bericht.getValue(0, "datum").toString()); // transformeren van bericht en check rsgb database inhoud Thread t = brmo.toRsgb(); @@ -319,19 +306,18 @@ public void testMutatieGevuldNaarLeeg() throws IOException, DataSetException, SQ assertEquals("adres_binnenland niet als verwacht", "Roemeenmanweg 22 2767GP", subject.getValue(0, "adres_binnenland")); ITable nat_prs = rsgb.createDataSet().getTable("nat_prs"); - assertEquals("Aantal rijen klopt niet", 1, nat_prs.getRowCount() ); + assertEquals("Aantal rijen klopt niet", 1, nat_prs.getRowCount()); assertNull("geslacht niet als verwacht", nat_prs.getValue(0, "geslachtsaand")); - // assertEquals("geslachtsnaam niet als verwacht", "Cuykelaer", nat_prs.getValue(0, "nm_geslachtsnaam")); ITable ingeschr_nat_prs = rsgb.createDataSet().getTable("ingeschr_nat_prs"); - assertEquals("Aantal rijen klopt niet", 1, ingeschr_nat_prs.getRowCount() ); + assertEquals("Aantal rijen klopt niet", 1, ingeschr_nat_prs.getRowCount()); assertEquals("a nummer niet als verwacht", new BigDecimal("3056876036"), ingeschr_nat_prs.getValue(0, "a_nummer")); assertEquals("bsn nummer niet als verwacht", new BigDecimal("902215443"), ingeschr_nat_prs.getValue(0, "bsn")); } - - - private void doRequest(String file) throws IOException{ - InputStreamEntity reqEntity = new InputStreamEntity( + + + private void doRequest(String file) throws IOException { + InputStreamEntity reqEntity = new InputStreamEntity( VerwerkToevoegingMutatieIntegrationTest.class.getResourceAsStream(file), -1, ContentType.create("text/xml", "utf-8") @@ -344,7 +330,7 @@ private void doRequest(String file) throws IOException{ // set-up preemptive auth voor request en stuur bericht CloseableHttpResponse response = client.execute(target, httppost, localContext); - + LOG.debug(("Request done.")); assertThat("Response status is not OK.", response.getStatusLine().getStatusCode(), equalTo(HttpStatus.SC_OK)); response.close(); From 8a4fabf00d855311bd36107e84aaadd64f1d4bfc Mon Sep 17 00:00:00 2001 From: Mark Prins Date: Fri, 4 Oct 2019 13:47:26 +0200 Subject: [PATCH 26/32] ignore alle HuwelijksMutatie tests voor nu... --- .../brmo/stufbg204/VerwerkHuwelijksMutatieIntegrationTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/VerwerkHuwelijksMutatieIntegrationTest.java b/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/VerwerkHuwelijksMutatieIntegrationTest.java index 760d25c05a..d78e807e30 100644 --- a/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/VerwerkHuwelijksMutatieIntegrationTest.java +++ b/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/VerwerkHuwelijksMutatieIntegrationTest.java @@ -192,6 +192,7 @@ public void testToevoegingMetHuwelijkAlsComfort() throws IOException, DataSetExc @Test + @Ignore("TODO de 2e persoon wordt niet uitgeparsed") public void testBericht2() throws IOException, DataSetException, SQLException, BrmoException, InterruptedException, ParseException { InputStreamEntity reqEntity = new InputStreamEntity( VerwerkHuwelijksMutatieIntegrationTest.class.getResourceAsStream("/OpnemenHuwelijkScenario/StUF_request2.xml"), From dacfc74d5ab79c3ef9632eb56ec7821153ce7ab3 Mon Sep 17 00:00:00 2001 From: Mark Prins Date: Thu, 14 Nov 2019 17:08:09 +0100 Subject: [PATCH 27/32] update test resources --- .../src/test/resources/sqlserver.properties | 8 ++-- brmo-stufbg204/pom.xml | 4 +- .../test/tomcatconf/testcontext.oracle.xml | 10 ++--- .../src/test/tomcatconf/testcontext.xml | 44 ++++++------------- 4 files changed, 23 insertions(+), 43 deletions(-) diff --git a/brmo-service/src/test/resources/sqlserver.properties b/brmo-service/src/test/resources/sqlserver.properties index 22ddbe6fd5..1cdf72bdb5 100644 --- a/brmo-service/src/test/resources/sqlserver.properties +++ b/brmo-service/src/test/resources/sqlserver.properties @@ -11,9 +11,9 @@ staging.url=jdbc:jtds:sqlserver://127.0.0.1:1433/staging;instance=${mssql.instan jdbc.driverClassName=net.sourceforge.jtds.jdbc.Driver rsgbbgt.url=jdbc:jtds:sqlserver://127.0.0.1:1433/bgttest;instance=${mssql.instancename} -rsgbbgt.user=sa -rsgbbgt.passwd=Password12! +rsgbbgt.username=sa +rsgbbgt.password=Password12! topnl.url=jdbc:jtds:sqlserver://127.0.0.1:1433/topnl;instance=${mssql.instancename} -topnl.user=topnl -topnl.passwd=topnl \ No newline at end of file +topnl.username=topnl +topnl.password=topnl \ No newline at end of file diff --git a/brmo-stufbg204/pom.xml b/brmo-stufbg204/pom.xml index 16a9375874..d2a5e3268e 100644 --- a/brmo-stufbg204/pom.xml +++ b/brmo-stufbg204/pom.xml @@ -364,8 +364,8 @@ - ${oracle.jdbc.groupId} - ${oracle.jdbc.artifactId} + com.oracle.jdbc + ojdbc8 ${oracle.jdbc.version} diff --git a/brmo-stufbg204/src/test/tomcatconf/testcontext.oracle.xml b/brmo-stufbg204/src/test/tomcatconf/testcontext.oracle.xml index 6bb8bc4a34..0f3a8a640c 100644 --- a/brmo-stufbg204/src/test/tomcatconf/testcontext.oracle.xml +++ b/brmo-stufbg204/src/test/tomcatconf/testcontext.oracle.xml @@ -1,7 +1,6 @@ - - - + - - + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/tomcatconf/testcontext.xml b/brmo-stufbg204/src/test/tomcatconf/testcontext.xml index 4b15f2c5fc..307380de79 100644 --- a/brmo-stufbg204/src/test/tomcatconf/testcontext.xml +++ b/brmo-stufbg204/src/test/tomcatconf/testcontext.xml @@ -1,7 +1,6 @@ - - --> - - - + /> + +--> - - - From cc34362ba8a76a7e76f20bc91962b5dee252601f Mon Sep 17 00:00:00 2001 From: Mark Prins Date: Fri, 15 Nov 2019 12:46:04 +0100 Subject: [PATCH 28/32] oplossen van Tomcat datasource unwrapping problemen --- brmo-stufbg204/pom.xml | 25 +++++++++------- ...erwerkHuwelijksMutatieIntegrationTest.java | 4 +-- ...rwerkToevoegingMutatieIntegrationTest.java | 5 ++-- brmo-stufbg204/src/test/resources/log4j.xml | 5 +++- .../test/tomcatconf/testcontext.oracle.xml | 30 ++----------------- .../src/test/tomcatconf/testcontext.xml | 30 ++----------------- pom.xml | 2 +- 7 files changed, 29 insertions(+), 72 deletions(-) diff --git a/brmo-stufbg204/pom.xml b/brmo-stufbg204/pom.xml index d2a5e3268e..df1f8d2f1d 100644 --- a/brmo-stufbg204/pom.xml +++ b/brmo-stufbg204/pom.xml @@ -88,6 +88,11 @@ dbunit test + + org.slf4j + slf4j-log4j12 + test + @@ -363,11 +368,11 @@ - - com.oracle.jdbc - ojdbc8 - ${oracle.jdbc.version} - + + + + + @@ -463,11 +468,11 @@ - - net.sourceforge.jtds - jtds - ${sqlserver.jtds.version} - + + + + + diff --git a/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/VerwerkHuwelijksMutatieIntegrationTest.java b/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/VerwerkHuwelijksMutatieIntegrationTest.java index d78e807e30..e825fd49cd 100644 --- a/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/VerwerkHuwelijksMutatieIntegrationTest.java +++ b/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/VerwerkHuwelijksMutatieIntegrationTest.java @@ -82,8 +82,8 @@ public void setUp() throws SQLException, BrmoException, DatabaseUnitException { @After public void cleanup() throws Exception { brmo.closeBrmoFramework(); -// CleanUtil.cleanSTAGING(staging); -// CleanUtil.cleanRSGB_BRP(rsgb); + CleanUtil.cleanSTAGING(staging, false); + CleanUtil.cleanRSGB_BRP(rsgb); staging.close(); rsgb.close(); sequential.unlock(); diff --git a/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/VerwerkToevoegingMutatieIntegrationTest.java b/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/VerwerkToevoegingMutatieIntegrationTest.java index 15305f3def..ee3f06c691 100644 --- a/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/VerwerkToevoegingMutatieIntegrationTest.java +++ b/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/VerwerkToevoegingMutatieIntegrationTest.java @@ -48,6 +48,7 @@ * * @author Mark Prins * @code mvn -Dit.test=VerwerkToevoegingMutatieIntegrationTest -Dtest.onlyITs=true verify -Ppostgresql > target/postgresql.log} + * @code mvn -Dit.test=VerwerkToevoegingMutatieIntegrationTest -Dtest.onlyITs=true verify -Pmssql -pl brmo-stufbg204 > target/mssql.log} */ public class VerwerkToevoegingMutatieIntegrationTest extends WebTestStub { @@ -85,7 +86,7 @@ public void setUp() throws SQLException, BrmoException, DatabaseUnitException { @After public void cleanup() throws Exception { brmo.closeBrmoFramework(); - CleanUtil.cleanSTAGING(staging); + CleanUtil.cleanSTAGING(staging, true); CleanUtil.cleanRSGB_BRP(rsgb); staging.close(); rsgb.close(); @@ -326,7 +327,7 @@ private void doRequest(String file) throws IOException { HttpPost httppost = new HttpPost(BASE_TEST_URL + "StUFBGAsynchroon"); httppost.setEntity(reqEntity); // httppost.addHeader("SOAPAction", "ontvangKennisgeving"); - LOG.debug("SOAP request uitvoeren: " + httppost.getRequestLine()); + LOG.debug("SOAP request uitvoeren; POST " + file + " naar: " + httppost.getRequestLine()); // set-up preemptive auth voor request en stuur bericht CloseableHttpResponse response = client.execute(target, httppost, localContext); diff --git a/brmo-stufbg204/src/test/resources/log4j.xml b/brmo-stufbg204/src/test/resources/log4j.xml index 34c1d86852..eff8c9219d 100644 --- a/brmo-stufbg204/src/test/resources/log4j.xml +++ b/brmo-stufbg204/src/test/resources/log4j.xml @@ -37,7 +37,7 @@ - + @@ -51,6 +51,9 @@ + + + diff --git a/brmo-stufbg204/src/test/tomcatconf/testcontext.oracle.xml b/brmo-stufbg204/src/test/tomcatconf/testcontext.oracle.xml index 0f3a8a640c..cd872ac685 100644 --- a/brmo-stufbg204/src/test/tomcatconf/testcontext.oracle.xml +++ b/brmo-stufbg204/src/test/tomcatconf/testcontext.oracle.xml @@ -4,7 +4,7 @@ - - 3.6.10.Final 22.0 - 4.0 + 4.1-SNAPSHOT 1.16.1 7.1.8 42.2.8 From 91401578db7c50b579869422283c5c8090bcac0a Mon Sep 17 00:00:00 2001 From: Mark Prins Date: Fri, 15 Nov 2019 15:15:01 +0100 Subject: [PATCH 29/32] testcase refactoring --- brmo-service/pom.xml | 20 +++++----- .../b3p/brmo/service/testutil/TestUtil.java | 8 ++++ .../StUFBGsynchroonIntegrationTest.java | 14 ------- .../Stufbg204ServiceIntegrationTest.java | 14 ------- .../java/nl/b3p/brmo/stufbg204/TestStub.java | 21 ++++++++-- ...erwerkHuwelijksMutatieIntegrationTest.java | 39 ++++++++++--------- ...rwerkToevoegingMutatieIntegrationTest.java | 39 ++++++++++--------- 7 files changed, 75 insertions(+), 80 deletions(-) diff --git a/brmo-service/pom.xml b/brmo-service/pom.xml index ef64f35629..919007649f 100644 --- a/brmo-service/pom.xml +++ b/brmo-service/pom.xml @@ -444,11 +444,11 @@ jakarta.mail ${jakarta.mail.version} - - com.oracle.jdbc - ojdbc8 - ${oracle.jdbc.version} - + + + + + @@ -551,11 +551,11 @@ jakarta.mail ${jakarta.mail.version} - - net.sourceforge.jtds - jtds - ${sqlserver.jtds.version} - + + + + + diff --git a/brmo-service/src/test/java/nl/b3p/brmo/service/testutil/TestUtil.java b/brmo-service/src/test/java/nl/b3p/brmo/service/testutil/TestUtil.java index 95c02dd982..d2f2b6f191 100644 --- a/brmo-service/src/test/java/nl/b3p/brmo/service/testutil/TestUtil.java +++ b/brmo-service/src/test/java/nl/b3p/brmo/service/testutil/TestUtil.java @@ -52,6 +52,7 @@ public abstract class TestUtil { protected BasicDataSource dsStaging; protected BasicDataSource dsRsgb; + protected BasicDataSource dsRsgbBgt; /** * logging rule. @@ -118,6 +119,12 @@ public void loadDBprop() throws IOException { dsRsgb.setPassword(DBPROPS.getProperty("rsgb.password")); dsRsgb.setAccessToUnderlyingConnectionAllowed(true); + dsRsgbBgt = new BasicDataSource(); + dsRsgbBgt.setUrl(DBPROPS.getProperty("rsgb.url")); + dsRsgbBgt.setUsername(DBPROPS.getProperty("rsgb.username")); + dsRsgbBgt.setPassword(DBPROPS.getProperty("rsgb.password")); + dsRsgbBgt.setAccessToUnderlyingConnectionAllowed(true); + setupJNDI(); } @@ -153,6 +160,7 @@ protected void setupJNDI() { ic.createSubcontext("java:comp/env/jdbc/brmo"); ic.bind("java:comp/env/jdbc/brmo/rsgb", dsRsgb); ic.bind("java:comp/env/jdbc/brmo/staging", dsStaging); + ic.bind("java:comp/env/jdbc/brmo/staging", dsRsgbBgt); haveSetupJNDI = true; } catch (NamingException ex) { LOG.warn("Opzetten van datasource jndi is mislukt", ex); diff --git a/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/StUFBGsynchroonIntegrationTest.java b/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/StUFBGsynchroonIntegrationTest.java index 4dcc51e154..00163215d8 100644 --- a/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/StUFBGsynchroonIntegrationTest.java +++ b/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/StUFBGsynchroonIntegrationTest.java @@ -29,20 +29,6 @@ public class StUFBGsynchroonIntegrationTest extends TestStub { @Before @Override public void setUp() { - BasicDataSource dsStaging = new BasicDataSource(); - dsStaging.setUrl(DBPROPS.getProperty("staging.url")); - dsStaging.setUsername(DBPROPS.getProperty("staging.username")); - dsStaging.setPassword(DBPROPS.getProperty("staging.password")); - dsStaging.setAccessToUnderlyingConnectionAllowed(true); - - BasicDataSource dsRsgb = new BasicDataSource(); - dsRsgb.setUrl(DBPROPS.getProperty("rsgb.url")); - dsRsgb.setUsername(DBPROPS.getProperty("rsgb.username")); - dsRsgb.setPassword(DBPROPS.getProperty("rsgb.password")); - dsRsgb.setAccessToUnderlyingConnectionAllowed(true); - - setupJNDI(dsRsgb, dsStaging); - stub = new StUFBGsynchroon(); } diff --git a/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/Stufbg204ServiceIntegrationTest.java b/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/Stufbg204ServiceIntegrationTest.java index e70600ea21..684bf13f51 100644 --- a/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/Stufbg204ServiceIntegrationTest.java +++ b/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/Stufbg204ServiceIntegrationTest.java @@ -30,20 +30,6 @@ public class Stufbg204ServiceIntegrationTest extends TestStub { @Before @Override public void setUp() { - BasicDataSource dsStaging = new BasicDataSource(); - dsStaging.setUrl(DBPROPS.getProperty("staging.url")); - dsStaging.setUsername(DBPROPS.getProperty("staging.username")); - dsStaging.setPassword(DBPROPS.getProperty("staging.password")); - dsStaging.setAccessToUnderlyingConnectionAllowed(true); - - BasicDataSource dsRsgb = new BasicDataSource(); - dsRsgb.setUrl(DBPROPS.getProperty("rsgb.url")); - dsRsgb.setUsername(DBPROPS.getProperty("rsgb.username")); - dsRsgb.setPassword(DBPROPS.getProperty("rsgb.password")); - dsRsgb.setAccessToUnderlyingConnectionAllowed(true); - - setupJNDI(dsRsgb, dsStaging); - service = new StUFBGasynchroon(); } diff --git a/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/TestStub.java b/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/TestStub.java index 88c53e79e8..a4567b2216 100644 --- a/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/TestStub.java +++ b/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/TestStub.java @@ -50,6 +50,8 @@ public abstract class TestStub { */ protected boolean isPostgis; + protected BasicDataSource dsStaging; + protected BasicDataSource dsRsgb; /** * logging rule. */ @@ -102,6 +104,20 @@ public void loadDBprop() throws IOException { } catch (ClassNotFoundException ex) { LOG.error("Database driver niet gevonden.", ex); } + + dsStaging = new BasicDataSource(); + dsStaging.setUrl(DBPROPS.getProperty("staging.url")); + dsStaging.setUsername(DBPROPS.getProperty("staging.username")); + dsStaging.setPassword(DBPROPS.getProperty("staging.password")); + dsStaging.setAccessToUnderlyingConnectionAllowed(true); + + dsRsgb = new BasicDataSource(); + dsRsgb.setUrl(DBPROPS.getProperty("rsgb.url")); + dsRsgb.setUsername(DBPROPS.getProperty("rsgb.username")); + dsRsgb.setPassword(DBPROPS.getProperty("rsgb.password")); + dsRsgb.setAccessToUnderlyingConnectionAllowed(true); + + setupJNDI(); } /** @@ -122,11 +138,8 @@ public void endTest() { /** * setup jndi voor testcases. - * - * @param dsRsgb rsgb databron - * @param dsStaging staging databron */ - protected void setupJNDI(final BasicDataSource dsRsgb, final BasicDataSource dsStaging) { + protected void setupJNDI() { if (!haveSetupJNDI) { try { System.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.naming.java.javaURLContextFactory"); diff --git a/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/VerwerkHuwelijksMutatieIntegrationTest.java b/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/VerwerkHuwelijksMutatieIntegrationTest.java index e825fd49cd..f52edb644b 100644 --- a/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/VerwerkHuwelijksMutatieIntegrationTest.java +++ b/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/VerwerkHuwelijksMutatieIntegrationTest.java @@ -13,6 +13,7 @@ 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.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -22,19 +23,22 @@ import org.apache.http.entity.ContentType; import org.apache.http.entity.InputStreamEntity; import org.dbunit.DatabaseUnitException; +import org.dbunit.database.DatabaseConfig; +import org.dbunit.database.DatabaseConnection; import org.dbunit.database.DatabaseDataSourceConnection; import org.dbunit.database.IDatabaseConnection; import org.dbunit.dataset.DataSetException; import org.dbunit.dataset.ITable; +import org.dbunit.ext.mssql.MsSqlDataTypeFactory; +import org.dbunit.ext.oracle.Oracle10DataTypeFactory; +import org.dbunit.ext.postgresql.PostgresqlDataTypeFactory; import org.junit.After; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.assertTrue; import static org.hamcrest.CoreMatchers.equalTo; +import static org.junit.Assert.*; /** * Deze testcase verwerkt een soap bericht uit een bestand als kennisgeving. Het @@ -56,27 +60,24 @@ public class VerwerkHuwelijksMutatieIntegrationTest extends WebTestStub { @Before @Override public void setUp() throws SQLException, BrmoException, DatabaseUnitException { - BasicDataSource dsStaging = new BasicDataSource(); - dsStaging.setUrl(DBPROPS.getProperty("staging.url")); - dsStaging.setUsername(DBPROPS.getProperty("staging.username")); - dsStaging.setPassword(DBPROPS.getProperty("staging.password")); - dsStaging.setAccessToUnderlyingConnectionAllowed(true); - - BasicDataSource dsRsgb = new BasicDataSource(); - dsRsgb.setUrl(DBPROPS.getProperty("rsgb.url")); - dsRsgb.setUsername(DBPROPS.getProperty("rsgb.username")); - dsRsgb.setPassword(DBPROPS.getProperty("rsgb.password")); - dsRsgb.setAccessToUnderlyingConnectionAllowed(true); - - setupJNDI(dsRsgb, dsStaging); - brmo = new BrmoFramework(dsStaging, dsRsgb, null); staging = new DatabaseDataSourceConnection(dsStaging); rsgb = new DatabaseDataSourceConnection(dsRsgb); + if (this.isMsSQL) { + staging.getConfig().setProperty(DatabaseConfig.PROPERTY_DATATYPE_FACTORY, new MsSqlDataTypeFactory()); + } else if (this.isOracle) { + dsStaging.getConnection().setAutoCommit(true); + staging = new DatabaseConnection(OracleConnectionUnwrapper.unwrap(dsStaging.getConnection()), DBPROPS.getProperty("staging.username").toUpperCase()); + staging.getConfig().setProperty(DatabaseConfig.PROPERTY_DATATYPE_FACTORY, new Oracle10DataTypeFactory()); + staging.getConfig().setProperty(DatabaseConfig.FEATURE_SKIP_ORACLE_RECYCLEBIN_TABLES, true); + } else if (this.isPostgis) { + staging.getConfig().setProperty(DatabaseConfig.PROPERTY_DATATYPE_FACTORY, new PostgresqlDataTypeFactory()); + } else { + fail("Geen ondersteunde database aangegegeven"); + } + sequential.lock(); - CleanUtil.cleanSTAGING(staging); - CleanUtil.cleanRSGB_BRP(rsgb); } @After diff --git a/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/VerwerkToevoegingMutatieIntegrationTest.java b/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/VerwerkToevoegingMutatieIntegrationTest.java index ee3f06c691..7943847a7d 100644 --- a/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/VerwerkToevoegingMutatieIntegrationTest.java +++ b/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/VerwerkToevoegingMutatieIntegrationTest.java @@ -14,6 +14,7 @@ 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.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -23,20 +24,21 @@ import org.apache.http.entity.ContentType; import org.apache.http.entity.InputStreamEntity; import org.dbunit.DatabaseUnitException; +import org.dbunit.database.DatabaseConfig; +import org.dbunit.database.DatabaseConnection; import org.dbunit.database.DatabaseDataSourceConnection; import org.dbunit.database.IDatabaseConnection; import org.dbunit.dataset.DataSetException; import org.dbunit.dataset.ITable; import static org.hamcrest.CoreMatchers.equalTo; +import static org.junit.Assert.*; +import org.dbunit.ext.mssql.MsSqlDataTypeFactory; +import org.dbunit.ext.oracle.Oracle10DataTypeFactory; +import org.dbunit.ext.postgresql.PostgresqlDataTypeFactory; import org.junit.After; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.assertTrue; - import org.junit.Before; import org.junit.Test; @@ -61,24 +63,23 @@ public class VerwerkToevoegingMutatieIntegrationTest extends WebTestStub { @Before @Override public void setUp() throws SQLException, BrmoException, DatabaseUnitException { - BasicDataSource dsStaging = new BasicDataSource(); - dsStaging.setUrl(DBPROPS.getProperty("staging.url")); - dsStaging.setUsername(DBPROPS.getProperty("staging.username")); - dsStaging.setPassword(DBPROPS.getProperty("staging.password")); - dsStaging.setAccessToUnderlyingConnectionAllowed(true); - - BasicDataSource dsRsgb = new BasicDataSource(); - dsRsgb.setUrl(DBPROPS.getProperty("rsgb.url")); - dsRsgb.setUsername(DBPROPS.getProperty("rsgb.username")); - dsRsgb.setPassword(DBPROPS.getProperty("rsgb.password")); - dsRsgb.setAccessToUnderlyingConnectionAllowed(true); - - setupJNDI(dsRsgb, dsStaging); - brmo = new BrmoFramework(dsStaging, dsRsgb, null); // brmo.setEnablePipeline(true); + staging = new DatabaseDataSourceConnection(dsStaging); rsgb = new DatabaseDataSourceConnection(dsRsgb); + if (this.isMsSQL) { + staging.getConfig().setProperty(DatabaseConfig.PROPERTY_DATATYPE_FACTORY, new MsSqlDataTypeFactory()); + } else if (this.isOracle) { + dsStaging.getConnection().setAutoCommit(true); + staging = new DatabaseConnection(OracleConnectionUnwrapper.unwrap(dsStaging.getConnection()), DBPROPS.getProperty("staging.username").toUpperCase()); + staging.getConfig().setProperty(DatabaseConfig.PROPERTY_DATATYPE_FACTORY, new Oracle10DataTypeFactory()); + staging.getConfig().setProperty(DatabaseConfig.FEATURE_SKIP_ORACLE_RECYCLEBIN_TABLES, true); + } else if (this.isPostgis) { + staging.getConfig().setProperty(DatabaseConfig.PROPERTY_DATATYPE_FACTORY, new PostgresqlDataTypeFactory()); + } else { + fail("Geen ondersteunde database aangegegeven"); + } sequential.lock(); } From c734527faaeabb8c8f268b07e080426a865711c5 Mon Sep 17 00:00:00 2001 From: Mark Prins Date: Fri, 15 Nov 2019 15:15:35 +0100 Subject: [PATCH 30/32] fix syntaxfout in xsl --- brmo-loader/src/main/resources/xsl/brp-brxml-preprocessor.xsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/brmo-loader/src/main/resources/xsl/brp-brxml-preprocessor.xsl b/brmo-loader/src/main/resources/xsl/brp-brxml-preprocessor.xsl index 9a3a4c3eb8..4c36e764aa 100644 --- a/brmo-loader/src/main/resources/xsl/brp-brxml-preprocessor.xsl +++ b/brmo-loader/src/main/resources/xsl/brp-brxml-preprocessor.xsl @@ -14,7 +14,7 @@ exclude-result-prefixes="ns1 ns2" - + geenWaarde From 5675c2e083e9dbeee9e21fc3dc5d56d5da117305 Mon Sep 17 00:00:00 2001 From: Mark Prins Date: Fri, 15 Nov 2019 16:04:04 +0100 Subject: [PATCH 31/32] oracle fixes voor integratie tests --- .../src/test/java/nl/b3p/brmo/stufbg204/TestStub.java | 2 +- .../stufbg204/VerwerkHuwelijksMutatieIntegrationTest.java | 6 ++++++ .../stufbg204/VerwerkToevoegingMutatieIntegrationTest.java | 6 ++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/TestStub.java b/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/TestStub.java index a4567b2216..23d9b03ff1 100644 --- a/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/TestStub.java +++ b/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/TestStub.java @@ -139,7 +139,7 @@ public void endTest() { /** * setup jndi voor testcases. */ - protected void setupJNDI() { + private void setupJNDI() { if (!haveSetupJNDI) { try { System.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.naming.java.javaURLContextFactory"); diff --git a/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/VerwerkHuwelijksMutatieIntegrationTest.java b/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/VerwerkHuwelijksMutatieIntegrationTest.java index f52edb644b..dfd10ebb48 100644 --- a/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/VerwerkHuwelijksMutatieIntegrationTest.java +++ b/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/VerwerkHuwelijksMutatieIntegrationTest.java @@ -66,13 +66,19 @@ public void setUp() throws SQLException, BrmoException, DatabaseUnitException { if (this.isMsSQL) { staging.getConfig().setProperty(DatabaseConfig.PROPERTY_DATATYPE_FACTORY, new MsSqlDataTypeFactory()); + rsgb.getConfig().setProperty(DatabaseConfig.PROPERTY_DATATYPE_FACTORY, new MsSqlDataTypeFactory()); } else if (this.isOracle) { dsStaging.getConnection().setAutoCommit(true); + dsRsgb.getConnection().setAutoCommit(true); staging = new DatabaseConnection(OracleConnectionUnwrapper.unwrap(dsStaging.getConnection()), DBPROPS.getProperty("staging.username").toUpperCase()); staging.getConfig().setProperty(DatabaseConfig.PROPERTY_DATATYPE_FACTORY, new Oracle10DataTypeFactory()); staging.getConfig().setProperty(DatabaseConfig.FEATURE_SKIP_ORACLE_RECYCLEBIN_TABLES, true); + rsgb = new DatabaseConnection(OracleConnectionUnwrapper.unwrap(dsRsgb.getConnection()), DBPROPS.getProperty("rsgb.username").toUpperCase()); + rsgb.getConfig().setProperty(DatabaseConfig.PROPERTY_DATATYPE_FACTORY, new Oracle10DataTypeFactory()); + rsgb.getConfig().setProperty(DatabaseConfig.FEATURE_SKIP_ORACLE_RECYCLEBIN_TABLES, true); } else if (this.isPostgis) { staging.getConfig().setProperty(DatabaseConfig.PROPERTY_DATATYPE_FACTORY, new PostgresqlDataTypeFactory()); + rsgb.getConfig().setProperty(DatabaseConfig.PROPERTY_DATATYPE_FACTORY, new PostgresqlDataTypeFactory()); } else { fail("Geen ondersteunde database aangegegeven"); } diff --git a/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/VerwerkToevoegingMutatieIntegrationTest.java b/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/VerwerkToevoegingMutatieIntegrationTest.java index 7943847a7d..1a2e12616c 100644 --- a/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/VerwerkToevoegingMutatieIntegrationTest.java +++ b/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/VerwerkToevoegingMutatieIntegrationTest.java @@ -70,13 +70,19 @@ public void setUp() throws SQLException, BrmoException, DatabaseUnitException { rsgb = new DatabaseDataSourceConnection(dsRsgb); if (this.isMsSQL) { staging.getConfig().setProperty(DatabaseConfig.PROPERTY_DATATYPE_FACTORY, new MsSqlDataTypeFactory()); + rsgb.getConfig().setProperty(DatabaseConfig.PROPERTY_DATATYPE_FACTORY, new MsSqlDataTypeFactory()); } else if (this.isOracle) { dsStaging.getConnection().setAutoCommit(true); + dsRsgb.getConnection().setAutoCommit(true); staging = new DatabaseConnection(OracleConnectionUnwrapper.unwrap(dsStaging.getConnection()), DBPROPS.getProperty("staging.username").toUpperCase()); staging.getConfig().setProperty(DatabaseConfig.PROPERTY_DATATYPE_FACTORY, new Oracle10DataTypeFactory()); staging.getConfig().setProperty(DatabaseConfig.FEATURE_SKIP_ORACLE_RECYCLEBIN_TABLES, true); + rsgb = new DatabaseConnection(OracleConnectionUnwrapper.unwrap(dsRsgb.getConnection()), DBPROPS.getProperty("rsgb.username").toUpperCase()); + rsgb.getConfig().setProperty(DatabaseConfig.PROPERTY_DATATYPE_FACTORY, new Oracle10DataTypeFactory()); + rsgb.getConfig().setProperty(DatabaseConfig.FEATURE_SKIP_ORACLE_RECYCLEBIN_TABLES, true); } else if (this.isPostgis) { staging.getConfig().setProperty(DatabaseConfig.PROPERTY_DATATYPE_FACTORY, new PostgresqlDataTypeFactory()); + rsgb.getConfig().setProperty(DatabaseConfig.PROPERTY_DATATYPE_FACTORY, new PostgresqlDataTypeFactory()); } else { fail("Geen ondersteunde database aangegegeven"); } From 0afea1a50aceb2396e448ec8fa2a52b548cee465 Mon Sep 17 00:00:00 2001 From: Mark Prins Date: Fri, 15 Nov 2019 16:10:01 +0100 Subject: [PATCH 32/32] gebruik jdbc-util 4.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f7a8985798..6872d36f91 100644 --- a/pom.xml +++ b/pom.xml @@ -62,7 +62,7 @@ 3.6.10.Final 22.0 - 4.1-SNAPSHOT + 4.1 1.16.1 7.1.8 42.2.8