]> source.dussan.org Git - sonarqube.git/commitdiff
Remove checks of minutes greater than 60 and hours greater than 24
authorJulien Lancelot <julien.lancelot@sonarsource.com>
Mon, 7 Apr 2014 15:37:20 +0000 (17:37 +0200)
committerJulien Lancelot <julien.lancelot@sonarsource.com>
Mon, 7 Apr 2014 15:37:20 +0000 (17:37 +0200)
sonar-plugin-api/src/main/java/org/sonar/api/utils/Duration.java
sonar-plugin-api/src/test/java/org/sonar/api/utils/DurationTest.java

index 63367f10780ea173a9185568ab18aa8fefee984e..e340f8051242f793a2cf6540f3e4de7f42d75ff1 100644 (file)
@@ -79,17 +79,11 @@ public class Duration implements Serializable {
         String hoursText = matcher.group(2);
         if (hoursText != null) {
           hours = Integer.parseInt(hoursText);
-          if (hours > 24) {
-            throw new IllegalArgumentException(String.format("The number of hours should not be greater than 24, got %s", hours));
-          }
           sanitizedText = sanitizedText.replace(hoursText + HOUR, "");
         }
         String minutesText = matcher.group(3);
         if (minutesText != null) {
           minutes = Integer.parseInt(minutesText);
-          if (minutes > 60) {
-            throw new IllegalArgumentException(String.format("The number of minutes should not be greater than 60, got %s", minutes));
-          }
           sanitizedText = sanitizedText.replace(minutesText + MINUTE, "");
         }
         if (sanitizedText.isEmpty()) {
index e5b36d8f8645d6041f47b56df89a5feecc2d77e7..f3170d775342f2d935eaa2f7476d924a22706e5f 100644 (file)
@@ -55,26 +55,8 @@ public class DurationTest {
     assertThat(Duration.decode("23h", HOURS_IN_DAY)).isEqualTo(Duration.create(23 * ONE_HOUR_IN_MINUTES));
     assertThat(Duration.decode("15d", HOURS_IN_DAY)).isEqualTo(Duration.create(15 * ONE_DAY_IN_MINUTES));
     assertThat(Duration.decode("42min", HOURS_IN_DAY)).isEqualTo(Duration.create(42 * ONE_MINUTE));
-  }
 
-  @Test
-  public void fail_to_decode_if_more_than_24_hours() throws Exception {
-    try {
-      Duration.decode("25h", HOURS_IN_DAY);
-      fail();
-    } catch (Exception e) {
-      assertThat(e).isInstanceOf(IllegalArgumentException.class).hasMessage("The number of hours should not be greater than 24, got 25");
-    }
-  }
-
-  @Test
-  public void fail_to_decode_if_more_than_60_minutes() throws Exception {
-    try {
-      Duration.decode("61min", HOURS_IN_DAY);
-      fail();
-    } catch (Exception e) {
-      assertThat(e).isInstanceOf(IllegalArgumentException.class).hasMessage("The number of minutes should not be greater than 60, got 61");
-    }
+    assertThat(Duration.decode("25h61min", HOURS_IN_DAY)).isEqualTo(Duration.create(25 * ONE_HOUR_IN_MINUTES + 61));
   }
 
   @Test