diff options
author | Sven Gothel <[email protected]> | 2013-06-19 05:29:59 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2013-06-19 05:29:59 +0200 |
commit | 6c30050195849cd385422fc6e65230c16b818215 (patch) | |
tree | 7d75c1c8b3f54af2d21cc695be4378ea2697dd43 /src/junit/com | |
parent | 4d35974c6b87692bc1c3f6e6b7bb674a7a478053 (diff) |
Fix URLCompositionTest for Bug 757 (3): If file, replace '/' in expected result w/ OS specific File.separatorChar
Take 3 (duh!): JRE impl. varies .. i.e. plain URL w/o JAR path differs from URL w/ JAR scheme on Windows .. well.
Diffstat (limited to 'src/junit/com')
-rw-r--r-- | src/junit/com/jogamp/common/net/URLCompositionTest.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/junit/com/jogamp/common/net/URLCompositionTest.java b/src/junit/com/jogamp/common/net/URLCompositionTest.java index 9380d79..5d19c1d 100644 --- a/src/junit/com/jogamp/common/net/URLCompositionTest.java +++ b/src/junit/com/jogamp/common/net/URLCompositionTest.java @@ -130,8 +130,10 @@ public class URLCompositionTest extends JunitTracer { } else { expectedOS = expected; } - System.err.println("expected: "+expected+", "+expectedOS); - Assert.assertEquals(expectedOS, actual); + System.err.println("expected: orig "+expected+", OS "+expectedOS); + final boolean equalsA = expected.equals(actual); + final boolean equalsB = expectedOS.equals(actual); + Assert.assertTrue("No match, neither expected orig or OS w/ url", equalsA || equalsB); System.err.println("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"); } |