Repository: oozie Updated Branches: refs/heads/master ef3e88cb4 -> 91e70237e
amendment to OOZIE-2171 Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/91e70237 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/91e70237 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/91e70237 Branch: refs/heads/master Commit: 91e70237eda18a89ea618bacff22079f079ec5d9 Parents: ef3e88c Author: Robert Kanter <[email protected]> Authored: Tue Mar 17 14:40:29 2015 -0700 Committer: Robert Kanter <[email protected]> Committed: Tue Mar 17 14:40:29 2015 -0700 ---------------------------------------------------------------------- .../oozie/service/TestHadoopAccessorService.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/91e70237/core/src/test/java/org/apache/oozie/service/TestHadoopAccessorService.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/service/TestHadoopAccessorService.java b/core/src/test/java/org/apache/oozie/service/TestHadoopAccessorService.java index bf3dbd9..aa65065 100644 --- a/core/src/test/java/org/apache/oozie/service/TestHadoopAccessorService.java +++ b/core/src/test/java/org/apache/oozie/service/TestHadoopAccessorService.java @@ -195,8 +195,11 @@ public class TestHadoopAccessorService extends XTestCase { fail("Should have gotten an exception"); } catch (HadoopAccessorException hae) { assertEquals(ErrorCode.E0900, hae.getErrorCode()); - assertEquals("E0900: JobTracker [blah] not allowed, not in Oozie's whitelist. Allowed values are: [foo, bar]", - hae.getMessage()); + // We have to check for either of these because Java 7 and 8 have a different order + String s1 = "E0900: JobTracker [blah] not allowed, not in Oozie's whitelist. Allowed values are: [foo, bar]"; + String s2 = "E0900: JobTracker [blah] not allowed, not in Oozie's whitelist. Allowed values are: [bar, foo]"; + assertTrue("expected:<" + s1 + "> or <" + s2 + "> but was:<" + hae.getMessage() + ">", + s1.equals(hae.getMessage()) || s2.equals(hae.getMessage())); } has.destroy(); } @@ -218,8 +221,11 @@ public class TestHadoopAccessorService extends XTestCase { fail("Should have gotten an exception"); } catch (HadoopAccessorException hae) { assertEquals(ErrorCode.E0901, hae.getErrorCode()); - assertEquals("E0901: NameNode [blah] not allowed, not in Oozie's whitelist. Allowed values are: [foo, bar]", - hae.getMessage()); + // We have to check for either of these because Java 7 and 8 have a different order + String s1 = "E0901: NameNode [blah] not allowed, not in Oozie's whitelist. Allowed values are: [foo, bar]"; + String s2 = "E0901: NameNode [blah] not allowed, not in Oozie's whitelist. Allowed values are: [bar, foo]"; + assertTrue("expected:<" + s1 + "> or <" + s2 + "> but was:<" + hae.getMessage() + ">", + s1.equals(hae.getMessage()) || s2.equals(hae.getMessage())); } has.destroy(); }
