prevent long sleep in test

Author: jaimecasero

restcomm/restcomm.dao/src/main/java/org/restcomm/connect/dao/entities/SmsMessage.java

@@ -155,14 +155,21 @@ public static final class Builder {
         private Currency priceUnit;
         private String apiVersion;
         private URI uri;
+        private DateTime dateCreated;
+        private DateTime dateUpdated;
 
         private Builder() {
             super();
         }
 
         public SmsMessage build() {
-            final DateTime now = DateTime.now();
-            return new SmsMessage(sid, now, now, dateSent, accountSid, sender, recipient, body, status, direction, price,
+            if (dateCreated == null) {
+                dateCreated = DateTime.now();
+            }
+            if (dateUpdated == null) {
+                dateUpdated = dateCreated;
+            }
+            return new SmsMessage(sid, dateCreated, dateUpdated, dateSent, accountSid, sender, recipient, body, status, direction, price,
                     priceUnit, apiVersion, uri);
         }
 
@@ -213,6 +220,14 @@ public void setApiVersion(final String apiVersion) {
         public void setUri(final URI uri) {
             this.uri = uri;
         }
+
+        public void setDateCreated(DateTime dateCreated) {
+            this.dateCreated = dateCreated;
+        }
+
+        public void setDateUpdated(DateTime dateUpdated) {
+            this.dateUpdated = dateUpdated;
+        }
     }
 
     public enum Direction {

restcomm/restcomm.dao/src/test/java/org/restcomm/connect/dao/mybatis/SmsMessagesDaoTest.java

@@ -114,7 +114,7 @@ public void createReadUpdateDelete() {
         assertTrue(messages.getSmsMessage(sid) == null);
     }
 
-    private SmsMessage createSms(Sid account, SmsMessage.Direction direction, int i) {
+    private SmsMessage createSms(Sid account, SmsMessage.Direction direction, int i, DateTime date) {
         final Sid sid = Sid.generate(Sid.Type.SMS_MESSAGE);
         final URI url = URI.create("2012-04-24/Accounts/Acoount/SMS/Messages/unique-id.json");
         final SmsMessage.Builder builder = SmsMessage.builder();
@@ -129,6 +129,7 @@ private SmsMessage createSms(Sid account, SmsMessage.Direction direction, int i)
         builder.setPrice(new BigDecimal("0.00"));
         builder.setPriceUnit(Currency.getInstance("USD"));
         builder.setUri(url);
+        builder.setDateCreated(date);
         SmsMessage message = builder.build();
         return message;
     }
@@ -137,30 +138,32 @@ private SmsMessage createSms(Sid account, SmsMessage.Direction direction, int i)
     public void testGetSmsMessagesLastMinute() throws InterruptedException, ParseException {
         final SmsMessagesDao messages = manager.getSmsMessagesDao();
         final Sid account = Sid.generate(Sid.Type.ACCOUNT);
+        DateTime oneMinuteAgo = DateTime.now().minusSeconds(58);
         for (int i = 0; i < 2; i++) {
-            SmsMessage message = createSms(account, SmsMessage.Direction.OUTBOUND_API, i);
+            SmsMessage message = createSms(account, SmsMessage.Direction.OUTBOUND_API, i, oneMinuteAgo);
             // Create a new sms message in the data store.
             messages.addSmsMessage(message);
             logger.info("Created message: "+message);
         }
         for (int i = 0; i < 2; i++) {
-            SmsMessage message = createSms(account, SmsMessage.Direction.OUTBOUND_CALL, i);
+            SmsMessage message = createSms(account, SmsMessage.Direction.OUTBOUND_CALL, i, oneMinuteAgo);
             // Create a new sms message in the data store.
             messages.addSmsMessage(message);
             logger.info("Created message: "+message);
         }
         for (int i = 0; i < 2; i++) {
-            SmsMessage message = createSms(account, SmsMessage.Direction.OUTBOUND_REPLY, i);
+            SmsMessage message = createSms(account, SmsMessage.Direction.OUTBOUND_REPLY, i, oneMinuteAgo);
             // Create a new sms message in the data store.
             messages.addSmsMessage(message);
             logger.info("Created message: "+message);
         }
         int lastMessages = messages.getSmsMessagesPerAccountLastPerMinute(account.toString());
         logger.info("SMS Messages last minutes: "+lastMessages);
         assertEquals(6, lastMessages);
-        Thread.sleep(70000);
+        Thread.sleep(5000);
+        DateTime oneMinuteLater = DateTime.now();
         for (int i = 0; i < 3; i++) {
-            SmsMessage message = createSms(account, SmsMessage.Direction.OUTBOUND_CALL, i);
+            SmsMessage message = createSms(account, SmsMessage.Direction.OUTBOUND_CALL, i, oneMinuteLater);
             // Create a new sms message in the data store.
             messages.addSmsMessage(message);
             logger.info("Created message: "+message);