Author: richard.opalka(a)jboss.com Date: 2012-11-30 04:49:26 -0500 (Fri, 30 Nov 2012) New Revision: 17047 Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedExceptionCA.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedExceptionFA.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedExceptionGA.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedExceptionMA.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/EndpointImpl.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ExtendedAdaptedExceptionCA.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ExtendedAdaptedExceptionFA.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ExtendedAdaptedExceptionGA.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ExtendedAdaptedExceptionMA.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/JBWS3552TestCase.java Log: [JBWS-3552] more meaning full exception test cases Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedExceptionCA.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedExceptionCA.java 2012-11-30 09:37:23 UTC (rev 17046) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedExceptionCA.java 2012-11-30 09:49:26 UTC (rev 17047) @@ -28,17 +28,15 @@ public class AdaptedExceptionCA extends Exception { private String message; private String description; - private int code; private ComplexObjectCA complexObject; public AdaptedExceptionCA() { super(); } - public AdaptedExceptionCA(String message, String description, int code, ComplexObjectCA complexObject) { + public AdaptedExceptionCA(String message, String description, ComplexObjectCA complexObject) { this.message = message; this.description = description; - this.code = code; this.complexObject = complexObject; } @@ -50,15 +48,11 @@ return description; } - public int getCode() { - return code; - } - public ComplexObjectCA getComplexObject() { return complexObject; } public String toString() { - return message + "," + description + "," + code + "," + complexObject; + return message + "," + description + "," + complexObject; } } \ No newline at end of file Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedExceptionFA.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedExceptionFA.java 2012-11-30 09:37:23 UTC (rev 17046) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedExceptionFA.java 2012-11-30 09:49:26 UTC (rev 17047) @@ -28,7 +28,6 @@ public class AdaptedExceptionFA extends Exception { private String message; private String description; - private int code; @XmlJavaTypeAdapter(value = ComplexObjectFAAdapter.class) private ComplexObjectFA complexObject; @@ -36,10 +35,9 @@ super(); } - public AdaptedExceptionFA(String message, String description, int code, ComplexObjectFA complexObject) { + public AdaptedExceptionFA(String message, String description, ComplexObjectFA complexObject) { this.message = message; this.description = description; - this.code = code; this.complexObject = complexObject; } @@ -51,15 +49,11 @@ return description; } - public int getCode() { - return code; - } - public ComplexObjectFA getComplexObject() { return complexObject; } public String toString() { - return message + "," + description + "," + code + "," + complexObject; + return message + "," + description + "," + complexObject; } } \ No newline at end of file Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedExceptionGA.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedExceptionGA.java 2012-11-30 09:37:23 UTC (rev 17046) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedExceptionGA.java 2012-11-30 09:49:26 UTC (rev 17047) @@ -28,17 +28,15 @@ public class AdaptedExceptionGA extends Exception { private String message; private String description; - private int code; private ComplexObjectGA complexObject; public AdaptedExceptionGA() { super(); } - public AdaptedExceptionGA(String message, String description, int code, ComplexObjectGA complexObject) { + public AdaptedExceptionGA(String message, String description, ComplexObjectGA complexObject) { this.message = message; this.description = description; - this.code = code; this.complexObject = complexObject; } @@ -50,15 +48,11 @@ return description; } - public int getCode() { - return code; - } - public ComplexObjectGA getComplexObject() { return complexObject; } public String toString() { - return message + "," + description + "," + code + "," + complexObject; + return message + "," + description + "," + complexObject; } } \ No newline at end of file Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedExceptionMA.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedExceptionMA.java 2012-11-30 09:37:23 UTC (rev 17046) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedExceptionMA.java 2012-11-30 09:49:26 UTC (rev 17047) @@ -28,17 +28,15 @@ public class AdaptedExceptionMA extends Exception { private String message; private String description; - private int code; private ComplexObjectMA complexObject; public AdaptedExceptionMA() { super(); } - public AdaptedExceptionMA(String message, String description, int code, ComplexObjectMA complexObject) { + public AdaptedExceptionMA(String message, String description, ComplexObjectMA complexObject) { this.message = message; this.description = description; - this.code = code; this.complexObject = complexObject; } @@ -58,14 +56,6 @@ return description; } - public void setCode(int code) { - this.code = code; - } - - public int getCode() { - return code; - } - public void setComplexObject(ComplexObjectMA complexObject) { this.complexObject = complexObject; } @@ -76,6 +66,6 @@ } public String toString() { - return message + "," + description + "," + code + "," + complexObject; + return message + "," + description + "," + complexObject; } } \ No newline at end of file Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/EndpointImpl.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/EndpointImpl.java 2012-11-30 09:37:23 UTC (rev 17046) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/EndpointImpl.java 2012-11-30 09:49:26 UTC (rev 17047) @@ -58,34 +58,34 @@ } public void throwExceptionCA() throws AdaptedExceptionCA { - throw new ExtendedAdaptedExceptionCA("exception message", "exception description", 666, new ComplexObjectCA("c", "d")); + throw new ExtendedAdaptedExceptionCA(666, "exception message", "exception description", new ComplexObjectCA("c", "d")); } public void throwExtendedExceptionCA() throws ExtendedAdaptedExceptionCA { - throw new ExtendedAdaptedExceptionCA("exception message", "exception description", 666, new ComplexObjectCA("c", "d")); + throw new ExtendedAdaptedExceptionCA(666, "exception message", "exception description", new ComplexObjectCA("c", "d")); } public void throwExceptionFA() throws AdaptedExceptionFA { - throw new ExtendedAdaptedExceptionFA("exception message", "exception description", 666, new ComplexObjectFA("c", "d")); + throw new ExtendedAdaptedExceptionFA(666, "exception message", "exception description", new ComplexObjectFA("c", "d")); } public void throwExtendedExceptionFA() throws ExtendedAdaptedExceptionFA { - throw new ExtendedAdaptedExceptionFA("exception message", "exception description", 666, new ComplexObjectFA("c", "d")); + throw new ExtendedAdaptedExceptionFA(666, "exception message", "exception description", new ComplexObjectFA("c", "d")); } public void throwExceptionGA() throws AdaptedExceptionGA { - throw new ExtendedAdaptedExceptionGA("exception message", "exception description", 666, new ComplexObjectGA("c", "d")); + throw new ExtendedAdaptedExceptionGA(666, "exception message", "exception description", new ComplexObjectGA("c", "d")); } public void throwExtendedExceptionGA() throws ExtendedAdaptedExceptionGA { - throw new ExtendedAdaptedExceptionGA("exception message", "exception description", 666, new ComplexObjectGA("c", "d")); + throw new ExtendedAdaptedExceptionGA(666, "exception message", "exception description", new ComplexObjectGA("c", "d")); } public void throwExceptionMA() throws AdaptedExceptionMA { - throw new ExtendedAdaptedExceptionMA("exception message", "exception description", 666, new ComplexObjectMA("c", "d")); + throw new ExtendedAdaptedExceptionMA(666, "exception message", "exception description", new ComplexObjectMA("c", "d")); } public void throwExtendedExceptionMA() throws ExtendedAdaptedExceptionMA { - throw new ExtendedAdaptedExceptionMA("exception message", "exception description", 666, new ComplexObjectMA("c", "d")); + throw new ExtendedAdaptedExceptionMA(666, "exception message", "exception description", new ComplexObjectMA("c", "d")); } } Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ExtendedAdaptedExceptionCA.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ExtendedAdaptedExceptionCA.java 2012-11-30 09:37:23 UTC (rev 17046) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ExtendedAdaptedExceptionCA.java 2012-11-30 09:49:26 UTC (rev 17047) @@ -27,11 +27,21 @@ @XmlAccessorType(XmlAccessType.FIELD) public class ExtendedAdaptedExceptionCA extends AdaptedExceptionCA { + private int code; public ExtendedAdaptedExceptionCA() { } - public ExtendedAdaptedExceptionCA(String message, String description, int code, ComplexObjectCA complexObject) { - super(message, description, code, complexObject); + public ExtendedAdaptedExceptionCA(int code, String message, String description, ComplexObjectCA complexObject) { + super(message, description, complexObject); + this.code = code; } + + public int getCode() { + return code; + } + + public String toString() { + return code + "," + super.toString(); + } } \ No newline at end of file Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ExtendedAdaptedExceptionFA.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ExtendedAdaptedExceptionFA.java 2012-11-30 09:37:23 UTC (rev 17046) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ExtendedAdaptedExceptionFA.java 2012-11-30 09:49:26 UTC (rev 17047) @@ -26,11 +26,22 @@ @XmlAccessorType(XmlAccessType.FIELD) public class ExtendedAdaptedExceptionFA extends AdaptedExceptionFA { + private int code; + public ExtendedAdaptedExceptionFA() { super(); } - public ExtendedAdaptedExceptionFA(String message, String description, int code, ComplexObjectFA complexObject) { - super(message, description, code, complexObject); + public ExtendedAdaptedExceptionFA(int code, String message, String description, ComplexObjectFA complexObject) { + super(message, description, complexObject); + this.code = code; } + + public int getCode() { + return code; + } + + public String toString() { + return code + "," + super.toString(); + } } \ No newline at end of file Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ExtendedAdaptedExceptionGA.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ExtendedAdaptedExceptionGA.java 2012-11-30 09:37:23 UTC (rev 17046) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ExtendedAdaptedExceptionGA.java 2012-11-30 09:49:26 UTC (rev 17047) @@ -27,11 +27,21 @@ @XmlAccessorType(XmlAccessType.FIELD) public class ExtendedAdaptedExceptionGA extends AdaptedExceptionGA { + private int code; public ExtendedAdaptedExceptionGA() { } - public ExtendedAdaptedExceptionGA(String message, String description, int code, ComplexObjectGA complexObject) { - super(message, description, code, complexObject); + public ExtendedAdaptedExceptionGA(int code, String message, String description, ComplexObjectGA complexObject) { + super(message, description, complexObject); + this.code = code; } + + public int getCode() { + return code; + } + + public String toString() { + return code + "," + super.toString(); + } } \ No newline at end of file Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ExtendedAdaptedExceptionMA.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ExtendedAdaptedExceptionMA.java 2012-11-30 09:37:23 UTC (rev 17046) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ExtendedAdaptedExceptionMA.java 2012-11-30 09:49:26 UTC (rev 17047) @@ -27,11 +27,25 @@ @XmlAccessorType(XmlAccessType.PUBLIC_MEMBER) public class ExtendedAdaptedExceptionMA extends AdaptedExceptionMA { + private int code; public ExtendedAdaptedExceptionMA() { } - public ExtendedAdaptedExceptionMA(String message, String description, int code, ComplexObjectMA complexObject) { - super(message, description, code, complexObject); + public ExtendedAdaptedExceptionMA(int code, String message, String description, ComplexObjectMA complexObject) { + super(message, description, complexObject); + this.code = code; } + + public void setCode(int code) { + this.code = code; + } + + public int getCode() { + return code; + } + + public String toString() { + return code + "," + super.toString(); + } } \ No newline at end of file Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/JBWS3552TestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/JBWS3552TestCase.java 2012-11-30 09:37:23 UTC (rev 17046) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/JBWS3552TestCase.java 2012-11-30 09:49:26 UTC (rev 17047) @@ -113,7 +113,7 @@ endpoint.throwExceptionCA(); fail("Expected exception not thrown"); } catch (AdaptedExceptionCA e) { - assertEquals("exception message,exception description,666,c d", e.toString()); + assertEquals("666,exception message,exception description,c d", e.toString()); } } @@ -123,7 +123,7 @@ endpoint.throwExtendedExceptionCA(); fail("Expected exception not thrown"); } catch (ExtendedAdaptedExceptionCA e) { - assertEquals("exception message,exception description,666,c d", e.toString()); + assertEquals("666,exception message,exception description,c d", e.toString()); } } @@ -137,7 +137,7 @@ endpoint.throwExceptionFA(); fail("Expected exception not thrown"); } catch (AdaptedExceptionFA e) { - assertEquals("exception message,exception description,666,c d", e.toString()); + assertEquals("666,exception message,exception description,c d", e.toString()); } } @@ -147,7 +147,7 @@ endpoint.throwExtendedExceptionFA(); fail("Expected exception not thrown"); } catch (ExtendedAdaptedExceptionFA e) { - assertEquals("exception message,exception description,666,c d", e.toString()); + assertEquals("666,exception message,exception description,c d", e.toString()); } } @@ -161,7 +161,7 @@ endpoint.throwExceptionGA(); fail("Expected exception not thrown"); } catch (AdaptedExceptionGA e) { - assertEquals("exception message,exception description,666,c d", e.toString()); + assertEquals("666,exception message,exception description,c d", e.toString()); } } @@ -171,7 +171,7 @@ endpoint.throwExtendedExceptionGA(); fail("Expected exception not thrown"); } catch (ExtendedAdaptedExceptionGA e) { - assertEquals("exception message,exception description,666,c d", e.toString()); + assertEquals("666,exception message,exception description,c d", e.toString()); } } @@ -185,7 +185,7 @@ endpoint.throwExceptionMA(); fail("Expected exception not thrown"); } catch (AdaptedExceptionMA e) { - assertEquals("exception message,exception description,666,c d", e.toString()); + assertEquals("666,exception message,exception description,c d", e.toString()); } } @@ -195,7 +195,7 @@ endpoint.throwExtendedExceptionMA(); fail("Expected exception not thrown"); } catch (ExtendedAdaptedExceptionMA e) { - assertEquals("exception message,exception description,666,c d", e.toString()); + assertEquals("666,exception message,exception description,c d", e.toString()); } } }