From 7599a9b24df152246960649f5cb46868caf9de9b Mon Sep 17 00:00:00 2001 From: Erik Winlof Date: Wed, 3 Sep 2014 12:14:09 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud) 78432: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud) 76036: Fixed PutMethodTest: Just throw unexpected exceptions in the test so that they are fully reported git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82559 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/repo/webdav/PutMethodTest.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/source/test-java/org/alfresco/repo/webdav/PutMethodTest.java b/source/test-java/org/alfresco/repo/webdav/PutMethodTest.java index 3cd58f21ea..c5c4918d0c 100644 --- a/source/test-java/org/alfresco/repo/webdav/PutMethodTest.java +++ b/source/test-java/org/alfresco/repo/webdav/PutMethodTest.java @@ -428,7 +428,7 @@ public class PutMethodTest } catch (Exception e) { - fail("Failed to upload a file: " + (e.getCause() != null ? e.getCause().getMessage() : e.getMessage())); + throw new RuntimeException("Failed to upload a file", e); } // Split to transactions to check the commit @@ -448,7 +448,7 @@ public class PutMethodTest } catch (Exception e) { - fail("Failed to unlock a file: " + (e.getCause() != null ? e.getCause().getMessage() : e.getMessage())); + throw new RuntimeException("Failed to unlock a file", e); } // Split to transactions to check the commit @@ -492,7 +492,7 @@ public class PutMethodTest } catch (Exception e) { - fail("Failed to upload a file: " + (e.getCause() != null ? e.getCause().getMessage() : e.getMessage())); + throw new RuntimeException("Failed to upload a file", e); } try @@ -503,7 +503,7 @@ public class PutMethodTest } catch (Exception e) { - fail("Failed to lock a file: " + (e.getCause() != null ? e.getCause().getMessage() : e.getMessage())); + throw new RuntimeException("Failed to lock a file", e); } // Construct IF HEADER @@ -528,7 +528,7 @@ public class PutMethodTest } catch (Exception e) { - fail("Failed to upload a file: " + (e.getCause() != null ? e.getCause().getMessage() : e.getMessage())); + throw new RuntimeException("Failed to upload a file", e); } headers = new HashMap(); @@ -544,7 +544,7 @@ public class PutMethodTest } catch (Exception e) { - fail("Failed to unlock a file: " + (e.getCause() != null ? e.getCause().getMessage() : e.getMessage())); + throw new RuntimeException("Failed to unlock a file", e); } if (fileNoderef != null) @@ -572,7 +572,7 @@ public class PutMethodTest } catch (Exception e) { - fail("Failed to lock a file: " + (e.getCause() != null ? e.getCause().getMessage() : e.getMessage())); + throw new RuntimeException("Failed to lock a file", e); } txn.commit(); @@ -601,7 +601,7 @@ public class PutMethodTest } catch (Exception e) { - fail("Failed to upload a file: " + (e.getCause() != null ? e.getCause().getMessage() : e.getMessage())); + throw new RuntimeException("Failed to upload a file", e); } if (fileNoderef != null && nodeService.exists(fileNoderef))