[nobug] fix failing dbws builder tests - requires JDK 8u141+
This reverts commit 2c770a0ef8779733329d518fd59c024717139690.
diff --git a/utils/eclipselink.dbws.builder.test/src/dbws/testing/secondarysql/SecondarySQLTestSuite.java b/utils/eclipselink.dbws.builder.test/src/dbws/testing/secondarysql/SecondarySQLTestSuite.java
index d067ea2..83d81bf 100644
--- a/utils/eclipselink.dbws.builder.test/src/dbws/testing/secondarysql/SecondarySQLTestSuite.java
+++ b/utils/eclipselink.dbws.builder.test/src/dbws/testing/secondarysql/SecondarySQLTestSuite.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011, 2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
* which accompanies this distribution.
@@ -69,7 +69,6 @@
import static org.junit.Assert.assertTrue;
//EclipseLink imports
-import org.eclipse.persistence.descriptors.ClassDescriptor;
import org.eclipse.persistence.internal.databaseaccess.Platform;
import org.eclipse.persistence.internal.dbws.ProviderHelper;
import org.eclipse.persistence.internal.helper.ConversionManager;
@@ -84,7 +83,6 @@
import org.eclipse.persistence.logging.AbstractSessionLog;
import org.eclipse.persistence.logging.SessionLog;
import org.eclipse.persistence.oxm.XMLContext;
-import org.eclipse.persistence.oxm.XMLDescriptor;
import org.eclipse.persistence.oxm.XMLLogin;
import org.eclipse.persistence.oxm.XMLUnmarshaller;
import org.eclipse.persistence.platform.xml.XMLComparer;
@@ -105,7 +103,6 @@
import static org.eclipse.persistence.tools.dbws.DBWSPackager.ArchiveUse.noArchive;
import static org.eclipse.persistence.tools.dbws.Util.DOM_PLATFORM_CLASSNAME;
import static org.eclipse.persistence.tools.dbws.Util.OR_PRJ_SUFFIX;
-import static org.eclipse.persistence.tools.dbws.Util.TYPE_STR;
import static org.eclipse.persistence.tools.dbws.XRPackager.__nullStream;
//domain-specific (test) imports
@@ -510,9 +507,9 @@ public void countSecondary() throws SOAPException, SAXException, IOException, Tr
static final String COUNT_RESPONSE_MSG =
"<SOAP-ENV:Envelope xmlns:SOAP-ENV=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">" +
"<SOAP-ENV:Header/>" +
- "<SOAP-ENV:Body>" +
- "<srvc:countSecondaryResponse xmlns=\"" + SECONDARY_NAMESPACE +
- "\" xmlns:srvc=\"" + SECONDARY_SERVICE_NAMESPACE + "\">" +
+ "<SOAP-ENV:Body xmlns=\"" + SECONDARY_NAMESPACE +
+ "\" xmlns:srvc=\"" + SECONDARY_SERVICE_NAMESPACE + "\">" +
+ "<srvc:countSecondaryResponse>" +
"<srvc:result>" +
"<secondaryAggregate>" +
"<count>14</count>" +
@@ -563,9 +560,9 @@ public void allSecondary() throws SOAPException, SAXException, IOException, Tran
static final String ALL_RESPONSE_MSG =
"<SOAP-ENV:Envelope xmlns:SOAP-ENV=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">" +
"<SOAP-ENV:Header/>" +
- "<SOAP-ENV:Body>" +
- "<srvc:allSecondaryResponse xmlns=\"" + SECONDARY_NAMESPACE +
- "\" xmlns:srvc=\"" + SECONDARY_SERVICE_NAMESPACE + "\">" +
+ "<SOAP-ENV:Body xmlns=\"" + SECONDARY_NAMESPACE +
+ "\" xmlns:srvc=\"" + SECONDARY_SERVICE_NAMESPACE + "\">" +
+ "<srvc:allSecondaryResponse>" +
"<srvc:result>" +
"<secondaryType>" +
"<empno>7369</empno>" +
diff --git a/utils/eclipselink.dbws.builder.test/src/dbws/testing/sqlascollection/SQLAsCollectionTestSuite.java b/utils/eclipselink.dbws.builder.test/src/dbws/testing/sqlascollection/SQLAsCollectionTestSuite.java
index 2a554d1..8ec735b 100644
--- a/utils/eclipselink.dbws.builder.test/src/dbws/testing/sqlascollection/SQLAsCollectionTestSuite.java
+++ b/utils/eclipselink.dbws.builder.test/src/dbws/testing/sqlascollection/SQLAsCollectionTestSuite.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 1998, 2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018 Oracle and/or its affiliates. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
* which accompanies this distribution.
@@ -70,7 +70,6 @@
import static org.junit.Assert.fail;
//EclipseLink imports
-import org.eclipse.persistence.descriptors.ClassDescriptor;
import org.eclipse.persistence.internal.databaseaccess.Platform;
import org.eclipse.persistence.internal.dbws.ProviderHelper;
import org.eclipse.persistence.internal.helper.ConversionManager;
@@ -85,7 +84,6 @@
import org.eclipse.persistence.logging.AbstractSessionLog;
import org.eclipse.persistence.logging.SessionLog;
import org.eclipse.persistence.oxm.XMLContext;
-import org.eclipse.persistence.oxm.XMLDescriptor;
import org.eclipse.persistence.oxm.XMLLogin;
import org.eclipse.persistence.oxm.XMLUnmarshaller;
import org.eclipse.persistence.platform.xml.XMLComparer;
@@ -105,7 +103,6 @@
import static org.eclipse.persistence.tools.dbws.DBWSPackager.ArchiveUse.noArchive;
import static org.eclipse.persistence.tools.dbws.Util.DOM_PLATFORM_CLASSNAME;
import static org.eclipse.persistence.tools.dbws.Util.OR_PRJ_SUFFIX;
-import static org.eclipse.persistence.tools.dbws.Util.TYPE_STR;
import static org.eclipse.persistence.tools.dbws.XRPackager.__nullStream;
//testing imports
@@ -431,29 +428,29 @@ public void getData() throws SOAPException, ParserConfigurationException, SAXExc
"</sql>" +
"</dbws-builder>";
static final String GETDATA_RESPONSE =
- "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n" +
- "<SOAP-ENV:Envelope xmlns:SOAP-ENV=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">\n" +
- "<SOAP-ENV:Header/>\n" +
- "<SOAP-ENV:Body>\n" +
- "<srvc:"+SQLCOLLECTION_SERVICE+"Response xmlns=\"" + SQLCOLLECTION_NAMESPACE + "\" xmlns:srvc=\"" + SQLCOLLECTION_SERVICE_NAMESPACE + "\">\n" +
- "<srvc:result>\n" +
- "<sRecord>\n" +
- "<id>1</id>\n" +
- "<name>mike</name>\n" +
- "<since>2001-12-25</since>\n" +
- "</sRecord>\n" +
- "<sRecord>\n" +
- "<id>2</id>\n" +
- "<name xsi:nil=\"true\"/>\n" +
- "<since>2001-12-25</since>\n" +
- "</sRecord>\n" +
- "<sRecord>\n" +
- "<id>3</id>\n" +
- "<name>rick</name>\n" +
- "<since xsi:nil=\"true\"/>\n" +
- "</sRecord>\n" +
- "</srvc:result>\n" +
- "</srvc:"+SQLCOLLECTION_SERVICE+"Response>\n" +
- "</SOAP-ENV:Body>\n" +
+ "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>" +
+ "<SOAP-ENV:Envelope xmlns:SOAP-ENV=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">" +
+ "<SOAP-ENV:Header/>" +
+ "<SOAP-ENV:Body xmlns=\"" + SQLCOLLECTION_NAMESPACE + "\" xmlns:srvc=\"" + SQLCOLLECTION_SERVICE_NAMESPACE + "\">" +
+ "<srvc:"+SQLCOLLECTION_SERVICE+"Response>" +
+ "<srvc:result>" +
+ "<sRecord>" +
+ "<id>1</id>" +
+ "<name>mike</name>" +
+ "<since>2001-12-25</since>" +
+ "</sRecord>" +
+ "<sRecord>" +
+ "<id>2</id>" +
+ "<name xsi:nil=\"true\"/>" +
+ "<since>2001-12-25</since>" +
+ "</sRecord>" +
+ "<sRecord>" +
+ "<id>3</id>" +
+ "<name>rick</name>" +
+ "<since xsi:nil=\"true\"/>" +
+ "</sRecord>" +
+ "</srvc:result>" +
+ "</srvc:"+SQLCOLLECTION_SERVICE+"Response>" +
+ "</SOAP-ENV:Body>" +
"</SOAP-ENV:Envelope>";
}
