Added times to entry

cternes · May 1, 2016 · f4db2b9 · f4db2b9
1 parent 5333b8f
commit f4db2b9
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/src/main/java/de/slackspace/openkeepass/domain/Entry.java b/src/main/java/de/slackspace/openkeepass/domain/Entry.java
@@ -55,6 +55,9 @@ public class Entry implements KeePassFileElement {
     @XmlElement(name = "History")
     private History history;
 
+    @XmlElement(name = "Times")
+    private Times times;
+
     Entry() {
         this.uuid = UUID.randomUUID();
     }
@@ -65,6 +68,7 @@ public Entry(EntryContract entryContract) {
         this.iconData = entryContract.getIconData();
         this.iconId = entryContract.getIconId();
         this.customIconUUID = entryContract.getCustomIconUUID();
+        this.times = entryContract.getTimes();
 
         setValue(false, NOTES, entryContract.getNotes());
         setValue(true, PASSWORD, entryContract.getPassword());
@@ -151,6 +155,10 @@ public boolean isPasswordProtected() {
         return getPropertyByName(PASSWORD).isProtected();
     }
 
+    public Times getTimes() {
+        return times;
+    }
+
     private void setValue(boolean isProtected, String propertyName, String propertyValue) {
         Property property = getPropertyByName(propertyName);
         if (property == null) {

diff --git a/src/test/java/de/slackspace/openkeepass/domain/builder/EntryBuilderTest.java b/src/test/java/de/slackspace/openkeepass/domain/builder/EntryBuilderTest.java
@@ -1,5 +1,6 @@
 package de.slackspace.openkeepass.domain.builder;
 
+import java.util.Calendar;
 import java.util.UUID;
 
 import org.junit.Assert;
@@ -8,6 +9,9 @@
 import de.slackspace.openkeepass.domain.Entry;
 import de.slackspace.openkeepass.domain.EntryBuilder;
 import de.slackspace.openkeepass.domain.History;
+import de.slackspace.openkeepass.domain.Times;
+import de.slackspace.openkeepass.domain.TimesBuilder;
+import de.slackspace.openkeepass.util.CalendarHandler;
 
 public class EntryBuilderTest {
 
@@ -56,6 +60,18 @@ public void shouldBuildEntryFromEntryWithHistory() {
         Assert.assertNull("username of the history should be null", historicEntry.getUsername());
     }
 
+    @Test
+    public void shouldBuildEntryWithTimes() {
+        Calendar creationDate = CalendarHandler.createCalendar(2016, 2, 5);
+
+        Times times = new TimesBuilder().expires(true).usageCount(3).creationTime(creationDate).build();
+        Entry entry = new EntryBuilder("timesTest").times(times).build();
+
+        Assert.assertTrue(entry.getTimes().expires());
+        Assert.assertEquals(3, entry.getTimes().getUsageCount());
+        Assert.assertEquals(creationDate, entry.getTimes().getCreationTime());
+    }
+
     @Test(expected = IllegalArgumentException.class)
     public void shouldThrowIllegalArgumentExceptionWithNoEntrySet() {
         new EntryBuilder("test").buildWithHistory();