You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2016/11/23 16:44:39 UTC
[3/6] cxf git commit: Fix random test failure (methods can return in
any order)
Fix random test failure (methods can return in any order)
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b72bf00a
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b72bf00a
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b72bf00a
Branch: refs/heads/3.1.x-fixes
Commit: b72bf00a4686d14d3727840593b25ce0578948e8
Parents: 55f92f4
Author: Daniel Kulp <dk...@apache.org>
Authored: Wed Nov 23 09:10:04 2016 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Wed Nov 23 10:52:09 2016 -0500
----------------------------------------------------------------------
.../org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainerTest.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/b72bf00a/tools/wadlto/jaxrs/src/test/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainerTest.java
----------------------------------------------------------------------
diff --git a/tools/wadlto/jaxrs/src/test/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainerTest.java b/tools/wadlto/jaxrs/src/test/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainerTest.java
index 37e1130..2e7581f 100644
--- a/tools/wadlto/jaxrs/src/test/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainerTest.java
+++ b/tools/wadlto/jaxrs/src/test/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainerTest.java
@@ -435,6 +435,11 @@ public class JAXRSContainerTest extends ProcessorTestBase {
Method[] test1Methods = test1.getDeclaredMethods();
assertEquals(2, test1Methods.length);
assertEquals(2, test1Methods[0].getAnnotations().length);
+ if ("getGetaddmethod2".equals(test1Methods[0].getName())) {
+ Method tmp = test1Methods[0];
+ test1Methods[0] = test1Methods[1];
+ test1Methods[1] = tmp;
+ }
checkComplexPathMethod(test1Methods[0], "");
checkComplexPathMethod(test1Methods[1], "2");
} catch (Exception e) {