From 1182c54b720188996da8cc9042a328acaeb2e3d2 Mon Sep 17 00:00:00 2001 From: Tim Donohue Date: Wed, 23 Oct 2013 14:55:15 -0500 Subject: [PATCH] More improvements to fail() messages (add primary error msg) --- .../src/test/java/org/dspace/content/CommunityTest.java | 4 ++-- .../test/java/org/dspace/content/ItemComparatorTest.java | 4 ++-- .../src/test/java/org/dspace/content/ItemIteratorTest.java | 4 ++-- dspace-api/src/test/java/org/dspace/content/ItemTest.java | 4 ++-- .../src/test/java/org/dspace/content/MetadataFieldTest.java | 4 ++-- .../test/java/org/dspace/content/MetadataSchemaTest.java | 2 +- .../src/test/java/org/dspace/content/MetadataValueTest.java | 4 ++-- dspace-api/src/test/java/org/dspace/content/SiteTest.java | 2 +- .../test/java/org/dspace/content/SupervisedItemTest.java | 4 ++-- .../src/test/java/org/dspace/content/ThumbnailTest.java | 4 ++-- .../src/test/java/org/dspace/content/VersioningTest.java | 6 +++--- .../src/test/java/org/dspace/content/WorkspaceItemTest.java | 2 +- 12 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dspace-api/src/test/java/org/dspace/content/CommunityTest.java b/dspace-api/src/test/java/org/dspace/content/CommunityTest.java index 8a219151b4..46ebfd0b65 100644 --- a/dspace-api/src/test/java/org/dspace/content/CommunityTest.java +++ b/dspace-api/src/test/java/org/dspace/content/CommunityTest.java @@ -63,12 +63,12 @@ public class CommunityTest extends AbstractDSpaceObjectTest catch (AuthorizeException ex) { log.error("Authorization Error in init", ex); - fail("Authorization Error in init:" + ex.getMessage()); + fail("Authorization Error in init: " + ex.getMessage()); } catch (SQLException ex) { log.error("SQL Error in init", ex); - fail("SQL Error in init:" + ex.getMessage()); + fail("SQL Error in init: " + ex.getMessage()); } } diff --git a/dspace-api/src/test/java/org/dspace/content/ItemComparatorTest.java b/dspace-api/src/test/java/org/dspace/content/ItemComparatorTest.java index 06f5a047d7..b01337ca19 100644 --- a/dspace-api/src/test/java/org/dspace/content/ItemComparatorTest.java +++ b/dspace-api/src/test/java/org/dspace/content/ItemComparatorTest.java @@ -59,12 +59,12 @@ public class ItemComparatorTest extends AbstractUnitTest catch (AuthorizeException ex) { log.error("Authorization Error in init", ex); - fail("Authorization Error in init"); + fail("Authorization Error in init: " + ex.getMessage()); } catch (SQLException ex) { log.error("SQL Error in init", ex); - fail("SQL Error in init"); + fail("SQL Error in init:" + ex.getMessage()); } } diff --git a/dspace-api/src/test/java/org/dspace/content/ItemIteratorTest.java b/dspace-api/src/test/java/org/dspace/content/ItemIteratorTest.java index 321f79429c..9da988a8da 100644 --- a/dspace-api/src/test/java/org/dspace/content/ItemIteratorTest.java +++ b/dspace-api/src/test/java/org/dspace/content/ItemIteratorTest.java @@ -83,12 +83,12 @@ public class ItemIteratorTest extends AbstractUnitTest catch (AuthorizeException ex) { log.error("Authorization Error in init", ex); - fail("Authorization Error in init"); + fail("Authorization Error in init: " + ex.getMessage()); } catch (SQLException ex) { log.error("SQL Error in init", ex); - fail("SQL Error in init"); + fail("SQL Error in init: " + ex.getMessage()); } } diff --git a/dspace-api/src/test/java/org/dspace/content/ItemTest.java b/dspace-api/src/test/java/org/dspace/content/ItemTest.java index 0190f8e878..100c6510e7 100644 --- a/dspace-api/src/test/java/org/dspace/content/ItemTest.java +++ b/dspace-api/src/test/java/org/dspace/content/ItemTest.java @@ -76,12 +76,12 @@ public class ItemTest extends AbstractDSpaceObjectTest catch (AuthorizeException ex) { log.error("Authorization Error in init", ex); - fail("Authorization Error in init:" + ex.getMessage()); + fail("Authorization Error in init: " + ex.getMessage()); } catch (SQLException ex) { log.error("SQL Error in init", ex); - fail("SQL Error in init:" + ex.getMessage()); + fail("SQL Error in init: " + ex.getMessage()); } } diff --git a/dspace-api/src/test/java/org/dspace/content/MetadataFieldTest.java b/dspace-api/src/test/java/org/dspace/content/MetadataFieldTest.java index c16a96ce3f..99490e863d 100644 --- a/dspace-api/src/test/java/org/dspace/content/MetadataFieldTest.java +++ b/dspace-api/src/test/java/org/dspace/content/MetadataFieldTest.java @@ -70,12 +70,12 @@ public class MetadataFieldTest extends AbstractUnitTest catch (AuthorizeException ex) { log.error("Authorize Error in init", ex); - fail("Authorize Error in init"); + fail("Authorize Error in init: " + ex.getMessage()); } catch (SQLException ex) { log.error("SQL Error in init", ex); - fail("SQL Error in init"); + fail("SQL Error in init: " + ex.getMessage()); } } diff --git a/dspace-api/src/test/java/org/dspace/content/MetadataSchemaTest.java b/dspace-api/src/test/java/org/dspace/content/MetadataSchemaTest.java index 4b8d4caadd..5f9a82b409 100644 --- a/dspace-api/src/test/java/org/dspace/content/MetadataSchemaTest.java +++ b/dspace-api/src/test/java/org/dspace/content/MetadataSchemaTest.java @@ -51,7 +51,7 @@ public class MetadataSchemaTest extends AbstractUnitTest catch (SQLException ex) { log.error("SQL Error in init", ex); - fail("SQL Error in init"); + fail("SQL Error in init: " + ex.getMessage()); } } diff --git a/dspace-api/src/test/java/org/dspace/content/MetadataValueTest.java b/dspace-api/src/test/java/org/dspace/content/MetadataValueTest.java index f880037130..6c3e7aad02 100644 --- a/dspace-api/src/test/java/org/dspace/content/MetadataValueTest.java +++ b/dspace-api/src/test/java/org/dspace/content/MetadataValueTest.java @@ -73,12 +73,12 @@ public class MetadataValueTest extends AbstractUnitTest catch (AuthorizeException ex) { log.error("Authorize Error in init", ex); - fail("Authorize Error in init"); + fail("Authorize Error in init: " + ex.getMessage()); } catch (SQLException ex) { log.error("SQL Error in init", ex); - fail("SQL Error in init"); + fail("SQL Error in init: " + ex.getMessage()); } } diff --git a/dspace-api/src/test/java/org/dspace/content/SiteTest.java b/dspace-api/src/test/java/org/dspace/content/SiteTest.java index 5d83f7d57c..4bcfa8b45d 100644 --- a/dspace-api/src/test/java/org/dspace/content/SiteTest.java +++ b/dspace-api/src/test/java/org/dspace/content/SiteTest.java @@ -56,7 +56,7 @@ public class SiteTest extends AbstractUnitTest catch (SQLException ex) { log.error("SQL Error in init", ex); - fail("SQL Error in init"); + fail("SQL Error in init: " + ex.getMessage()); } } diff --git a/dspace-api/src/test/java/org/dspace/content/SupervisedItemTest.java b/dspace-api/src/test/java/org/dspace/content/SupervisedItemTest.java index 7e6b40cc09..b4a2ae812d 100644 --- a/dspace-api/src/test/java/org/dspace/content/SupervisedItemTest.java +++ b/dspace-api/src/test/java/org/dspace/content/SupervisedItemTest.java @@ -84,12 +84,12 @@ public class SupervisedItemTest extends AbstractUnitTest } catch (IOException ex) { log.error("IO Error in init", ex); - fail("IO Error in init"); + fail("IO Error in init: " + ex.getMessage()); } catch (AuthorizeException ex) { log.error("Authorization Error in init", ex); - fail("Authorization Error in init"); + fail("Authorization Error in init: " + ex.getMessage()); } catch (SQLException ex) { diff --git a/dspace-api/src/test/java/org/dspace/content/ThumbnailTest.java b/dspace-api/src/test/java/org/dspace/content/ThumbnailTest.java index ca3f7d6eda..1bab555811 100644 --- a/dspace-api/src/test/java/org/dspace/content/ThumbnailTest.java +++ b/dspace-api/src/test/java/org/dspace/content/ThumbnailTest.java @@ -66,12 +66,12 @@ public class ThumbnailTest extends AbstractUnitTest } catch (IOException ex) { log.error("IO Error in init", ex); - fail("SQL Error in init"); + fail("SQL Error in init: " + ex.getMessage()); } catch (SQLException ex) { log.error("SQL Error in init", ex); - fail("SQL Error in init"); + fail("SQL Error in init: " + ex.getMessage()); } } diff --git a/dspace-api/src/test/java/org/dspace/content/VersioningTest.java b/dspace-api/src/test/java/org/dspace/content/VersioningTest.java index 45c4cd1bb6..7b1f2ba9d8 100644 --- a/dspace-api/src/test/java/org/dspace/content/VersioningTest.java +++ b/dspace-api/src/test/java/org/dspace/content/VersioningTest.java @@ -75,15 +75,15 @@ public class VersioningTest extends AbstractUnitTest { catch (AuthorizeException ex) { log.error("Authorization Error in init", ex); - fail("Authorization Error in init"); + fail("Authorization Error in init: " + ex.getMessage()); } catch (SQLException ex) { log.error("SQL Error in init", ex); - fail("SQL Error in init"); + fail("SQL Error in init: " + ex.getMessage()); } catch (IOException ex) { log.error("IO Error in init", ex); - fail("IO Error in init"); + fail("IO Error in init: " + ex.getMessage()); } } diff --git a/dspace-api/src/test/java/org/dspace/content/WorkspaceItemTest.java b/dspace-api/src/test/java/org/dspace/content/WorkspaceItemTest.java index 1f1a60c938..d46f267f55 100644 --- a/dspace-api/src/test/java/org/dspace/content/WorkspaceItemTest.java +++ b/dspace-api/src/test/java/org/dspace/content/WorkspaceItemTest.java @@ -70,7 +70,7 @@ public class WorkspaceItemTest extends AbstractUnitTest catch (SQLException ex) { log.error("SQL Error in init", ex); - fail("SQL Error in init:" + ex.getMessage()); + fail("SQL Error in init: " + ex.getMessage()); } }