Skip to content

Commit 00a0bd0

Browse files
dbulahovdbulahov
committed
add integration package for integration tests
Signed-off-by: dbulahov <[email protected]>
1 parent 84f31fc commit 00a0bd0

File tree

13 files changed

+204
-184
lines changed

13 files changed

+204
-184
lines changed

client/soapmessage/src/test/java/org/eclipse/daanse/xmla/client/soapmessage/ClientDiscoverTest.java renamed to client/soapmessage/src/test/java/org/eclipse/daanse/xmla/client/soapmessage/integration/ClientDiscoverTest.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* SmartCity Jena - initial
1212
* Stefan Bischof (bipolis.org) - initial
1313
*/
14-
package org.eclipse.daanse.xmla.client.soapmessage;
14+
package org.eclipse.daanse.xmla.client.soapmessage.integration;
1515

1616
import jakarta.xml.soap.SOAPMessage;
1717
import jakarta.xml.ws.Provider;
@@ -118,6 +118,10 @@
118118
import org.eclipse.daanse.xmla.api.discover.mdschema.properties.MdSchemaPropertiesResponseRow;
119119
import org.eclipse.daanse.xmla.api.discover.mdschema.sets.MdSchemaSetsRequest;
120120
import org.eclipse.daanse.xmla.api.discover.mdschema.sets.MdSchemaSetsResponseRow;
121+
import org.eclipse.daanse.xmla.client.soapmessage.MockProvider;
122+
import org.eclipse.daanse.xmla.client.soapmessage.Responses;
123+
import org.eclipse.daanse.xmla.client.soapmessage.XMLUtil;
124+
import org.eclipse.daanse.xmla.client.soapmessage.XmlaServiceClientImpl;
121125
import org.eclipse.daanse.xmla.model.record.discover.PropertiesR;
122126
import org.eclipse.daanse.xmla.model.record.discover.dbschema.catalogs.DbSchemaCatalogsRequestR;
123127
import org.eclipse.daanse.xmla.model.record.discover.dbschema.catalogs.DbSchemaCatalogsRestrictionsR;

client/soapmessage/src/test/java/org/eclipse/daanse/xmla/client/soapmessage/ClientExecuteTest.java renamed to client/soapmessage/src/test/java/org/eclipse/daanse/xmla/client/soapmessage/integration/ClientExecuteTest.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* SmartCity Jena - initial
1212
* Stefan Bischof (bipolis.org) - initial
1313
*/
14-
package org.eclipse.daanse.xmla.client.soapmessage;
14+
package org.eclipse.daanse.xmla.client.soapmessage.integration;
1515

1616
import jakarta.xml.soap.SOAPMessage;
1717
import jakarta.xml.ws.Provider;
@@ -58,6 +58,9 @@
5858
import org.eclipse.daanse.xmla.api.xmla.ProactiveCaching;
5959
import org.eclipse.daanse.xmla.api.xmla.Scope;
6060
import org.eclipse.daanse.xmla.api.xmla_empty.Emptyresult;
61+
import org.eclipse.daanse.xmla.client.soapmessage.MockProvider;
62+
import org.eclipse.daanse.xmla.client.soapmessage.XMLUtil;
63+
import org.eclipse.daanse.xmla.client.soapmessage.XmlaServiceClientImpl;
6164
import org.eclipse.daanse.xmla.model.record.discover.PropertiesR;
6265
import org.eclipse.daanse.xmla.model.record.execute.alter.AlterRequestR;
6366
import org.eclipse.daanse.xmla.model.record.execute.cancel.CancelRequestR;

‎client/soapmessage/test.bndrun.deactivated‎

Lines changed: 87 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -21,25 +21,25 @@
2121
-runvm: ${def;argLine}
2222

2323
-runproperties: \
24-
org.slf4j.simpleLogger.defaultLogLevel=debug,\
25-
org.osgi.service.http.port=8090
24+
org.slf4j.simpleLogger.defaultLogLevel=debug,\
25+
org.osgi.service.http.port=8090
2626

2727

2828
port : 17290
2929
-runproperties.local.agent : osgi.fx.agent.port=0.0.0.0:${port}
3030

3131
-runrequires: \
32-
bnd.identity;id='org.eclipse.daanse.xmla.client.soapmessage',\
33-
bnd.identity;id='org.eclipse.daanse.xmla.client.soapmessage-tests',\
34-
bnd.identity;id='com.sun.xml.ws.jaxws-rt',\
35-
bnd.identity;id='org.glassfish.hk2.osgi-resource-locator',\
36-
bnd.identity;id=junit-jupiter-engine,\
37-
bnd.identity;id=junit-platform-launcher,\
38-
bnd.identity;id='com.sun.xml.messaging.saaj.impl',\
39-
bnd.identity;id='org.apache.felix.scr',\
40-
bnd.identity;id='org.eclipse.daanse.jakarta.xml.ws.runtime.httpwhiteboard',\
41-
bnd.identity;id='org.eclipse.daanse.jakarta.xml.ws.handler',\
42-
bnd.identity;id='org.eclipse.daanse.jakarta.xml.ws.api'
32+
bnd.identity;id='org.eclipse.daanse.xmla.client.soapmessage',\
33+
bnd.identity;id='org.eclipse.daanse.xmla.client.soapmessage-tests',\
34+
bnd.identity;id='com.sun.xml.ws.jaxws-rt',\
35+
bnd.identity;id='org.glassfish.hk2.osgi-resource-locator',\
36+
bnd.identity;id=junit-jupiter-engine,\
37+
bnd.identity;id=junit-platform-launcher,\
38+
bnd.identity;id='com.sun.xml.messaging.saaj.impl',\
39+
bnd.identity;id='org.apache.felix.scr',\
40+
bnd.identity;id='org.eclipse.daanse.jakarta.xml.ws.runtime.httpwhiteboard',\
41+
bnd.identity;id='org.eclipse.daanse.jakarta.xml.ws.handler',\
42+
bnd.identity;id='org.eclipse.daanse.jakarta.xml.ws.api'
4343

4444

4545

@@ -49,80 +49,80 @@ port : 17290
4949

5050
# This will help us keep -runbundles sorted
5151
-runstartlevel: \
52-
order=sortbynameversion,\
53-
begin=-1
52+
order=sortbynameversion,\
53+
begin=-1
5454
# The following is calculated by the bnd-resolver-maven-plugin
5555

5656
-runbundles: \
57-
assertj-core;version='[3.26.0,3.26.1)',\
58-
ch.qos.logback.classic;version='[1.5.6,1.5.7)',\
59-
ch.qos.logback.core;version='[1.5.6,1.5.7)',\
60-
com.fasterxml.woodstox.woodstox-core;version='[6.5.1,6.5.2)',\
61-
com.sun.activation.jakarta.activation;version='[2.0.1,2.0.2)',\
62-
com.sun.xml.bind.jaxb-core;version='[4.0.4,4.0.5)',\
63-
com.sun.xml.bind.jaxb-impl;version='[4.0.4,4.0.5)',\
64-
com.sun.xml.fastinfoset.FastInfoset;version='[2.1.0,2.1.1)',\
65-
com.sun.xml.messaging.saaj.impl;version='[3.0.3,3.0.4)',\
66-
com.sun.xml.stream.buffer.streambuffer;version='[2.1.0,2.1.1)',\
67-
com.sun.xml.ws.jaxws-rt;version='[4.0.2,4.0.3)',\
68-
jakarta.activation-api;version='[2.1.2,2.1.3)',\
69-
jakarta.annotation-api;version='[2.1.1,2.1.2)',\
70-
jakarta.xml.bind-api;version='[4.0.1,4.0.2)',\
71-
jakarta.xml.soap-api;version='[3.0.2,3.0.3)',\
72-
jakarta.xml.ws-api;version='[4.0.1,4.0.2)',\
73-
javax.activation-api;version='[1.2.0,1.2.1)',\
74-
jaxb-api;version='[2.3.1,2.3.2)',\
75-
junit-jupiter-api;version='[5.9.2,5.9.3)',\
76-
junit-jupiter-engine;version='[5.9.2,5.9.3)',\
77-
junit-jupiter-params;version='[5.9.2,5.9.3)',\
78-
junit-platform-commons;version='[1.9.2,1.9.3)',\
79-
junit-platform-engine;version='[1.9.2,1.9.3)',\
80-
junit-platform-launcher;version='[1.9.2,1.9.3)',\
81-
net.bytebuddy.byte-buddy;version='[1.14.16,1.14.17)',\
82-
net.bytebuddy.byte-buddy-agent;version='[1.12.16,1.12.17)',\
83-
org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.7,1.3.8)',\
84-
org.apache.commons.commons-fileupload;version='[1.5.0,1.5.1)',\
85-
org.apache.commons.commons-io;version='[2.11.0,2.11.1)',\
86-
org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
87-
org.apache.felix.http.jetty12.light;version='[1.0.2,1.0.3)',\
88-
org.apache.felix.http.servlet-api;version='[3.0.0,3.0.1)',\
89-
org.apache.felix.scr;version='[2.2.10,2.2.11)',\
90-
org.eclipse.daanse.jakarta.xml.ws.api;version='[0.0.1,0.0.2)',\
91-
org.eclipse.daanse.jakarta.xml.ws.handler;version='[0.0.1,0.0.2)',\
92-
org.eclipse.daanse.jakarta.xml.ws.runtime.httpwhiteboard;version='[0.0.1,0.0.2)',\
93-
org.eclipse.daanse.jakarta.xml.ws.runtime.registrar;version='[0.0.1,0.0.2)',\
94-
org.eclipse.daanse.xmla.api;version='[0.0.1,0.0.2)',\
95-
org.eclipse.daanse.xmla.client.soapmessage;version='[0.0.1,0.0.2)',\
96-
org.eclipse.daanse.xmla.client.soapmessage-tests;version='[0.0.1,0.0.2)',\
97-
org.eclipse.daanse.xmla.model.record;version='[0.0.1,0.0.2)',\
98-
org.eclipse.jetty.alpn.server;version='[12.0.5,12.0.6)',\
99-
org.eclipse.jetty.ee10.servlet;version='[12.0.5,12.0.6)',\
100-
org.eclipse.jetty.http;version='[12.0.5,12.0.6)',\
101-
org.eclipse.jetty.http2.common;version='[12.0.5,12.0.6)',\
102-
org.eclipse.jetty.http2.hpack;version='[12.0.5,12.0.6)',\
103-
org.eclipse.jetty.http2.server;version='[12.0.5,12.0.6)',\
104-
org.eclipse.jetty.io;version='[12.0.5,12.0.6)',\
105-
org.eclipse.jetty.jmx;version='[12.0.5,12.0.6)',\
106-
org.eclipse.jetty.security;version='[12.0.5,12.0.6)',\
107-
org.eclipse.jetty.server;version='[12.0.5,12.0.6)',\
108-
org.eclipse.jetty.session;version='[12.0.5,12.0.6)',\
109-
org.eclipse.jetty.util;version='[12.0.5,12.0.6)',\
110-
org.glassfish.external.management-api;version='[3.2.3,3.2.4)',\
111-
org.glassfish.gmbal.gmbal-api-only;version='[4.0.3,4.0.4)',\
112-
org.glassfish.ha.ha-api;version='[3.1.13,3.1.14)',\
113-
org.glassfish.hk2.osgi-resource-locator;version='[2.4.0,2.4.1)',\
114-
org.jvnet.mimepull;version='[1.10.0,1.10.1)',\
115-
org.jvnet.staxex.stax-ex;version='[2.1.0,2.1.1)',\
116-
org.mockito.mockito-core;version='[4.9.0,4.9.1)',\
117-
org.objenesis;version='[3.3.0,3.3.1)',\
118-
org.opentest4j;version='[1.2.0,1.2.1)',\
119-
org.osgi.service.component;version='[1.5.1,1.5.2)',\
120-
org.osgi.test.common;version='[1.3.0,1.3.1)',\
121-
org.osgi.test.junit5;version='[1.3.0,1.3.1)',\
122-
org.osgi.test.junit5.cm;version='[1.3.0,1.3.1)',\
123-
org.osgi.util.function;version='[1.2.0,1.2.1)',\
124-
org.osgi.util.promise;version='[1.3.0,1.3.1)',\
125-
org.xmlunit.xmlunit-assertj3;version='[2.9.0,2.9.1)',\
126-
org.xmlunit.xmlunit-core;version='[2.10.0,2.10.1)',\
127-
slf4j.api;version='[2.0.12,2.0.13)',\
128-
stax2-api;version='[4.2.2,4.2.3)'
57+
assertj-core;version='[3.26.0,3.26.1)',\
58+
ch.qos.logback.classic;version='[1.5.6,1.5.7)',\
59+
ch.qos.logback.core;version='[1.5.6,1.5.7)',\
60+
com.fasterxml.woodstox.woodstox-core;version='[6.5.1,6.5.2)',\
61+
com.sun.activation.jakarta.activation;version='[2.0.1,2.0.2)',\
62+
com.sun.xml.bind.jaxb-core;version='[4.0.4,4.0.5)',\
63+
com.sun.xml.bind.jaxb-impl;version='[4.0.4,4.0.5)',\
64+
com.sun.xml.fastinfoset.FastInfoset;version='[2.1.0,2.1.1)',\
65+
com.sun.xml.messaging.saaj.impl;version='[3.0.3,3.0.4)',\
66+
com.sun.xml.stream.buffer.streambuffer;version='[2.1.0,2.1.1)',\
67+
com.sun.xml.ws.jaxws-rt;version='[4.0.2,4.0.3)',\
68+
jakarta.activation-api;version='[2.1.2,2.1.3)',\
69+
jakarta.annotation-api;version='[2.1.1,2.1.2)',\
70+
jakarta.xml.bind-api;version='[4.0.1,4.0.2)',\
71+
jakarta.xml.soap-api;version='[3.0.2,3.0.3)',\
72+
jakarta.xml.ws-api;version='[4.0.1,4.0.2)',\
73+
javax.activation-api;version='[1.2.0,1.2.1)',\
74+
jaxb-api;version='[2.3.1,2.3.2)',\
75+
junit-jupiter-api;version='[5.9.2,5.9.3)',\
76+
junit-jupiter-engine;version='[5.9.2,5.9.3)',\
77+
junit-jupiter-params;version='[5.9.2,5.9.3)',\
78+
junit-platform-commons;version='[1.9.2,1.9.3)',\
79+
junit-platform-engine;version='[1.9.2,1.9.3)',\
80+
junit-platform-launcher;version='[1.9.2,1.9.3)',\
81+
net.bytebuddy.byte-buddy;version='[1.14.16,1.14.17)',\
82+
net.bytebuddy.byte-buddy-agent;version='[1.12.16,1.12.17)',\
83+
org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.7,1.3.8)',\
84+
org.apache.commons.commons-fileupload;version='[1.5.0,1.5.1)',\
85+
org.apache.commons.commons-io;version='[2.11.0,2.11.1)',\
86+
org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
87+
org.apache.felix.http.jetty12.light;version='[1.0.2,1.0.3)',\
88+
org.apache.felix.http.servlet-api;version='[3.0.0,3.0.1)',\
89+
org.apache.felix.scr;version='[2.2.10,2.2.11)',\
90+
org.eclipse.daanse.jakarta.xml.ws.api;version='[0.0.1,0.0.2)',\
91+
org.eclipse.daanse.jakarta.xml.ws.handler;version='[0.0.1,0.0.2)',\
92+
org.eclipse.daanse.jakarta.xml.ws.runtime.httpwhiteboard;version='[0.0.1,0.0.2)',\
93+
org.eclipse.daanse.jakarta.xml.ws.runtime.registrar;version='[0.0.1,0.0.2)',\
94+
org.eclipse.daanse.xmla.api;version='[0.0.1,0.0.2)',\
95+
org.eclipse.daanse.xmla.client.soapmessage;version='[0.0.1,0.0.2)',\
96+
org.eclipse.daanse.xmla.client.soapmessage-tests;version='[0.0.1,0.0.2)',\
97+
org.eclipse.daanse.xmla.model.record;version='[0.0.1,0.0.2)',\
98+
org.eclipse.jetty.alpn.server;version='[12.0.5,12.0.6)',\
99+
org.eclipse.jetty.ee10.servlet;version='[12.0.5,12.0.6)',\
100+
org.eclipse.jetty.http;version='[12.0.5,12.0.6)',\
101+
org.eclipse.jetty.http2.common;version='[12.0.5,12.0.6)',\
102+
org.eclipse.jetty.http2.hpack;version='[12.0.5,12.0.6)',\
103+
org.eclipse.jetty.http2.server;version='[12.0.5,12.0.6)',\
104+
org.eclipse.jetty.io;version='[12.0.5,12.0.6)',\
105+
org.eclipse.jetty.jmx;version='[12.0.5,12.0.6)',\
106+
org.eclipse.jetty.security;version='[12.0.5,12.0.6)',\
107+
org.eclipse.jetty.server;version='[12.0.5,12.0.6)',\
108+
org.eclipse.jetty.session;version='[12.0.5,12.0.6)',\
109+
org.eclipse.jetty.util;version='[12.0.5,12.0.6)',\
110+
org.glassfish.external.management-api;version='[3.2.3,3.2.4)',\
111+
org.glassfish.gmbal.gmbal-api-only;version='[4.0.3,4.0.4)',\
112+
org.glassfish.ha.ha-api;version='[3.1.13,3.1.14)',\
113+
org.glassfish.hk2.osgi-resource-locator;version='[2.4.0,2.4.1)',\
114+
org.jvnet.mimepull;version='[1.10.0,1.10.1)',\
115+
org.jvnet.staxex.stax-ex;version='[2.1.0,2.1.1)',\
116+
org.mockito.mockito-core;version='[4.9.0,4.9.1)',\
117+
org.objenesis;version='[3.3.0,3.3.1)',\
118+
org.opentest4j;version='[1.2.0,1.2.1)',\
119+
org.osgi.service.component;version='[1.5.1,1.5.2)',\
120+
org.osgi.test.common;version='[1.3.0,1.3.1)',\
121+
org.osgi.test.junit5;version='[1.3.0,1.3.1)',\
122+
org.osgi.test.junit5.cm;version='[1.3.0,1.3.1)',\
123+
org.osgi.util.function;version='[1.2.0,1.2.1)',\
124+
org.osgi.util.promise;version='[1.3.0,1.3.1)',\
125+
org.xmlunit.xmlunit-assertj3;version='[2.9.0,2.9.1)',\
126+
org.xmlunit.xmlunit-core;version='[2.10.0,2.10.1)',\
127+
slf4j.api;version='[2.0.12,2.0.13)',\
128+
stax2-api;version='[4.2.2,4.2.3)'

server/jakarta.jws/src/test/java/org/eclipse/daanse/xmla/server/jakarta/jws/MsXmlAnalysisSoapTest.java renamed to server/jakarta.jws/src/test/java/org/eclipse/daanse/xmla/server/jakarta/jws/integration/MsXmlAnalysisSoapTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* SmartCity Jena - initial
1212
* Stefan Bischof (bipolis.org) - initial
1313
*/
14-
package org.eclipse.daanse.xmla.server.jakarta.jws;
14+
package org.eclipse.daanse.xmla.server.jakarta.jws.integration;
1515

1616
import static org.assertj.core.api.Assertions.assertThat;
1717
import static org.mockito.Mockito.doReturn;
@@ -28,6 +28,7 @@
2828
import org.eclipse.daanse.xmla.model.jakarta.xml.bind.xmla_rowset.Row;
2929
import org.eclipse.daanse.xmla.model.jakarta.xml.bind.xmla_rowset.Rowset;
3030
import org.eclipse.daanse.xmla.model.jakarta.xml.bind.xmla_rowset.discover.DiscoverPropertiesResponseRowXml;
31+
import org.eclipse.daanse.xmla.server.jakarta.jws.MsXmlAnalysisSoap;
3132
import org.eclipse.daanse.xmla.server.tck.Constants;
3233
import org.eclipse.daanse.xmla.server.tck.SOAPUtil;
3334
import org.eclipse.daanse.xmla.server.tck.XMLUtil;

server/jakarta.jws/src/test/java/org/eclipse/daanse/xmla/server/jakarta/jws/WsdlTest.java renamed to server/jakarta.jws/src/test/java/org/eclipse/daanse/xmla/server/jakarta/jws/integration/WsdlTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* SmartCity Jena - initial
1212
* Stefan Bischof (bipolis.org) - initial
1313
*/
14-
package org.eclipse.daanse.xmla.server.jakarta.jws;
14+
package org.eclipse.daanse.xmla.server.jakarta.jws.integration;
1515

1616
import static org.assertj.core.api.Assertions.assertThat;
1717
import static org.mockito.Mockito.mock;

0 commit comments

Comments
 (0)