approved tests

1 files changed, 259 insertions, 221 deletions

diff --git a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/DateUtilTestCase.java b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/DateUtilTestCase.java
index 706e7affd..6c9a17ddc 100644
--- a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/DateUtilTestCase.java
+++ b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/DateUtilTestCase.java
@@ -19,7 +19,6 @@ import java.util.Properties;
 import org.joda.time.DateTime;
 import org.junit.Assert;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import eu.stork.peps.auth.commons.DateUtil;
@@ -28,229 +27,268 @@ import eu.stork.peps.auth.commons.exceptions.SecurityPEPSException;
 
 /**
  * The PersonalAttribute's Test Case.
- * 
- * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com, paulo.ribeiro@multicert.com
+ *
+ * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com,
+ * luis.felix@multicert.com, hugo.magalhaes@multicert.com,
+ * paulo.ribeiro@multicert.com
  * @version $Revision: 1.2 $, $Date: 2010-11-17 05:17:03 $
  */
 public final class DateUtilTestCase {
 
-	/**
-	 * Stork Format date.
-	 */
-	private static final String FORMAT = "yyyyMMdd";
-
-	/**
-	 * Expected 10 value.
-	 */
-	private static final int TEN = 10;
-
-	/**
-	 * Expected 11 value.
-	 */
-	private static final int ELEVEN = 11;
-
-	/**
-	 * The testing Date ("current" date).
-	 */
-	private static final DateTime TESTDATE = new DateTime(2011, 10, 10, 15, 20, 0, 0);
-
-	/**
-	 * Init DateUtilTestCase class.
-	 */
-	@BeforeClass
-	public static void runsBeforeTheTestSuite() {
-		final Properties configs = new Properties();
-		configs.setProperty("invalidAgeDateValue.code", "35");
-		configs.setProperty("invalidAttributeValue.code", "34");
-		configs.setProperty("invalidAttributeValue.message", "Unexpected or invalid content was encountered within a " + "<saml:Attribute> or <saml:AttributeValue> element.");
-		PEPSUtil.createInstance(configs);
-	}
-
-	/**
-	 * Tests the {@link DateUtil#calculateAge} method for the given year against the testDate: 2011-10-10 15:20:00.0. Must return 10.
-	 */
-	@Test
-	public void calculateAgeFromYear() {
-		Assert.assertTrue(TEN == DateUtil.calculateAge("2000", TESTDATE, FORMAT));
-	}
-
-	/**
-	 * Tests the {@link DateUtil#calculateAge} method for the given year and month against the testDate: 2011-10-10 15:20:00.0. Must return 11.
-	 */
-	@Test
-	public void calculateAgeFromEarlyMonth() {
-		Assert.assertTrue(ELEVEN == DateUtil.calculateAge("200001", TESTDATE, FORMAT));
-	}
-
-	/**
-	 * Tests the {@link DateUtil#calculateAge} method for the given year and month against the testDate: 2011-10-10 15:20:00.0. Must return 10.
-	 */
-	@Test
-	public void calculateAgeFromSameMonth() {
-		Assert.assertTrue(TEN == DateUtil.calculateAge("200010", TESTDATE, FORMAT));
-	}
-
-	/**
-	 * Tests the {@link DateUtil#calculateAge} method for the given year and month against the testDate: 2011-10-10 15:20:00.0. Must return 10.
-	 */
-	@Test
-	public void calculateAgeFromLaterMonth() {
-		Assert.assertTrue(TEN == DateUtil.calculateAge("200011", TESTDATE, FORMAT));
-	}
-
-	/**
-	 * Tests the {@link DateUtil#calculateAge} method for the given full date against the testDate: 2011-10-10 15:20:00.0. Must return 11.
-	 */
-	@Test
-	public void calculateAgeFromEarlyFullDate() {
-		Assert.assertTrue(ELEVEN == DateUtil.calculateAge("20000101", TESTDATE, FORMAT));
-	}
-
-	/**
-	 * Tests the {@link DateUtil#calculateAge} method for the given full date against the testDate: 2011-10-10 15:20:00.0. Must return 11.
-	 */
-	@Test
-	public void calculateAgeFromSameDay() {
-		Assert.assertTrue(ELEVEN == DateUtil.calculateAge("20001010", TESTDATE, FORMAT));
-	}
-
-	/**
-	 * Tests the {@link DateUtil#calculateAge} method for the given full date against the testDate: 2011-10-10 15:20:00.0. Must return 10.
-	 */
-	@Test
-	public void calculateAgeFromLaterFullDate() {
-		Assert.assertTrue(TEN == DateUtil.calculateAge("20001011", TESTDATE, FORMAT));
-	}
-
-	/**
-	 * Tests the {@link DateUtil#calculateAge} method for the given full date against the testDate: 2011-10-10 15:20:00.0. Must return a SecurityPEPSException exception.
-	 */
-	@Test(expected = SecurityPEPSException.class)
-	public void calculateAgeFromInvalidDate() {
-		DateUtil.calculateAge("200", TESTDATE, FORMAT);
-	}
-
-	/**
-	 * Tests the {@link DateUtil#calculateAge} method for the given full date against the testDate: 2011-10-10 15:20:00.0. Must return a SecurityPEPSException exception.
-	 */
-	@Test(expected = SecurityPEPSException.class)
-	public void calculateAgeFromInvalidMonth() {
-		DateUtil.calculateAge("200013", TESTDATE, FORMAT);
-	}
-
-	/**
-	 * Tests the {@link DateUtil#calculateAge} method for the given full date against the testDate: 2011-10-10 15:20:00.0. Must return a SecurityPEPSException exception.
-	 */
-	@Test(expected = SecurityPEPSException.class)
-	public void calculateAgeFromInvalidDay() {
-		DateUtil.calculateAge("20000230", TESTDATE, FORMAT);
-	}
-
-	/**
-	 * Tests the {@link DateUtil#calculateAge} method for the given full date against the testDate: 2011-10-10 15:20:00.0. Must return a SecurityPEPSException exception.
-	 */
-	@Test(expected = SecurityPEPSException.class)
-	public void calculateAgeFromNullDate() {
-		DateUtil.calculateAge(null, TESTDATE, FORMAT);
-	}
-
-	/**
-	 * Tests the {@link DateUtil#calculateAge} method for the given full date against the testDate: 2011-10-10 15:20:00.0. Must return a SecurityPEPSException exception.
-	 */
-	@Test(expected = SecurityPEPSException.class)
-	public void calculateAgeFromNullCurDate() {
-		DateUtil.calculateAge("2000", null, FORMAT);
-	}
-
-	/**
-	 * Tests the {@link DateUtil#calculateAge} method for the given full date against the testDate: 2011-10-10 15:20:00.0. Must return a SecurityPEPSException exception.
-	 */
-	@Test(expected = SecurityPEPSException.class)
-	public void calculateAgeFromNullFormat() {
-		DateUtil.calculateAge("2000", TESTDATE, null);
-	}
-
-	/**
-	 * Tests the {@link DateUtil#isValidFormatDate} method for the given year. Must return true
-	 */
-	@Test
-	public void isValidFormatDateFromYear() {
-		Assert.assertTrue(DateUtil.isValidFormatDate("2000", FORMAT));
-	}
-
-	/**
-	 * Tests the {@link DateUtil#isValidFormatDate} method for the given year and month. Must return true.
-	 */
-	@Test
-	public void isValidFormatDateFromMonth() {
-		Assert.assertTrue(DateUtil.isValidFormatDate("200001", FORMAT));
-	}
-
-	/**
-	 * Tests the {@link DateUtil#isValidFormatDate} method for the given year. Must return false.
-	 */
-	@Test
-	public void isValidFormatDate() {
-		Assert.assertTrue(DateUtil.isValidFormatDate("20000101", FORMAT));
-	}
-
-	/**
-	 * Tests the {@link DateUtil#isValidFormatDate} method for the given year. Must return false.
-	 */
-	@Test
-	public void isValidFormatDateInvalidYear() {
-		Assert.assertFalse(DateUtil.isValidFormatDate("200", FORMAT));
-	}
-
-	/**
-	 * Tests the {@link DateUtil#isValidFormatDate} method for the given year. Must return false.
-	 */
-	@Test
-	public void isValidFormatDateInvalidMonth() {
-		Assert.assertFalse(DateUtil.isValidFormatDate("200013", FORMAT));
-	}
-
-	/**
-	 * Tests the {@link DateUtil#isValidFormatDate} method for the given year. Must return false.
-	 */
-	@Test
-	public void isValidFormatDateInvalidDate() {
-		Assert.assertFalse(DateUtil.isValidFormatDate("20010229", FORMAT));
-	}
-
-	/**
-	 * Tests the {@link DateUtil#isValidFormatDate} method for the given year. Must return false.
-	 */
-	@Test
-	public void isValidFormatDateNullDate() {
-		Assert.assertFalse(DateUtil.isValidFormatDate(null, FORMAT));
-	}
-
-	/**
-	 * Tests the {@link DateUtil#isValidFormatDate} method for the given year. Must return false.
-	 */
-	@Test
-	public void isValidFormatDateNullFormat() {
-		Assert.assertFalse(DateUtil.isValidFormatDate("2000", null));
-	}
-
-	/**
-	 * Tests the {@link DateUtil#currentTimeStamp()} method for the current TimeStamp (TS). Must return true.
-	 */
-	@Test
-	public void testCurrentTimeStampBefore() {
-		Timestamp ts = DateUtil.currentTimeStamp();
-		Assert.assertNotSame(ts, DateUtil.currentTimeStamp());
-	}
-
-	/**
-	 * Tests the {@link DateUtil#currentTimeStamp()} method for the current TimeStamp (TS). Must return true.
-	 */
-	@Test
-	@Ignore
-	public void testCurrentTimeStampAfter() {
-		Timestamp ts = DateUtil.currentTimeStamp();
-		Assert.assertEquals(DateUtil.currentTimeStamp(), ts);
-	}
+    /**
+     * Stork Format date.
+     */
+    private static final String FORMAT = "yyyyMMdd";
+
+    /**
+     * Expected 10 value.
+     */
+    private static final int TEN = 10;
+
+    /**
+     * Expected 11 value.
+     */
+    private static final int ELEVEN = 11;
+
+    /**
+     * The testing Date ("current" date).
+     */
+    private static final DateTime TESTDATE = new DateTime(2011, 10, 10, 15, 20,
+            0, 0);
+
+    /**
+     * Init DateUtilTestCase class.
+     */
+    @BeforeClass
+    public static void runsBeforeTheTestSuite() {
+        final Properties configs = new Properties();
+        configs.setProperty("invalidAgeDateValue.code", "35");
+        configs.setProperty("invalidAttributeValue.code", "34");
+        configs
+                .setProperty(
+                        "invalidAttributeValue.message",
+                        "Unexpected or invalid content was encountered within a "
+                        + "<saml:Attribute> or <saml:AttributeValue> element.");
+        PEPSUtil.createInstance(configs);
+    }
+
+    /**
+     * Tests the {@link DateUtil#calculateAge} method for the given year against
+     * the testDate: 2011-10-10 15:20:00.0. Must return 10.
+     */
+    @Test
+    public void calculateAgeFromYear() {
+        Assert.assertTrue(TEN == DateUtil.calculateAge("2000", TESTDATE, FORMAT));
+    }
+
+    /**
+     * Tests the {@link DateUtil#calculateAge} method for the given year and
+     * month against the testDate: 2011-10-10 15:20:00.0. Must return 11.
+     */
+    @Test
+    public void calculateAgeFromEarlyMonth() {
+        Assert.assertTrue(ELEVEN == DateUtil.calculateAge("200001", TESTDATE,
+                FORMAT));
+    }
+
+    /**
+     * Tests the {@link DateUtil#calculateAge} method for the given year and
+     * month against the testDate: 2011-10-10 15:20:00.0. Must return 10.
+     */
+    @Test
+    public void calculateAgeFromSameMonth() {
+        Assert.assertTrue(TEN == DateUtil.calculateAge("200010", TESTDATE, FORMAT));
+    }
+
+    /**
+     * Tests the {@link DateUtil#calculateAge} method for the given year and
+     * month against the testDate: 2011-10-10 15:20:00.0. Must return 10.
+     */
+    @Test
+    public void calculateAgeFromLaterMonth() {
+        Assert.assertTrue(TEN == DateUtil.calculateAge("200011", TESTDATE, FORMAT));
+    }
+
+    /**
+     * Tests the {@link DateUtil#calculateAge} method for the given full date
+     * against the testDate: 2011-10-10 15:20:00.0. Must return 11.
+     */
+    @Test
+    public void calculateAgeFromEarlyFullDate() {
+        Assert.assertTrue(ELEVEN == DateUtil.calculateAge("20000101", TESTDATE,
+                FORMAT));
+    }
+
+    /**
+     * Tests the {@link DateUtil#calculateAge} method for the given full date
+     * against the testDate: 2011-10-10 15:20:00.0. Must return 11.
+     */
+    @Test
+    public void calculateAgeFromSameDay() {
+        Assert.assertTrue(ELEVEN == DateUtil.calculateAge("20001010", TESTDATE,
+                FORMAT));
+    }
+
+    /**
+     * Tests the {@link DateUtil#calculateAge} method for the given full date
+     * against the testDate: 2011-10-10 15:20:00.0. Must return 10.
+     */
+    @Test
+    public void calculateAgeFromLaterFullDate() {
+        Assert.assertTrue(TEN == DateUtil
+                .calculateAge("20001011", TESTDATE, FORMAT));
+    }
+
+    /**
+     * Tests the {@link DateUtil#calculateAge} method for the given full date
+     * against the testDate: 2011-10-10 15:20:00.0. Must return a
+     * SecurityPEPSException exception.
+     */
+    @Test(expected = SecurityPEPSException.class)
+    public void calculateAgeFromInvalidDate() {
+        DateUtil.calculateAge("200", TESTDATE, FORMAT);
+    }
+
+    /**
+     * Tests the {@link DateUtil#calculateAge} method for the given full date
+     * against the testDate: 2011-10-10 15:20:00.0. Must return a
+     * SecurityPEPSException exception.
+     */
+    @Test(expected = SecurityPEPSException.class)
+    public void calculateAgeFromInvalidMonth() {
+        DateUtil.calculateAge("200013", TESTDATE, FORMAT);
+    }
+
+    /**
+     * Tests the {@link DateUtil#calculateAge} method for the given full date
+     * against the testDate: 2011-10-10 15:20:00.0. Must return a
+     * SecurityPEPSException exception.
+     */
+    @Test(expected = SecurityPEPSException.class)
+    public void calculateAgeFromInvalidDay() {
+        DateUtil.calculateAge("20000230", TESTDATE, FORMAT);
+    }
+
+    /**
+     * Tests the {@link DateUtil#calculateAge} method for the given full date
+     * against the testDate: 2011-10-10 15:20:00.0. Must return a
+     * SecurityPEPSException exception.
+     */
+    @Test(expected = SecurityPEPSException.class)
+    public void calculateAgeFromNullDate() {
+        DateUtil.calculateAge(null, TESTDATE, FORMAT);
+    }
+
+    /**
+     * Tests the {@link DateUtil#calculateAge} method for the given full date
+     * against the testDate: 2011-10-10 15:20:00.0. Must return a
+     * SecurityPEPSException exception.
+     */
+    @Test(expected = SecurityPEPSException.class)
+    public void calculateAgeFromNullCurDate() {
+        DateUtil.calculateAge("2000", null, FORMAT);
+    }
+
+    /**
+     * Tests the {@link DateUtil#calculateAge} method for the given full date
+     * against the testDate: 2011-10-10 15:20:00.0. Must return a
+     * SecurityPEPSException exception.
+     */
+    @Test(expected = SecurityPEPSException.class)
+    public void calculateAgeFromNullFormat() {
+        DateUtil.calculateAge("2000", TESTDATE, null);
+    }
+
+    /**
+     * Tests the {@link DateUtil#isValidFormatDate} method for the given year.
+     * Must return true
+     */
+    @Test
+    public void isValidFormatDateFromYear() {
+        Assert.assertTrue(DateUtil.isValidFormatDate("2000", FORMAT));
+    }
+
+    /**
+     * Tests the {@link DateUtil#isValidFormatDate} method for the given year
+     * and month. Must return true.
+     */
+    @Test
+    public void isValidFormatDateFromMonth() {
+        Assert.assertTrue(DateUtil.isValidFormatDate("200001", FORMAT));
+    }
+
+    /**
+     * Tests the {@link DateUtil#isValidFormatDate} method for the given year.
+     * Must return false.
+     */
+    @Test
+    public void isValidFormatDate() {
+        Assert.assertTrue(DateUtil.isValidFormatDate("20000101", FORMAT));
+    }
+
+    /**
+     * Tests the {@link DateUtil#isValidFormatDate} method for the given year.
+     * Must return false.
+     */
+    @Test
+    public void isValidFormatDateInvalidYear() {
+        Assert.assertFalse(DateUtil.isValidFormatDate("200", FORMAT));
+    }
+
+    /**
+     * Tests the {@link DateUtil#isValidFormatDate} method for the given year.
+     * Must return false.
+     */
+    @Test
+    public void isValidFormatDateInvalidMonth() {
+        Assert.assertFalse(DateUtil.isValidFormatDate("200013", FORMAT));
+    }
+
+    /**
+     * Tests the {@link DateUtil#isValidFormatDate} method for the given year.
+     * Must return false.
+     */
+    @Test
+    public void isValidFormatDateInvalidDate() {
+        Assert.assertFalse(DateUtil.isValidFormatDate("20010229", FORMAT));
+    }
+
+    /**
+     * Tests the {@link DateUtil#isValidFormatDate} method for the given year.
+     * Must return false.
+     */
+    @Test
+    public void isValidFormatDateNullDate() {
+        Assert.assertFalse(DateUtil.isValidFormatDate(null, FORMAT));
+    }
+
+    /**
+     * Tests the {@link DateUtil#isValidFormatDate} method for the given year.
+     * Must return false.
+     */
+    @Test
+    public void isValidFormatDateNullFormat() {
+        Assert.assertFalse(DateUtil.isValidFormatDate("2000", null));
+    }
+
+    /**
+     * Tests the {@link DateUtil#currentTimeStamp()} method for the current
+     * TimeStamp (TS). Must return true.
+     */
+    @Test
+    public void testCurrentTimeStampBefore() {
+        Timestamp ts = DateUtil.currentTimeStamp();
+        Assert.assertNotSame(ts, DateUtil.currentTimeStamp());
+    }
+
+    /**
+     * Tests the {@link DateUtil#currentTimeStamp()} method for the current
+     * TimeStamp (TS). Must return true.
+     */
+    @Test
+    public void testCurrentTimeStampAfter() {
+        Timestamp ts = DateUtil.currentTimeStamp();
+        Assert.assertEquals(DateUtil.currentTimeStamp(), ts);
+    }
 
 }