Skip to content

Commit 2b283be

Browse files
andrusandrus
committed
test refactoring - removing "java8" label
1 parent 1cc758b commit 2b283be

27 files changed

+140
-142
lines changed

‎cayenne-ant/src/test/resources/testmap.map.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@
324324
<obj-entity name="BooleanTestEntity" className="org.apache.cayenne.testdo.numeric_types.BooleanTestEntity" dbEntityName="BOOLEAN_TEST">
325325
<obj-attribute name="booleanColumn" type="java.lang.Boolean" db-attribute-path="BOOLEAN_COLUMN"/>
326326
</obj-entity>
327-
<obj-entity name="CalendarEntity" className="org.apache.cayenne.testdo.date_time.CalendarEntity" dbEntityName="CALENDAR_TEST">
327+
<obj-entity name="CalendarEntity" className="org.apache.cayenne.testdo.legacy_datetime.CalendarEntity" dbEntityName="CALENDAR_TEST">
328328
<obj-attribute name="calendarField" type="java.util.Calendar" db-attribute-path="CALENDAR_FIELD"/>
329329
</obj-entity>
330330
<obj-entity name="CharFkTestEntity" className="org.apache.cayenne.testdo.compound.CharFkTestEntity" dbEntityName="CHAR_FK_TEST">
@@ -359,7 +359,7 @@
359359
<obj-attribute name="key2" type="java.lang.String" db-attribute-path="KEY2"/>
360360
<obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/>
361361
</obj-entity>
362-
<obj-entity name="DateTestEntity" className="org.apache.cayenne.testdo.date_time.DateTestEntity" dbEntityName="DATE_TEST">
362+
<obj-entity name="DateTestEntity" className="org.apache.cayenne.testdo.legacy_datetime.DateTestEntity" dbEntityName="DATE_TEST">
363363
<obj-attribute name="dateColumn" type="java.util.Date" db-attribute-path="DATE_COLUMN"/>
364364
<obj-attribute name="timeColumn" type="java.util.Date" db-attribute-path="TIME_COLUMN"/>
365365
<obj-attribute name="timestampColumn" type="java.util.Date" db-attribute-path="TIMESTAMP_COLUMN"/>

‎cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLDateTimeFunctionalExpressionsIT.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import org.apache.cayenne.ObjectContext;
2323
import org.apache.cayenne.di.Inject;
2424
import org.apache.cayenne.query.EJBQLQuery;
25-
import org.apache.cayenne.testdo.date_time.DateTestEntity;
25+
import org.apache.cayenne.testdo.legacy_datetime.DateTestEntity;
2626
import org.apache.cayenne.unit.UnitDbAdapter;
2727
import org.apache.cayenne.unit.di.runtime.CayenneProjects;
2828
import org.apache.cayenne.unit.di.runtime.RuntimeCase;
@@ -35,7 +35,7 @@
3535
import static org.junit.Assert.assertEquals;
3636
import static org.junit.Assert.assertTrue;
3737

38-
@UseCayenneRuntime(CayenneProjects.DATE_TIME_PROJECT)
38+
@UseCayenneRuntime(CayenneProjects.LEGACY_DATE_TIME_PROJECT)
3939
public class DataContextEJBQLDateTimeFunctionalExpressionsIT extends RuntimeCase {
4040

4141
@Inject

‎cayenne/src/test/java/org/apache/cayenne/access/DateTimeTypesIT.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
import org.apache.cayenne.di.Inject;
2828
import org.apache.cayenne.query.MappedSelect;
2929
import org.apache.cayenne.query.ObjectSelect;
30-
import org.apache.cayenne.testdo.date_time.CalendarEntity;
31-
import org.apache.cayenne.testdo.date_time.DateTestEntity;
30+
import org.apache.cayenne.testdo.legacy_datetime.CalendarEntity;
31+
import org.apache.cayenne.testdo.legacy_datetime.DateTestEntity;
3232
import org.apache.cayenne.unit.di.runtime.CayenneProjects;
3333
import org.apache.cayenne.unit.di.runtime.RuntimeCase;
3434
import org.apache.cayenne.unit.di.runtime.UseCayenneRuntime;
@@ -41,7 +41,7 @@
4141
/**
4242
* Tests Date handling in Cayenne.
4343
*/
44-
@UseCayenneRuntime(CayenneProjects.DATE_TIME_PROJECT)
44+
@UseCayenneRuntime(CayenneProjects.LEGACY_DATE_TIME_PROJECT)
4545
public class DateTimeTypesIT extends RuntimeCase {
4646

4747
@Inject

‎cayenne/src/test/java/org/apache/cayenne/access/types/Java8TimeIT.java renamed to ‎cayenne/src/test/java/org/apache/cayenne/access/types/DateTimeIT.java

Lines changed: 24 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -19,37 +19,35 @@
1919

2020
package org.apache.cayenne.access.types;
2121

22-
import java.sql.SQLException;
23-
import java.time.Duration;
24-
import java.time.LocalDate;
25-
import java.time.LocalDateTime;
26-
import java.time.LocalTime;
27-
import java.time.Period;
28-
import java.time.temporal.ChronoField;
29-
import java.time.temporal.TemporalField;
30-
3122
import org.apache.cayenne.access.DataContext;
3223
import org.apache.cayenne.di.Inject;
3324
import org.apache.cayenne.query.ObjectSelect;
3425
import org.apache.cayenne.test.jdbc.DBHelper;
35-
import org.apache.cayenne.testdo.java8.DurationTestEntity;
36-
import org.apache.cayenne.testdo.java8.LocalDateTestEntity;
37-
import org.apache.cayenne.testdo.java8.LocalDateTimeTestEntity;
38-
import org.apache.cayenne.testdo.java8.LocalTimeTestEntity;
39-
import org.apache.cayenne.testdo.java8.PeriodTestEntity;
26+
import org.apache.cayenne.testdo.datetime.DurationTestEntity;
27+
import org.apache.cayenne.testdo.datetime.LocalDateTestEntity;
28+
import org.apache.cayenne.testdo.datetime.LocalDateTimeTestEntity;
29+
import org.apache.cayenne.testdo.datetime.LocalTimeTestEntity;
30+
import org.apache.cayenne.testdo.datetime.PeriodTestEntity;
4031
import org.apache.cayenne.unit.UnitDbAdapter;
4132
import org.apache.cayenne.unit.di.runtime.CayenneProjects;
4233
import org.apache.cayenne.unit.di.runtime.RuntimeCase;
4334
import org.apache.cayenne.unit.di.runtime.UseCayenneRuntime;
4435
import org.junit.Before;
4536
import org.junit.Test;
4637

47-
import static org.junit.Assert.assertEquals;
48-
import static org.junit.Assert.assertNotNull;
49-
import static org.junit.Assert.assertNull;
38+
import java.sql.SQLException;
39+
import java.time.Duration;
40+
import java.time.LocalDate;
41+
import java.time.LocalDateTime;
42+
import java.time.LocalTime;
43+
import java.time.Period;
44+
import java.time.temporal.ChronoField;
45+
import java.time.temporal.TemporalField;
46+
47+
import static org.junit.Assert.*;
5048

51-
@UseCayenneRuntime(CayenneProjects.JAVA8)
52-
public class Java8TimeIT extends RuntimeCase {
49+
@UseCayenneRuntime(CayenneProjects.DATE_TIME_PROJECT)
50+
public class DateTimeIT extends RuntimeCase {
5351

5452
@Inject
5553
private DataContext context;
@@ -70,7 +68,7 @@ public void before() throws SQLException {
7068
}
7169

7270
@Test
73-
public void testJava8LocalDate_Null() {
71+
public void testLocalDate_Null() {
7472
LocalDateTestEntity localDateTestEntity = context.newObject(LocalDateTestEntity.class);
7573
localDateTestEntity.setDate(null);
7674

@@ -82,7 +80,7 @@ public void testJava8LocalDate_Null() {
8280
}
8381

8482
@Test
85-
public void testJava8LocalDate() {
83+
public void testLocalDate() {
8684
LocalDateTestEntity localDateTestEntity = context.newObject(LocalDateTestEntity.class);
8785
LocalDate localDate = LocalDate.now();
8886
localDateTestEntity.setDate(localDate);
@@ -97,7 +95,7 @@ public void testJava8LocalDate() {
9795
}
9896

9997
@Test
100-
public void testJava8LocalTime() {
98+
public void testLocalTime() {
10199
LocalTimeTestEntity localTimeTestEntity = context.newObject(LocalTimeTestEntity.class);
102100
LocalTime localTime = LocalTime.now();
103101
localTimeTestEntity.setTime(localTime);
@@ -117,7 +115,7 @@ public void testJava8LocalTime() {
117115
}
118116

119117
@Test
120-
public void testJava8LocalDateTime() {
118+
public void testLocalDateTime() {
121119
LocalDateTimeTestEntity localDateTimeTestEntity = context.newObject(LocalDateTimeTestEntity.class);
122120
// round up seconds fraction
123121
// reason: on MySQL field should be defined as TIMESTAMP(fractionSecondsPrecision) to support it
@@ -135,7 +133,7 @@ public void testJava8LocalDateTime() {
135133
}
136134

137135
@Test
138-
public void columnSelectWithJava8Type() {
136+
public void columnSelectWithLocalDateTime() {
139137
// round up seconds fraction
140138
// reason: on MySQL field should be defined as TIMESTAMP(fractionSecondsPrecision) to support it
141139
LocalDateTime localDateTime = LocalDateTime.now().with(ChronoField.NANO_OF_SECOND, 0);
@@ -157,7 +155,7 @@ public void columnSelectWithJava8Type() {
157155
}
158156

159157
@Test
160-
public void testJava8Duration() {
158+
public void testDuration() {
161159
DurationTestEntity durationTestEntity = context.newObject(DurationTestEntity.class);
162160
Duration duration = Duration.ofDays(10);
163161
durationTestEntity.setDurationBigInt(duration);
@@ -197,7 +195,7 @@ public void testJava8Duration() {
197195
}
198196

199197
@Test
200-
public void testJava8Period() {
198+
public void testPeriod() {
201199
PeriodTestEntity periodTestEntity = context.newObject(PeriodTestEntity.class);
202200
Period period = Period.of(100, 10, 5);
203201
periodTestEntity.setPeriodField(period);

‎cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTExtractIT.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import org.apache.cayenne.exp.ExpressionFactory;
3030
import org.apache.cayenne.query.ObjectSelect;
3131
import org.apache.cayenne.test.jdbc.DBHelper;
32-
import org.apache.cayenne.testdo.date_time.DateTestEntity;
32+
import org.apache.cayenne.testdo.legacy_datetime.DateTestEntity;
3333
import org.apache.cayenne.unit.UnitDbAdapter;
3434
import org.apache.cayenne.unit.di.runtime.CayenneProjects;
3535
import org.apache.cayenne.unit.di.runtime.RuntimeCase;
@@ -43,7 +43,7 @@
4343
/**
4444
* @since 4.0
4545
*/
46-
@UseCayenneRuntime(CayenneProjects.DATE_TIME_PROJECT)
46+
@UseCayenneRuntime(CayenneProjects.LEGACY_DATE_TIME_PROJECT)
4747
public class ASTExtractIT extends RuntimeCase {
4848

4949
@Inject

‎cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTFunctionCallDateIT.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import org.apache.cayenne.exp.ExpressionFactory;
2929
import org.apache.cayenne.query.ObjectSelect;
3030
import org.apache.cayenne.test.jdbc.DBHelper;
31-
import org.apache.cayenne.testdo.date_time.DateTestEntity;
31+
import org.apache.cayenne.testdo.legacy_datetime.DateTestEntity;
3232
import org.apache.cayenne.unit.UnitDbAdapter;
3333
import org.apache.cayenne.unit.di.runtime.CayenneProjects;
3434
import org.apache.cayenne.unit.di.runtime.RuntimeCase;
@@ -43,7 +43,7 @@
4343
/**
4444
* @since 4.0
4545
*/
46-
@UseCayenneRuntime(CayenneProjects.DATE_TIME_PROJECT)
46+
@UseCayenneRuntime(CayenneProjects.LEGACY_DATE_TIME_PROJECT)
4747
public class ASTFunctionCallDateIT extends RuntimeCase {
4848

4949
@Inject

‎cayenne/src/test/java/org/apache/cayenne/testdo/java8/DurationTestEntity.java renamed to ‎cayenne/src/test/java/org/apache/cayenne/testdo/datetime/DurationTestEntity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
* under the License.
1818
****************************************************************/
1919

20-
package org.apache.cayenne.testdo.java8;
20+
package org.apache.cayenne.testdo.datetime;
2121

22-
import org.apache.cayenne.testdo.java8.auto._DurationTestEntity;
22+
import org.apache.cayenne.testdo.datetime.auto._DurationTestEntity;
2323

2424
public class DurationTestEntity extends _DurationTestEntity {
2525

‎cayenne/src/test/java/org/apache/cayenne/testdo/java8/LocalDateTestEntity.java renamed to ‎cayenne/src/test/java/org/apache/cayenne/testdo/datetime/LocalDateTestEntity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
****************************************************************/
19-
package org.apache.cayenne.testdo.java8;
19+
package org.apache.cayenne.testdo.datetime;
2020

21-
import org.apache.cayenne.testdo.java8.auto._LocalDateTestEntity;
21+
import org.apache.cayenne.testdo.datetime.auto._LocalDateTestEntity;
2222

2323
public class LocalDateTestEntity extends _LocalDateTestEntity {
2424

‎cayenne/src/test/java/org/apache/cayenne/testdo/java8/LocalDateTimeTestEntity.java renamed to ‎cayenne/src/test/java/org/apache/cayenne/testdo/datetime/LocalDateTimeTestEntity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
****************************************************************/
19-
package org.apache.cayenne.testdo.java8;
19+
package org.apache.cayenne.testdo.datetime;
2020

21-
import org.apache.cayenne.testdo.java8.auto._LocalDateTimeTestEntity;
21+
import org.apache.cayenne.testdo.datetime.auto._LocalDateTimeTestEntity;
2222

2323
public class LocalDateTimeTestEntity extends _LocalDateTimeTestEntity {
2424

‎cayenne/src/test/java/org/apache/cayenne/testdo/java8/LocalTimeTestEntity.java renamed to ‎cayenne/src/test/java/org/apache/cayenne/testdo/datetime/LocalTimeTestEntity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
****************************************************************/
19-
package org.apache.cayenne.testdo.java8;
19+
package org.apache.cayenne.testdo.datetime;
2020

21-
import org.apache.cayenne.testdo.java8.auto._LocalTimeTestEntity;
21+
import org.apache.cayenne.testdo.datetime.auto._LocalTimeTestEntity;
2222

2323
public class LocalTimeTestEntity extends _LocalTimeTestEntity {
2424

0 commit comments

Comments
 (0)