Skip to content

Commit 730a6db

Browse files
JAVA-37361 - reenabled test (#17103)
* JAVA-37361 - reenabled test * JAVA-37361 - fixed! * JAVA-37361 - Removed unused import.
1 parent 0de9be0 commit 730a6db

File tree

1 file changed

+31
-20
lines changed

1 file changed

+31
-20
lines changed

core-java-modules/core-java-8-datetime-3/src/test/java/com/baeldung/daterangeoverlap/DateRangeOverlapCheckerUnitTest.java

Lines changed: 31 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.baeldung.daterangeoverlap;
22

33
import org.joda.time.DateTime;
4-
import org.junit.Ignore;
54
import org.junit.Test;
65

76
import java.time.LocalDate;
@@ -15,14 +14,18 @@ public class DateRangeOverlapCheckerUnitTest {
1514
@Test
1615
public void givenPartialOverlappingRanges_thenReturnsTrue() {
1716
Calendar start1 = Calendar.getInstance();
18-
start1.set(2024, 11, 15);
17+
start1.clear();
18+
start1.set(2024, Calendar.DECEMBER, 15);
1919
Calendar end1 = Calendar.getInstance();
20-
end1.set(2024, 11, 20);
20+
end1.clear();
21+
end1.set(2024, Calendar.DECEMBER, 20);
2122

2223
Calendar start2 = Calendar.getInstance();
23-
start2.set(2024, 11, 18);
24+
start2.clear();
25+
start2.set(2024, Calendar.DECEMBER, 18);
2426
Calendar end2 = Calendar.getInstance();
25-
end2.set(2024, 11, 22);
27+
end2.clear();
28+
end2.set(2024, Calendar.DECEMBER, 22);
2629

2730
LocalDate startLD1 = LocalDate.of(2024, 12, 15);
2831
LocalDate endLD1 = LocalDate.of(2024, 12, 20);
@@ -51,14 +54,16 @@ public void givenPartialOverlappingRanges_thenReturnsTrue() {
5154
@Test
5255
public void givenFullOverlappingRanges_thenReturnsTrue() {
5356
Calendar start1 = Calendar.getInstance();
54-
start1.set(2024, 11, 15);
57+
start1.clear();
58+
start1.set(2024, Calendar.DECEMBER, 15);
5559
Calendar end1 = Calendar.getInstance();
56-
end1.set(2024, 11, 20);
60+
end1.clear();
61+
end1.set(2024, Calendar.DECEMBER, 20);
5762

5863
Calendar start2 = Calendar.getInstance();
59-
start2.set(2024, 11, 16);
64+
start2.set(2024, Calendar.DECEMBER, 16);
6065
Calendar end2 = Calendar.getInstance();
61-
end2.set(2024, 11, 18);
66+
end2.set(2024, Calendar.DECEMBER, 18);
6267

6368
LocalDate startLD1 = LocalDate.of(2024, 12, 15);
6469
LocalDate endLD1 = LocalDate.of(2024, 12, 20);
@@ -87,14 +92,18 @@ public void givenFullOverlappingRanges_thenReturnsTrue() {
8792
@Test
8893
public void givenConsecutiveRanges_thenReturnsFalse() {
8994
Calendar start1 = Calendar.getInstance();
90-
start1.set(2024, 11, 15);
95+
start1.clear();
96+
start1.set(2024, Calendar.DECEMBER, 15);
9197
Calendar end1 = Calendar.getInstance();
92-
end1.set(2024, 11, 20);
98+
end1.clear();
99+
end1.set(2024, Calendar.DECEMBER, 20);
93100

94101
Calendar start2 = Calendar.getInstance();
95-
start2.set(2024, 11, 21);
102+
start2.clear();
103+
start2.set(2024, Calendar.DECEMBER, 21);
96104
Calendar end2 = Calendar.getInstance();
97-
end2.set(2024, 11, 24);
105+
end2.clear();
106+
end2.set(2024, Calendar.DECEMBER, 24);
98107

99108
LocalDate startLD1 = LocalDate.of(2024, 12, 15);
100109
LocalDate endLD1 = LocalDate.of(2024, 12, 20);
@@ -121,27 +130,28 @@ public void givenConsecutiveRanges_thenReturnsFalse() {
121130
}
122131

123132
@Test
124-
@Ignore
125133
public void givenZeroRangeRanges_thenReturnsTrue() {
126134
Calendar start1 = Calendar.getInstance();
127-
start1.set(2024, 11, 15);
135+
start1.clear();
136+
start1.set(2024, Calendar.DECEMBER, 15);
128137
Calendar end1 = Calendar.getInstance();
129-
end1.set(2024, 11, 20);
138+
end1.clear();
139+
end1.set(2024, Calendar.DECEMBER, 20);
130140

131141
Calendar start2 = Calendar.getInstance();
132-
start2.set(2024, 11, 20);
142+
start2.clear();
143+
start2.set(2024, Calendar.DECEMBER, 20);
133144
Calendar end2 = Calendar.getInstance();
134-
end2.set(2024, 11, 20);
145+
end2.clear();
146+
end2.set(2024, Calendar.DECEMBER, 20);
135147

136148
LocalDate startLD1 = LocalDate.of(2024, 12, 15);
137149
LocalDate endLD1 = LocalDate.of(2024, 12, 20);
138-
139150
LocalDate startLD2 = LocalDate.of(2024, 12, 20);
140151
LocalDate endLD2 = LocalDate.of(2024, 12, 20);
141152

142153
DateTime startJT1 = new DateTime(2024, 12, 15, 0, 0);
143154
DateTime endJT1 = new DateTime(2024, 12, 20, 0, 0);
144-
145155
DateTime startJT2 = new DateTime(2024, 12, 20, 0, 0);
146156
DateTime endJT2 = new DateTime(2024, 12, 20, 0, 0);
147157

@@ -157,4 +167,5 @@ public void givenZeroRangeRanges_thenReturnsTrue() {
157167
//the overlaps method considers two intervals as overlapping only if they have a non-zero duration.
158168
assertFalse(DateRangeOverlapChecker.isOverlapUsingJodaTime(startJT1, endJT1, startJT2, endJT2));
159169
}
170+
160171
}

0 commit comments

Comments
 (0)