Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

compiled error when wsdl code generated #170

Merged
merged 4 commits into from
May 13, 2019
Merged

compiled error when wsdl code generated #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1f34495
add test with compiled error code generated
Mar 18, 2019
20bffdc
fix class name
Mar 19, 2019
236a724
include only QTest
Mar 19, 2019
01cc592
include QSharedPointer in header
Mar 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion kdwsdl2cpp/src/converter_complextype.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ void Converter::convertComplexType(const XSD::ComplexType *type)
}
}

newClass.addInclude("QSharedPointer");
newClass.addHeaderInclude("QSharedPointer");
mClasses.addClass(newClass);
}

Expand Down
2 changes: 2 additions & 0 deletions unittests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,3 +94,5 @@ add_subdirectory(empty_list_wsdl)
add_subdirectory(list_restriction)

add_subdirectory(kddatetime)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please rebase on top of master, this is already in there.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.


add_subdirectory(QSharedPointer_include)
5 changes: 5 additions & 0 deletions unittests/QSharedPointer_include/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
set(QSharedPointer_include_SRCS test_qsharedpointer_include.cpp)

set(WSDL_FILES test_qsharedpointer_include_wsdl.wsdl)

add_unittest(${QSharedPointer_include_SRCS})
12 changes: 12 additions & 0 deletions unittests/QSharedPointer_include/QSharedPointer_include.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
include( $${TOP_SOURCE_DIR}/unittests/unittests.pri )
QT += network xml
SOURCES = test_qsharedpointer_include.cpp
test.target = test
test.commands = ./$(TARGET)
test.depends = $(TARGET)
QMAKE_EXTRA_TARGETS += test

KDWSDL = test_qsharedpointer_include_wsdl.wsdl

OTHER_FILES = $$KDWSDL
LIBS += -L$${TOP_BUILD_DIR}/lib
20 changes: 20 additions & 0 deletions unittests/QSharedPointer_include/test_qsharedpointer_include.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#include "wsdl_test_qsharedpointer_include_wsdl.h"

#include <QTest>

class RightInclude:
public QObject
{
Q_OBJECT

private Q_SLOTS:

void testCompiled()
{
Hello_Service service;
}
};

QTEST_MAIN(RightInclude)

#include "test_qsharedpointer_include.moc"
89 changes: 89 additions & 0 deletions unittests/QSharedPointer_include/test_qsharedpointer_include_wsdl.wsdl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@

<definitions name="HelloService"
targetNamespace="http://www.examples.com/wsdl/HelloService.wsdl"
xmlns="http://schemas.xmlsoap.org/wsdl/"
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
xmlns:tns="http://www.examples.com/wsdl/HelloService.wsdl"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:test="urn:test">
<types>
<xsd:schema targetNamespace="urn:test"
xmlns:xsd="http://www.w3.org/2001/XMLSchema" >
<xsd:import namespace="http://www.w3.org/2001/XMLSchema"/>

<xsd:complexType name="trajectoryPoint">
<xsd:sequence>
<xsd:element name="time" type="xsd:double"/>
<xsd:element name="cv" type="xsd:double" minOccurs="6" maxOccurs="6"/>
</xsd:sequence>
</xsd:complexType>

<xsd:complexType name="realTrajectoryPoint">
<xsd:complexContent>
<xsd:extension base="test:trajectoryPoint">
<xsd:sequence>
<xsd:element name="covMatrix" type="xsd:double" minOccurs="36" maxOccurs="36"/>
</xsd:sequence>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>

<xsd:complexType name="trajectory">
<xsd:sequence>
<xsd:element name="id" type="xsd:long"/>
<xsd:element name="category" type="xsd:string"/>
<xsd:element name="coordinateSystem" type="xsd:string"/>
<xsd:element name="points" type="test:trajectoryPoint" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="realPoints" type="test:realTrajectoryPoint" minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
</xsd:complexType>

<xsd:element name="getTrajectoryResponse">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="trajectoryInfo" type="test:trajectory" minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
</xsd:complexType>
</xsd:element>

</xsd:schema>
</types>
<message name="SayHelloRequest">
<part name="firstName" type="test:trajectory"/>
</message>
<message name="SayHelloResponse">
<part name="greeting" type="test:getTrajectoryResponse"/>
</message>
<portType name="Hello_PortType">
<operation name="sayHello">
<input message="tns:SayHelloRequest"/>
<output message="tns:SayHelloResponse"/>
</operation>
</portType>
<binding name="Hello_Binding" type="tns:Hello_PortType">
<soap:binding style="rpc"
transport="http://schemas.xmlsoap.org/soap/http"/>
<operation name="sayHello">
<soap:operation soapAction="sayHello"/>
<input>
<soap:body
encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
namespace="urn:examples:helloservice"
use="encoded"/>
</input>
<output>
<soap:body
encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
namespace="urn:examples:helloservice"
use="encoded"/>
</output>
</operation>
</binding>
<service name="Hello_Service">
<documentation>WSDL File for HelloService</documentation>
<port binding="tns:Hello_Binding" name="Hello_Port">
<soap:address
location="http://www.examples.com/SayHello/"/>
</port>
</service>
</definitions>
3 changes: 2 additions & 1 deletion unittests/unittests.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ SUBDIRS = \
test_calc \
ws_addressing_support \
ws_usernametoken_support \
list_restriction
list_restriction \
QSharedPointer_include

# These need internet access
SUBDIRS += webcalls webcalls_wsdl
Expand Down