This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-validator.git
The following commit(s) were added to refs/heads/master by this push: new f4560d7c Clean up and simplify exception handling f4560d7c is described below commit f4560d7c1cb188e1488fdf43132c92fe6cfa50c0 Author: Gary Gregory <garydgreg...@gmail.com> AuthorDate: Tue May 16 15:25:22 2023 -0400 Clean up and simplify exception handling Toward JUnit 5, eventually --- .../routines/AbstractCalendarValidatorTest.java | 13 +------------ .../validator/routines/AbstractNumberValidatorTest.java | 9 ++------- .../validator/routines/BigDecimalValidatorTest.java | 2 +- .../validator/routines/BigIntegerValidatorTest.java | 2 +- .../commons/validator/routines/ByteValidatorTest.java | 2 +- .../validator/routines/CalendarValidatorTest.java | 5 ++--- .../commons/validator/routines/CodeValidatorTest.java | 16 ---------------- .../validator/routines/CurrencyValidatorTest.java | 12 +----------- .../commons/validator/routines/DateValidatorTest.java | 4 +--- .../commons/validator/routines/DoubleValidatorTest.java | 2 +- .../commons/validator/routines/FloatValidatorTest.java | 2 +- .../commons/validator/routines/IntegerValidatorTest.java | 2 +- .../commons/validator/routines/LongValidatorTest.java | 2 +- .../commons/validator/routines/PercentValidatorTest.java | 7 ++----- .../commons/validator/routines/RegexValidatorTest.java | 16 ---------------- .../commons/validator/routines/ShortValidatorTest.java | 2 +- .../commons/validator/routines/TimeValidatorTest.java | 7 ++----- .../routines/checkdigit/ABANumberCheckDigitTest.java | 3 +-- .../routines/checkdigit/AbstractCheckDigitTest.java | 3 +-- .../routines/checkdigit/CUSIPCheckDigitTest.java | 3 +-- .../routines/checkdigit/EAN13CheckDigitTest.java | 3 +-- .../routines/checkdigit/IBANCheckDigitTest.java | 3 +-- .../routines/checkdigit/ISBN10CheckDigitTest.java | 3 +-- .../routines/checkdigit/ISBNCheckDigitTest.java | 3 +-- .../routines/checkdigit/ISINCheckDigitTest.java | 3 +-- .../routines/checkdigit/ISSNCheckDigitTest.java | 3 +-- .../routines/checkdigit/LuhnCheckDigitTest.java | 3 +-- .../routines/checkdigit/ModulusTenABACheckDigitTest.java | 3 +-- .../checkdigit/ModulusTenCUSIPCheckDigitTest.java | 3 +-- .../checkdigit/ModulusTenEAN13CheckDigitTest.java | 3 +-- .../checkdigit/ModulusTenLuhnCheckDigitTest.java | 4 +--- .../checkdigit/ModulusTenSedolCheckDigitTest.java | 3 +-- .../routines/checkdigit/SedolCheckDigitTest.java | 3 +-- .../routines/checkdigit/VerhoeffCheckDigitTest.java | 3 +-- 34 files changed, 36 insertions(+), 121 deletions(-) diff --git a/src/test/java/org/apache/commons/validator/routines/AbstractCalendarValidatorTest.java b/src/test/java/org/apache/commons/validator/routines/AbstractCalendarValidatorTest.java index 606f5dd6..bb1fbf76 100644 --- a/src/test/java/org/apache/commons/validator/routines/AbstractCalendarValidatorTest.java +++ b/src/test/java/org/apache/commons/validator/routines/AbstractCalendarValidatorTest.java @@ -100,22 +100,11 @@ public abstract class AbstractCalendarValidatorTest extends TestCase { super(name); } - /** - * Set Up. - * @throws Exception - */ - @Override - protected void setUp() throws Exception { - super.setUp(); - } - /** * Tear down - * @throws Exception */ @Override - protected void tearDown() throws Exception { - super.tearDown(); + protected void tearDown() { validator = null; } diff --git a/src/test/java/org/apache/commons/validator/routines/AbstractNumberValidatorTest.java b/src/test/java/org/apache/commons/validator/routines/AbstractNumberValidatorTest.java index a484eb9e..d6c5cd44 100644 --- a/src/test/java/org/apache/commons/validator/routines/AbstractNumberValidatorTest.java +++ b/src/test/java/org/apache/commons/validator/routines/AbstractNumberValidatorTest.java @@ -65,20 +65,15 @@ public abstract class AbstractNumberValidatorTest extends TestCase { } @Override - protected void setUp() throws Exception { - super.setUp(); - + protected void setUp() { Locale.setDefault(Locale.US); - } /** * Tear down - * @throws Exception */ @Override - protected void tearDown() throws Exception { - super.tearDown(); + protected void tearDown() { validator = null; strictValidator = null; } diff --git a/src/test/java/org/apache/commons/validator/routines/BigDecimalValidatorTest.java b/src/test/java/org/apache/commons/validator/routines/BigDecimalValidatorTest.java index 941efefb..84bb6481 100644 --- a/src/test/java/org/apache/commons/validator/routines/BigDecimalValidatorTest.java +++ b/src/test/java/org/apache/commons/validator/routines/BigDecimalValidatorTest.java @@ -33,7 +33,7 @@ public class BigDecimalValidatorTest extends AbstractNumberValidatorTest { } @Override - protected void setUp() throws Exception { + protected void setUp() { super.setUp(); validator = new BigDecimalValidator(false); diff --git a/src/test/java/org/apache/commons/validator/routines/BigIntegerValidatorTest.java b/src/test/java/org/apache/commons/validator/routines/BigIntegerValidatorTest.java index 1f5993d0..02744fc2 100644 --- a/src/test/java/org/apache/commons/validator/routines/BigIntegerValidatorTest.java +++ b/src/test/java/org/apache/commons/validator/routines/BigIntegerValidatorTest.java @@ -33,7 +33,7 @@ public class BigIntegerValidatorTest extends AbstractNumberValidatorTest { } @Override - protected void setUp() throws Exception { + protected void setUp() { super.setUp(); validator = new BigIntegerValidator(false, 0); diff --git a/src/test/java/org/apache/commons/validator/routines/ByteValidatorTest.java b/src/test/java/org/apache/commons/validator/routines/ByteValidatorTest.java index f3486845..d1bfe540 100644 --- a/src/test/java/org/apache/commons/validator/routines/ByteValidatorTest.java +++ b/src/test/java/org/apache/commons/validator/routines/ByteValidatorTest.java @@ -40,7 +40,7 @@ public class ByteValidatorTest extends AbstractNumberValidatorTest { } @Override - protected void setUp() throws Exception { + protected void setUp() { super.setUp(); validator = new ByteValidator(false, 0); diff --git a/src/test/java/org/apache/commons/validator/routines/CalendarValidatorTest.java b/src/test/java/org/apache/commons/validator/routines/CalendarValidatorTest.java index 0ec2ca31..3133af58 100644 --- a/src/test/java/org/apache/commons/validator/routines/CalendarValidatorTest.java +++ b/src/test/java/org/apache/commons/validator/routines/CalendarValidatorTest.java @@ -42,10 +42,9 @@ public class CalendarValidatorTest extends AbstractCalendarValidatorTest { } @Override - protected void setUp() throws Exception { - super.setUp(); + protected void setUp() { calValidator = new CalendarValidator(); - validator = calValidator; + validator = calValidator; } /** diff --git a/src/test/java/org/apache/commons/validator/routines/CodeValidatorTest.java b/src/test/java/org/apache/commons/validator/routines/CodeValidatorTest.java index 995453d2..e0cbae46 100644 --- a/src/test/java/org/apache/commons/validator/routines/CodeValidatorTest.java +++ b/src/test/java/org/apache/commons/validator/routines/CodeValidatorTest.java @@ -36,22 +36,6 @@ public class CodeValidatorTest extends TestCase { super(name); } - /** - * @see junit.framework.TestCase#setUp() - */ - @Override - protected void setUp() throws Exception { - super.setUp(); - } - - /** - * @see junit.framework.TestCase#tearDown() - */ - @Override - protected void tearDown() throws Exception { - super.tearDown(); - } - /** * Test Check Digit. */ diff --git a/src/test/java/org/apache/commons/validator/routines/CurrencyValidatorTest.java b/src/test/java/org/apache/commons/validator/routines/CurrencyValidatorTest.java index 8fc1ab24..7f86abce 100644 --- a/src/test/java/org/apache/commons/validator/routines/CurrencyValidatorTest.java +++ b/src/test/java/org/apache/commons/validator/routines/CurrencyValidatorTest.java @@ -41,21 +41,11 @@ public class CurrencyValidatorTest extends TestCase { } @Override - protected void setUp() throws Exception { - super.setUp(); + protected void setUp() { US_DOLLAR = (new DecimalFormatSymbols(Locale.US)).getCurrencySymbol(); UK_POUND = (new DecimalFormatSymbols(Locale.UK)).getCurrencySymbol(); } - /** - * Tear down - * @throws Exception - */ - @Override - protected void tearDown() throws Exception { - super.tearDown(); - } - /** * Test Format Type */ diff --git a/src/test/java/org/apache/commons/validator/routines/DateValidatorTest.java b/src/test/java/org/apache/commons/validator/routines/DateValidatorTest.java index 72932597..740cd072 100644 --- a/src/test/java/org/apache/commons/validator/routines/DateValidatorTest.java +++ b/src/test/java/org/apache/commons/validator/routines/DateValidatorTest.java @@ -38,11 +38,9 @@ public class DateValidatorTest extends AbstractCalendarValidatorTest { /** * Set Up. - * @throws Exception */ @Override - protected void setUp() throws Exception { - super.setUp(); + protected void setUp() { dateValidator = new DateValidator(); validator = dateValidator; } diff --git a/src/test/java/org/apache/commons/validator/routines/DoubleValidatorTest.java b/src/test/java/org/apache/commons/validator/routines/DoubleValidatorTest.java index cd935535..2bbc2f18 100644 --- a/src/test/java/org/apache/commons/validator/routines/DoubleValidatorTest.java +++ b/src/test/java/org/apache/commons/validator/routines/DoubleValidatorTest.java @@ -32,7 +32,7 @@ public class DoubleValidatorTest extends AbstractNumberValidatorTest { } @Override - protected void setUp() throws Exception { + protected void setUp() { super.setUp(); validator = new DoubleValidator(false, 0); diff --git a/src/test/java/org/apache/commons/validator/routines/FloatValidatorTest.java b/src/test/java/org/apache/commons/validator/routines/FloatValidatorTest.java index 8c138991..6332e18a 100644 --- a/src/test/java/org/apache/commons/validator/routines/FloatValidatorTest.java +++ b/src/test/java/org/apache/commons/validator/routines/FloatValidatorTest.java @@ -33,7 +33,7 @@ public class FloatValidatorTest extends AbstractNumberValidatorTest { } @Override - protected void setUp() throws Exception { + protected void setUp() { super.setUp(); validator = new FloatValidator(false, 0); diff --git a/src/test/java/org/apache/commons/validator/routines/IntegerValidatorTest.java b/src/test/java/org/apache/commons/validator/routines/IntegerValidatorTest.java index 7fed0d6d..0d646d05 100644 --- a/src/test/java/org/apache/commons/validator/routines/IntegerValidatorTest.java +++ b/src/test/java/org/apache/commons/validator/routines/IntegerValidatorTest.java @@ -41,7 +41,7 @@ public class IntegerValidatorTest extends AbstractNumberValidatorTest { } @Override - protected void setUp() throws Exception { + protected void setUp() { super.setUp(); validator = new IntegerValidator(false, 0); diff --git a/src/test/java/org/apache/commons/validator/routines/LongValidatorTest.java b/src/test/java/org/apache/commons/validator/routines/LongValidatorTest.java index 1879400a..a3651d4b 100644 --- a/src/test/java/org/apache/commons/validator/routines/LongValidatorTest.java +++ b/src/test/java/org/apache/commons/validator/routines/LongValidatorTest.java @@ -42,7 +42,7 @@ public class LongValidatorTest extends AbstractNumberValidatorTest { } @Override - protected void setUp() throws Exception { + protected void setUp() { super.setUp(); validator = new LongValidator(false, 0); diff --git a/src/test/java/org/apache/commons/validator/routines/PercentValidatorTest.java b/src/test/java/org/apache/commons/validator/routines/PercentValidatorTest.java index 01239c21..40340218 100644 --- a/src/test/java/org/apache/commons/validator/routines/PercentValidatorTest.java +++ b/src/test/java/org/apache/commons/validator/routines/PercentValidatorTest.java @@ -36,18 +36,15 @@ public class PercentValidatorTest extends TestCase { } @Override - protected void setUp() throws Exception { - super.setUp(); + protected void setUp() { validator = new PercentValidator(); } /** * Tear down - * @throws Exception */ @Override - protected void tearDown() throws Exception { - super.tearDown(); + protected void tearDown() { validator = null; } diff --git a/src/test/java/org/apache/commons/validator/routines/RegexValidatorTest.java b/src/test/java/org/apache/commons/validator/routines/RegexValidatorTest.java index 85c398fc..c9e917c4 100644 --- a/src/test/java/org/apache/commons/validator/routines/RegexValidatorTest.java +++ b/src/test/java/org/apache/commons/validator/routines/RegexValidatorTest.java @@ -76,22 +76,6 @@ public class RegexValidatorTest extends TestCase { } } - /** - * Set Up. - */ - @Override - protected void setUp() throws Exception { - super.setUp(); - } - - /** - * Tear Down. - */ - @Override - protected void tearDown() throws Exception { - super.tearDown(); - } - /** * Test exceptions */ diff --git a/src/test/java/org/apache/commons/validator/routines/ShortValidatorTest.java b/src/test/java/org/apache/commons/validator/routines/ShortValidatorTest.java index a7327a00..ee9dde73 100644 --- a/src/test/java/org/apache/commons/validator/routines/ShortValidatorTest.java +++ b/src/test/java/org/apache/commons/validator/routines/ShortValidatorTest.java @@ -32,7 +32,7 @@ public class ShortValidatorTest extends AbstractNumberValidatorTest { } @Override - protected void setUp() throws Exception { + protected void setUp() { super.setUp(); validator = new ShortValidator(false, 0); diff --git a/src/test/java/org/apache/commons/validator/routines/TimeValidatorTest.java b/src/test/java/org/apache/commons/validator/routines/TimeValidatorTest.java index d58c950e..60d4b25a 100644 --- a/src/test/java/org/apache/commons/validator/routines/TimeValidatorTest.java +++ b/src/test/java/org/apache/commons/validator/routines/TimeValidatorTest.java @@ -104,8 +104,7 @@ public class TimeValidatorTest extends TestCase { } @Override - protected void setUp() throws Exception { - super.setUp(); + protected void setUp() { validator = new TimeValidator(); defaultZone = TimeZone.getDefault(); origDefault = Locale.getDefault(); @@ -113,11 +112,9 @@ public class TimeValidatorTest extends TestCase { /** * Tear down - * @throws Exception */ @Override - protected void tearDown() throws Exception { - super.tearDown(); + protected void tearDown() { validator = null; Locale.setDefault(origDefault); TimeZone.setDefault(defaultZone); diff --git a/src/test/java/org/apache/commons/validator/routines/checkdigit/ABANumberCheckDigitTest.java b/src/test/java/org/apache/commons/validator/routines/checkdigit/ABANumberCheckDigitTest.java index e76c29fe..49f784ac 100644 --- a/src/test/java/org/apache/commons/validator/routines/checkdigit/ABANumberCheckDigitTest.java +++ b/src/test/java/org/apache/commons/validator/routines/checkdigit/ABANumberCheckDigitTest.java @@ -36,8 +36,7 @@ public class ABANumberCheckDigitTest extends AbstractCheckDigitTest { * Set up routine & valid codes. */ @Override - protected void setUp() throws Exception { - super.setUp(); + protected void setUp() { routine = ABANumberCheckDigit.ABAN_CHECK_DIGIT; valid = new String[] { "123456780", diff --git a/src/test/java/org/apache/commons/validator/routines/checkdigit/AbstractCheckDigitTest.java b/src/test/java/org/apache/commons/validator/routines/checkdigit/AbstractCheckDigitTest.java index 060cc770..f38411f4 100644 --- a/src/test/java/org/apache/commons/validator/routines/checkdigit/AbstractCheckDigitTest.java +++ b/src/test/java/org/apache/commons/validator/routines/checkdigit/AbstractCheckDigitTest.java @@ -94,8 +94,7 @@ public abstract class AbstractCheckDigitTest extends TestCase { * Tear Down - clears routine and valid codes. */ @Override - protected void tearDown() throws Exception { - super.tearDown(); + protected void tearDown() { valid = null; routine = null; } diff --git a/src/test/java/org/apache/commons/validator/routines/checkdigit/CUSIPCheckDigitTest.java b/src/test/java/org/apache/commons/validator/routines/checkdigit/CUSIPCheckDigitTest.java index 18753e16..e224bc76 100644 --- a/src/test/java/org/apache/commons/validator/routines/checkdigit/CUSIPCheckDigitTest.java +++ b/src/test/java/org/apache/commons/validator/routines/checkdigit/CUSIPCheckDigitTest.java @@ -36,8 +36,7 @@ public class CUSIPCheckDigitTest extends AbstractCheckDigitTest { * Set up routine & valid codes. */ @Override - protected void setUp() throws Exception { - super.setUp(); + protected void setUp() { routine = CUSIPCheckDigit.CUSIP_CHECK_DIGIT; valid = new String[] {"037833100", "931142103", diff --git a/src/test/java/org/apache/commons/validator/routines/checkdigit/EAN13CheckDigitTest.java b/src/test/java/org/apache/commons/validator/routines/checkdigit/EAN13CheckDigitTest.java index 47e02fa7..1c980914 100644 --- a/src/test/java/org/apache/commons/validator/routines/checkdigit/EAN13CheckDigitTest.java +++ b/src/test/java/org/apache/commons/validator/routines/checkdigit/EAN13CheckDigitTest.java @@ -36,8 +36,7 @@ public class EAN13CheckDigitTest extends AbstractCheckDigitTest { * Set up routine & valid codes. */ @Override - protected void setUp() throws Exception { - super.setUp(); + protected void setUp() { routine = EAN13CheckDigit.EAN13_CHECK_DIGIT; valid = new String[] { "9780072129519", diff --git a/src/test/java/org/apache/commons/validator/routines/checkdigit/IBANCheckDigitTest.java b/src/test/java/org/apache/commons/validator/routines/checkdigit/IBANCheckDigitTest.java index d96c8ee8..861a73fb 100644 --- a/src/test/java/org/apache/commons/validator/routines/checkdigit/IBANCheckDigitTest.java +++ b/src/test/java/org/apache/commons/validator/routines/checkdigit/IBANCheckDigitTest.java @@ -44,8 +44,7 @@ public class IBANCheckDigitTest extends AbstractCheckDigitTest { * Set up routine & valid codes. */ @Override - protected void setUp() throws Exception { - super.setUp(); + protected void setUp() { routine = IBANCheckDigit.IBAN_CHECK_DIGIT; valid = new String[] { "AD1200012030200359100100", // Andorra diff --git a/src/test/java/org/apache/commons/validator/routines/checkdigit/ISBN10CheckDigitTest.java b/src/test/java/org/apache/commons/validator/routines/checkdigit/ISBN10CheckDigitTest.java index 9c71f801..d1ee7e5b 100644 --- a/src/test/java/org/apache/commons/validator/routines/checkdigit/ISBN10CheckDigitTest.java +++ b/src/test/java/org/apache/commons/validator/routines/checkdigit/ISBN10CheckDigitTest.java @@ -36,8 +36,7 @@ public class ISBN10CheckDigitTest extends AbstractCheckDigitTest { * Set up routine & valid codes. */ @Override - protected void setUp() throws Exception { - super.setUp(); + protected void setUp() { routine = ISBN10CheckDigit.ISBN10_CHECK_DIGIT; valid = new String[] { "1930110995", diff --git a/src/test/java/org/apache/commons/validator/routines/checkdigit/ISBNCheckDigitTest.java b/src/test/java/org/apache/commons/validator/routines/checkdigit/ISBNCheckDigitTest.java index 6fe157bd..7b364c88 100644 --- a/src/test/java/org/apache/commons/validator/routines/checkdigit/ISBNCheckDigitTest.java +++ b/src/test/java/org/apache/commons/validator/routines/checkdigit/ISBNCheckDigitTest.java @@ -36,8 +36,7 @@ public class ISBNCheckDigitTest extends AbstractCheckDigitTest { * Set up routine & valid codes. */ @Override - protected void setUp() throws Exception { - super.setUp(); + protected void setUp() { routine = ISBNCheckDigit.ISBN_CHECK_DIGIT; valid = new String[] { "9780072129519", diff --git a/src/test/java/org/apache/commons/validator/routines/checkdigit/ISINCheckDigitTest.java b/src/test/java/org/apache/commons/validator/routines/checkdigit/ISINCheckDigitTest.java index a1139644..c9fc8a5c 100644 --- a/src/test/java/org/apache/commons/validator/routines/checkdigit/ISINCheckDigitTest.java +++ b/src/test/java/org/apache/commons/validator/routines/checkdigit/ISINCheckDigitTest.java @@ -36,8 +36,7 @@ public class ISINCheckDigitTest extends AbstractCheckDigitTest { * Set up routine & valid codes. */ @Override - protected void setUp() throws Exception { - super.setUp(); + protected void setUp() { routine = ISINCheckDigit.ISIN_CHECK_DIGIT; valid = new String[] {"US0378331005", "BMG8571G1096", diff --git a/src/test/java/org/apache/commons/validator/routines/checkdigit/ISSNCheckDigitTest.java b/src/test/java/org/apache/commons/validator/routines/checkdigit/ISSNCheckDigitTest.java index 74ff85da..ae98544a 100644 --- a/src/test/java/org/apache/commons/validator/routines/checkdigit/ISSNCheckDigitTest.java +++ b/src/test/java/org/apache/commons/validator/routines/checkdigit/ISSNCheckDigitTest.java @@ -36,8 +36,7 @@ public class ISSNCheckDigitTest extends AbstractCheckDigitTest { * Set up routine & valid codes. */ @Override - protected void setUp() throws Exception { - super.setUp(); + protected void setUp() { routine = ISSNCheckDigit.ISSN_CHECK_DIGIT; valid = new String[] { "03178471", diff --git a/src/test/java/org/apache/commons/validator/routines/checkdigit/LuhnCheckDigitTest.java b/src/test/java/org/apache/commons/validator/routines/checkdigit/LuhnCheckDigitTest.java index a6f24cf4..0e2427db 100644 --- a/src/test/java/org/apache/commons/validator/routines/checkdigit/LuhnCheckDigitTest.java +++ b/src/test/java/org/apache/commons/validator/routines/checkdigit/LuhnCheckDigitTest.java @@ -43,8 +43,7 @@ public class LuhnCheckDigitTest extends AbstractCheckDigitTest { * Set up routine & valid codes. */ @Override - protected void setUp() throws Exception { - super.setUp(); + protected void setUp() { routine = LuhnCheckDigit.LUHN_CHECK_DIGIT; diff --git a/src/test/java/org/apache/commons/validator/routines/checkdigit/ModulusTenABACheckDigitTest.java b/src/test/java/org/apache/commons/validator/routines/checkdigit/ModulusTenABACheckDigitTest.java index 1496f729..aa0b085a 100644 --- a/src/test/java/org/apache/commons/validator/routines/checkdigit/ModulusTenABACheckDigitTest.java +++ b/src/test/java/org/apache/commons/validator/routines/checkdigit/ModulusTenABACheckDigitTest.java @@ -34,8 +34,7 @@ public class ModulusTenABACheckDigitTest extends AbstractCheckDigitTest { * Set up routine & valid codes. */ @Override - protected void setUp() throws Exception { - super.setUp(); + protected void setUp() { routine = new ModulusTenCheckDigit(new int[] { 1, 7, 3 }, true); valid = new String[] { "123456780", diff --git a/src/test/java/org/apache/commons/validator/routines/checkdigit/ModulusTenCUSIPCheckDigitTest.java b/src/test/java/org/apache/commons/validator/routines/checkdigit/ModulusTenCUSIPCheckDigitTest.java index 1344d140..8ec6d9ee 100644 --- a/src/test/java/org/apache/commons/validator/routines/checkdigit/ModulusTenCUSIPCheckDigitTest.java +++ b/src/test/java/org/apache/commons/validator/routines/checkdigit/ModulusTenCUSIPCheckDigitTest.java @@ -34,8 +34,7 @@ public class ModulusTenCUSIPCheckDigitTest extends AbstractCheckDigitTest { * Set up routine & valid codes. */ @Override - protected void setUp() throws Exception { - super.setUp(); + protected void setUp() { routine = new ModulusTenCheckDigit(new int[] { 1, 2}, true, true); valid = new String[] {"037833100", "931142103", diff --git a/src/test/java/org/apache/commons/validator/routines/checkdigit/ModulusTenEAN13CheckDigitTest.java b/src/test/java/org/apache/commons/validator/routines/checkdigit/ModulusTenEAN13CheckDigitTest.java index 50f4d6e5..be1745f8 100644 --- a/src/test/java/org/apache/commons/validator/routines/checkdigit/ModulusTenEAN13CheckDigitTest.java +++ b/src/test/java/org/apache/commons/validator/routines/checkdigit/ModulusTenEAN13CheckDigitTest.java @@ -34,8 +34,7 @@ public class ModulusTenEAN13CheckDigitTest extends AbstractCheckDigitTest { * Set up routine & valid codes. */ @Override - protected void setUp() throws Exception { - super.setUp(); + protected void setUp() { routine = new ModulusTenCheckDigit(new int[] { 1, 3 }, true); valid = new String[] { "9780072129519", diff --git a/src/test/java/org/apache/commons/validator/routines/checkdigit/ModulusTenLuhnCheckDigitTest.java b/src/test/java/org/apache/commons/validator/routines/checkdigit/ModulusTenLuhnCheckDigitTest.java index f21bbfe6..b012f877 100644 --- a/src/test/java/org/apache/commons/validator/routines/checkdigit/ModulusTenLuhnCheckDigitTest.java +++ b/src/test/java/org/apache/commons/validator/routines/checkdigit/ModulusTenLuhnCheckDigitTest.java @@ -41,9 +41,7 @@ public class ModulusTenLuhnCheckDigitTest extends AbstractCheckDigitTest { * Set up routine & valid codes. */ @Override - protected void setUp() throws Exception { - super.setUp(); - + protected void setUp() { routine = new ModulusTenCheckDigit(new int[] {1, 2}, true, true); valid = new String[] { diff --git a/src/test/java/org/apache/commons/validator/routines/checkdigit/ModulusTenSedolCheckDigitTest.java b/src/test/java/org/apache/commons/validator/routines/checkdigit/ModulusTenSedolCheckDigitTest.java index 4e4e2aed..a0a1f6f4 100644 --- a/src/test/java/org/apache/commons/validator/routines/checkdigit/ModulusTenSedolCheckDigitTest.java +++ b/src/test/java/org/apache/commons/validator/routines/checkdigit/ModulusTenSedolCheckDigitTest.java @@ -34,8 +34,7 @@ public class ModulusTenSedolCheckDigitTest extends AbstractCheckDigitTest { * Set up routine & valid codes. */ @Override - protected void setUp() throws Exception { - super.setUp(); + protected void setUp() { routine = new ModulusTenCheckDigit(new int[] { 1, 3, 1, 7, 3, 9, 1 }); valid = new String[] { "0263494", diff --git a/src/test/java/org/apache/commons/validator/routines/checkdigit/SedolCheckDigitTest.java b/src/test/java/org/apache/commons/validator/routines/checkdigit/SedolCheckDigitTest.java index 71b377fb..dafdb69e 100644 --- a/src/test/java/org/apache/commons/validator/routines/checkdigit/SedolCheckDigitTest.java +++ b/src/test/java/org/apache/commons/validator/routines/checkdigit/SedolCheckDigitTest.java @@ -36,8 +36,7 @@ public class SedolCheckDigitTest extends AbstractCheckDigitTest { * Set up routine & valid codes. */ @Override - protected void setUp() throws Exception { - super.setUp(); + protected void setUp() { routine = SedolCheckDigit.SEDOL_CHECK_DIGIT; valid = new String[] { "0263494", diff --git a/src/test/java/org/apache/commons/validator/routines/checkdigit/VerhoeffCheckDigitTest.java b/src/test/java/org/apache/commons/validator/routines/checkdigit/VerhoeffCheckDigitTest.java index ba4c9da2..e38e1983 100644 --- a/src/test/java/org/apache/commons/validator/routines/checkdigit/VerhoeffCheckDigitTest.java +++ b/src/test/java/org/apache/commons/validator/routines/checkdigit/VerhoeffCheckDigitTest.java @@ -35,8 +35,7 @@ public class VerhoeffCheckDigitTest extends AbstractCheckDigitTest { * Set up routine & valid codes. */ @Override - protected void setUp() throws Exception { - super.setUp(); + protected void setUp() { routine = VerhoeffCheckDigit.VERHOEFF_CHECK_DIGIT; valid = new String[] { "15",