Skip to content

Commit 17a5730

Browse files
clezagclezag
committed
Tests: autoformat and clean up imports
1 parent ba0e8ed commit 17a5730

File tree

5 files changed

+110
-78
lines changed

5 files changed

+110
-78
lines changed

‎writer/src/test/java/com/opendatahub/timeseries/bdp/writer/AuthorizationTest.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
// SPDX-License-Identifier: AGPL-3.0-or-later
44
package com.opendatahub.timeseries.bdp.writer;
55

6-
import static org.junit.jupiter.api.Assertions.*;
6+
import static org.junit.jupiter.api.Assertions.assertFalse;
7+
import static org.junit.jupiter.api.Assertions.assertTrue;
8+
79
import org.junit.jupiter.api.Test;
810

911
import com.opendatahub.timeseries.bdp.writer.writer.authz.AuthorizeSyncStation;
@@ -18,7 +20,7 @@ public void testStationSyncUrlMatch() {
1820
assertFalse(AuthorizeSyncStation.uriMatches(uri, "testtype", "A22", false, true));
1921
assertFalse(AuthorizeSyncStation.uriMatches(uri, "testtype", "testorigin", true, true));
2022
assertFalse(AuthorizeSyncStation.uriMatches(uri, "testtype", "testorigin", false, false));
21-
23+
2224
uri = "bdp://station?origin=testorigin&syncState=false&onlyActivation=true";
2325
// Missing stationType in URL
2426
assertFalse(AuthorizeSyncStation.uriMatches(uri, "EchargingStation", "testorigin", false, true));

‎writer/src/test/java/com/opendatahub/timeseries/bdp/writer/DataRetrievalITTest.java

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -27,24 +27,23 @@
2727
import org.springframework.http.HttpStatus;
2828
import org.springframework.http.ResponseEntity;
2929
import org.springframework.test.context.ContextConfiguration;
30-
import org.springframework.test.context.TestPropertySource;
3130

32-
import com.opendatahub.timeseries.bdp.writer.dal.DataType;
33-
import com.opendatahub.timeseries.bdp.writer.dal.Measurement;
34-
import com.opendatahub.timeseries.bdp.writer.dal.MeasurementAbstract;
35-
import com.opendatahub.timeseries.bdp.writer.dal.Station;
3631
import com.opendatahub.timeseries.bdp.dto.dto.DataMapDto;
3732
import com.opendatahub.timeseries.bdp.dto.dto.DataTypeDto;
3833
import com.opendatahub.timeseries.bdp.dto.dto.EventDto;
3934
import com.opendatahub.timeseries.bdp.dto.dto.RecordDtoImpl;
4035
import com.opendatahub.timeseries.bdp.dto.dto.SimpleRecordDto;
4136
import com.opendatahub.timeseries.bdp.dto.dto.StationDto;
37+
import com.opendatahub.timeseries.bdp.writer.dal.DataType;
38+
import com.opendatahub.timeseries.bdp.writer.dal.Measurement;
39+
import com.opendatahub.timeseries.bdp.writer.dal.MeasurementAbstract;
40+
import com.opendatahub.timeseries.bdp.writer.dal.Station;
4241
import com.opendatahub.timeseries.bdp.writer.writer.Application;
4342
import com.opendatahub.timeseries.bdp.writer.writer.config.PersistenceConfig;
4443

4544
@SpringBootTest
4645
@Import(PersistenceConfig.class)
47-
@ContextConfiguration(classes=Application.class)
46+
@ContextConfiguration(classes = Application.class)
4847
public class DataRetrievalITTest extends WriterSetupTest {
4948

5049
@Test
@@ -75,14 +74,13 @@ public void testSyncStations() {
7574
List<StationDto> dtos = new ArrayList<StationDto>();
7675
dtos.add(s);
7776
ResponseEntity<Object> result = dataManager.syncStations(
78-
PREFIX + "EnvironmentStation",
79-
dtos,
80-
null,
81-
"testProvenance",
82-
"testProvenanceVersion",
83-
true,
84-
false
85-
);
77+
PREFIX + "EnvironmentStation",
78+
dtos,
79+
null,
80+
"testProvenance",
81+
"testProvenanceVersion",
82+
true,
83+
false);
8684
assertEquals(HttpStatus.CREATED, result.getStatusCode());
8785
}
8886

@@ -128,23 +126,25 @@ public void testDuplicateStations() {
128126
dtos.add(new StationDto(PREFIX + "WRITER", "Some name 1", null, null));
129127
dtos.add(new StationDto(PREFIX + "WRITER", "Some name 2", null, null));
130128
ResponseEntity<Object> result = dataManager.syncStations(
131-
STATION_TYPE,
132-
dtos,
133-
null,
134-
"testProvenance",
135-
"testProvenanceVersion",
136-
true,
137-
false
138-
);
129+
STATION_TYPE,
130+
dtos,
131+
null,
132+
"testProvenance",
133+
"testProvenanceVersion",
134+
true,
135+
false);
139136
assertEquals(HttpStatus.CREATED, result.getStatusCode());
140137
}
141138

142139
@Test
143140
public void testDuplicateMeasurements() {
144141
List<RecordDtoImpl> values = new ArrayList<>();
145-
values.add(new SimpleRecordDto(measurementOld.getTimestamp().getTime(), measurementOld.getValue(), measurementOld.getPeriod()));
146-
values.add(new SimpleRecordDto(measurement.getTimestamp().getTime(), measurement.getValue(), measurement.getPeriod()));
147-
values.add(new SimpleRecordDto(measurementOld.getTimestamp().getTime(), measurementOld.getValue(), measurementOld.getPeriod()));
142+
values.add(new SimpleRecordDto(measurementOld.getTimestamp().getTime(), measurementOld.getValue(),
143+
measurementOld.getPeriod()));
144+
values.add(new SimpleRecordDto(measurement.getTimestamp().getTime(), measurement.getValue(),
145+
measurement.getPeriod()));
146+
values.add(new SimpleRecordDto(measurementOld.getTimestamp().getTime(), measurementOld.getValue(),
147+
measurementOld.getPeriod()));
148148

149149
// Number measurements newer as the latest entry
150150
values.add(new SimpleRecordDto(measurement.getTimestamp().getTime() + 1000, 3.33, 1800));
@@ -159,10 +159,9 @@ public void testDuplicateMeasurements() {
159159
values.add(new SimpleRecordDto(measurement.getTimestamp().getTime() + 1000, new SingletonMap("a", 1), 1800));
160160

161161
ResponseEntity<Object> result = dataManager.pushRecords(
162-
STATION_TYPE,
163-
null,
164-
DataMapDto.build(provenance.getUuid(), station.getStationcode(), type.getCname(), values)
165-
);
162+
STATION_TYPE,
163+
null,
164+
DataMapDto.build(provenance.getUuid(), station.getStationcode(), type.getCname(), values));
166165
assertEquals(HttpStatus.CREATED, result.getStatusCode());
167166
}
168167

‎writer/src/test/java/com/opendatahub/timeseries/bdp/writer/WriterSetupTest.java

Lines changed: 61 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,26 @@
99
import java.util.Date;
1010
import java.util.List;
1111

12-
import jakarta.persistence.EntityManager;
13-
import jakarta.persistence.EntityManagerFactory;
14-
import jakarta.persistence.PersistenceUnit;
15-
1612
import org.junit.jupiter.api.AfterEach;
1713
import org.junit.jupiter.api.BeforeEach;
1814
import org.springframework.beans.factory.annotation.Autowired;
1915
import org.springframework.context.annotation.Import;
2016
import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
2117

18+
import com.opendatahub.timeseries.bdp.dto.dto.DataMapDto;
19+
import com.opendatahub.timeseries.bdp.dto.dto.RecordDtoImpl;
20+
import com.opendatahub.timeseries.bdp.dto.dto.SimpleRecordDto;
2221
import com.opendatahub.timeseries.bdp.writer.dal.DataType;
2322
import com.opendatahub.timeseries.bdp.writer.dal.Measurement;
2423
import com.opendatahub.timeseries.bdp.writer.dal.Provenance;
2524
import com.opendatahub.timeseries.bdp.writer.dal.Station;
26-
import com.opendatahub.timeseries.bdp.dto.dto.DataMapDto;
27-
import com.opendatahub.timeseries.bdp.dto.dto.RecordDtoImpl;
28-
import com.opendatahub.timeseries.bdp.dto.dto.SimpleRecordDto;
2925
import com.opendatahub.timeseries.bdp.writer.writer.DataManager;
3026
import com.opendatahub.timeseries.bdp.writer.writer.config.PersistenceConfig;
3127

28+
import jakarta.persistence.EntityManager;
29+
import jakarta.persistence.EntityManagerFactory;
30+
import jakarta.persistence.PersistenceUnit;
31+
3232
/**
3333
* Setup of the writer test cases with initial data, that will be added and
3434
* removed for each test.
@@ -79,8 +79,10 @@ public void setup() {
7979
provenance.setUuid("12345678");
8080

8181
List<RecordDtoImpl> values = new ArrayList<>();
82-
values.add(new SimpleRecordDto(measurement.getTimestamp().getTime(), measurement.getValue(), measurement.getPeriod()));
83-
values.add(new SimpleRecordDto(measurementOld.getTimestamp().getTime(), measurementOld.getValue(), measurementOld.getPeriod()));
82+
values.add(new SimpleRecordDto(measurement.getTimestamp().getTime(), measurement.getValue(),
83+
measurement.getPeriod()));
84+
values.add(new SimpleRecordDto(measurementOld.getTimestamp().getTime(), measurementOld.getValue(),
85+
measurementOld.getPeriod()));
8486

8587
try {
8688
em.getTransaction().begin();
@@ -89,10 +91,9 @@ public void setup() {
8991
em.persist(provenance);
9092
em.getTransaction().commit();
9193
dataManager.pushRecords(
92-
STATION_TYPE,
93-
null,
94-
DataMapDto.build(provenance.getUuid(), station.getStationcode(), type.getCname(), values)
95-
);
94+
STATION_TYPE,
95+
null,
96+
DataMapDto.build(provenance.getUuid(), station.getStationcode(), type.getCname(), values));
9697
} catch (Exception e) {
9798
em.getTransaction().rollback();
9899
if (em.isOpen()) {
@@ -112,23 +113,55 @@ public void cleanup() {
112113
em = entityManagerFactory.createEntityManager();
113114
try {
114115
em.getTransaction().begin();
115-
em.createQuery("DELETE FROM Measurement WHERE station.id IN (SELECT id FROM Station WHERE stationcode LIKE '" + PREFIX + "%')").executeUpdate();
116-
em.createQuery("DELETE FROM Measurement WHERE type.id IN (SELECT id FROM DataType WHERE cname LIKE '" + PREFIX + "%')").executeUpdate();
117-
em.createQuery("DELETE FROM MeasurementHistory WHERE station.id IN (SELECT id FROM Station WHERE stationcode LIKE '" + PREFIX + "%')").executeUpdate();
118-
em.createQuery("DELETE FROM MeasurementHistory WHERE type.id IN (SELECT id FROM DataType WHERE cname LIKE '" + PREFIX + "%')").executeUpdate();
119-
em.createQuery("DELETE FROM MeasurementString WHERE station.id IN (SELECT id FROM Station WHERE stationcode LIKE '" + PREFIX + "%')").executeUpdate();
120-
em.createQuery("DELETE FROM MeasurementString WHERE type.id IN (SELECT id FROM DataType WHERE cname LIKE '" + PREFIX + "%')").executeUpdate();
121-
em.createQuery("DELETE FROM MeasurementStringHistory WHERE station.id IN (SELECT id FROM Station WHERE stationcode LIKE '" + PREFIX + "%')").executeUpdate();
122-
em.createQuery("DELETE FROM MeasurementStringHistory WHERE type.id IN (SELECT id FROM DataType WHERE cname LIKE '" + PREFIX + "%')").executeUpdate();
123-
em.createQuery("DELETE FROM MeasurementJSON WHERE station.id IN (SELECT id FROM Station WHERE stationcode LIKE '" + PREFIX + "%')").executeUpdate();
124-
em.createQuery("DELETE FROM MeasurementJSON WHERE type.id IN (SELECT id FROM DataType WHERE cname LIKE '" + PREFIX + "%')").executeUpdate();
125-
em.createQuery("DELETE FROM MeasurementJSONHistory WHERE station.id IN (SELECT id FROM Station WHERE stationcode LIKE '" + PREFIX + "%')").executeUpdate();
126-
em.createQuery("DELETE FROM MeasurementJSONHistory WHERE type.id IN (SELECT id FROM DataType WHERE cname LIKE '" + PREFIX + "%')").executeUpdate();
127-
em.createQuery("UPDATE Station SET metaData = NULL WHERE stationcode LIKE '" + PREFIX + "%'").executeUpdate();
128-
em.createQuery("DELETE FROM MetaData WHERE station.id IN (SELECT id FROM Station WHERE stationcode LIKE '" + PREFIX + "%')").executeUpdate();
116+
em.createQuery(
117+
"DELETE FROM Measurement WHERE station.id IN (SELECT id FROM Station WHERE stationcode LIKE '"
118+
+ PREFIX + "%')")
119+
.executeUpdate();
120+
em.createQuery("DELETE FROM Measurement WHERE type.id IN (SELECT id FROM DataType WHERE cname LIKE '"
121+
+ PREFIX + "%')").executeUpdate();
122+
em.createQuery(
123+
"DELETE FROM MeasurementHistory WHERE station.id IN (SELECT id FROM Station WHERE stationcode LIKE '"
124+
+ PREFIX + "%')")
125+
.executeUpdate();
126+
em.createQuery("DELETE FROM MeasurementHistory WHERE type.id IN (SELECT id FROM DataType WHERE cname LIKE '"
127+
+ PREFIX + "%')").executeUpdate();
128+
em.createQuery(
129+
"DELETE FROM MeasurementString WHERE station.id IN (SELECT id FROM Station WHERE stationcode LIKE '"
130+
+ PREFIX + "%')")
131+
.executeUpdate();
132+
em.createQuery("DELETE FROM MeasurementString WHERE type.id IN (SELECT id FROM DataType WHERE cname LIKE '"
133+
+ PREFIX + "%')").executeUpdate();
134+
em.createQuery(
135+
"DELETE FROM MeasurementStringHistory WHERE station.id IN (SELECT id FROM Station WHERE stationcode LIKE '"
136+
+ PREFIX + "%')")
137+
.executeUpdate();
138+
em.createQuery(
139+
"DELETE FROM MeasurementStringHistory WHERE type.id IN (SELECT id FROM DataType WHERE cname LIKE '"
140+
+ PREFIX + "%')")
141+
.executeUpdate();
142+
em.createQuery(
143+
"DELETE FROM MeasurementJSON WHERE station.id IN (SELECT id FROM Station WHERE stationcode LIKE '"
144+
+ PREFIX + "%')")
145+
.executeUpdate();
146+
em.createQuery("DELETE FROM MeasurementJSON WHERE type.id IN (SELECT id FROM DataType WHERE cname LIKE '"
147+
+ PREFIX + "%')").executeUpdate();
148+
em.createQuery(
149+
"DELETE FROM MeasurementJSONHistory WHERE station.id IN (SELECT id FROM Station WHERE stationcode LIKE '"
150+
+ PREFIX + "%')")
151+
.executeUpdate();
152+
em.createQuery(
153+
"DELETE FROM MeasurementJSONHistory WHERE type.id IN (SELECT id FROM DataType WHERE cname LIKE '"
154+
+ PREFIX + "%')")
155+
.executeUpdate();
156+
em.createQuery("UPDATE Station SET metaData = NULL WHERE stationcode LIKE '" + PREFIX + "%'")
157+
.executeUpdate();
158+
em.createQuery("DELETE FROM MetaData WHERE station.id IN (SELECT id FROM Station WHERE stationcode LIKE '"
159+
+ PREFIX + "%')").executeUpdate();
129160
em.createQuery("DELETE FROM Station WHERE stationcode LIKE '" + PREFIX + "%'").executeUpdate();
130161
em.createQuery("DELETE FROM DataType WHERE cname LIKE '" + PREFIX + "%'").executeUpdate();
131-
em.createQuery("DELETE FROM Event WHERE provenance.id = (select id from Provenance where dataCollector = 'writer-integration-tests')").executeUpdate();
162+
em.createQuery(
163+
"DELETE FROM Event WHERE provenance.id = (select id from Provenance where dataCollector = 'writer-integration-tests')")
164+
.executeUpdate();
132165
em.createQuery("DELETE FROM Provenance WHERE dataCollector = 'writer-integration-tests'").executeUpdate();
133166
em.getTransaction().commit();
134167
} catch (Exception e) {

‎writer/src/test/java/com/opendatahub/timeseries/bdp/writer/dal/PersistenceIT.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,20 @@
1818

1919
import com.opendatahub.timeseries.bdp.writer.writer.Application;
2020
import com.opendatahub.timeseries.bdp.writer.writer.config.PersistenceConfig;
21+
2122
import jakarta.persistence.EntityManager;
2223
import jakarta.persistence.EntityManagerFactory;
2324
import jakarta.persistence.PersistenceUnit;
2425

2526
@DataJpaTest
2627
@Import(PersistenceConfig.class)
27-
@ContextConfiguration(classes=Application.class)
28-
public class PersistenceIT{
28+
@ContextConfiguration(classes = Application.class)
29+
public class PersistenceIT {
2930

3031
@PersistenceUnit
3132
private EntityManagerFactory entityManagerFactory;
3233

33-
private Map<String,Object> map = new HashMap<>();
34+
private Map<String, Object> map = new HashMap<>();
3435

3536
@BeforeEach
3637
public void setup() {
@@ -40,8 +41,8 @@ public void setup() {
4041
@Test
4142
public void testSyncTypes() {
4243
EntityManager em = entityManagerFactory.createEntityManager();
43-
DataType type = new DataType("customType-2","customUnit","customDescription","customRType");
44-
DataTypeMetaData metadata = new DataTypeMetaData(type,map);
44+
DataType type = new DataType("customType-2", "customUnit", "customDescription", "customRType");
45+
DataTypeMetaData metadata = new DataTypeMetaData(type, map);
4546
type.setMetaData(metadata);
4647
type.getMetaDataHistory().add(metadata);
4748
em.persist(type);

‎writer/src/test/java/com/opendatahub/timeseries/bdp/writer/dal/UtilityTest.java

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,14 @@
88
import static org.junit.jupiter.api.Assertions.assertEquals;
99
import static org.junit.jupiter.api.Assertions.fail;
1010

11-
import com.opendatahub.timeseries.bdp.writer.dal.util.PropertiesWithEnv;
12-
import com.opendatahub.timeseries.bdp.dto.dto.EventDto;
1311
import java.time.LocalDateTime;
1412
import java.time.ZoneId;
13+
1514
import org.junit.jupiter.api.Test;
1615

16+
import com.opendatahub.timeseries.bdp.dto.dto.EventDto;
17+
import com.opendatahub.timeseries.bdp.writer.dal.util.PropertiesWithEnv;
18+
1719
public class UtilityTest {
1820

1921
@Test
@@ -45,28 +47,23 @@ public void testRangeCasting() {
4547
LocalDateTime startTime = LocalDateTime.of(2021, 5, 12, 4, 20);
4648
LocalDateTime endTime = LocalDateTime.of(2021, 5, 12, 6, 20);
4749
dto.setEventStart(
48-
startTime.atZone(ZoneId.systemDefault()).toEpochSecond() * 1000
49-
);
50+
startTime.atZone(ZoneId.systemDefault()).toEpochSecond() * 1000);
5051
dto.setEventEnd(
51-
endTime.atZone(ZoneId.systemDefault()).toEpochSecond() * 1000
52-
);
52+
endTime.atZone(ZoneId.systemDefault()).toEpochSecond() * 1000);
5353
assertEquals(
54-
"[2021-05-12 04:20:00.000000,2021-05-12 06:20:00.000001)",
55-
dto.getEventIntervalAsString()
56-
);
54+
"[2021-05-12 04:20:00.000000,2021-05-12 06:20:00.000001)",
55+
dto.getEventIntervalAsString());
5756
}
5857

5958
@Test
6059
public void testRangeCastingInfinity() {
6160
EventDto dto = new EventDto();
6261
LocalDateTime startTime = LocalDateTime.of(2021, 5, 12, 4, 20);
6362
dto.setEventStart(
64-
startTime.atZone(ZoneId.systemDefault()).toEpochSecond() * 1000
65-
);
63+
startTime.atZone(ZoneId.systemDefault()).toEpochSecond() * 1000);
6664
dto.setEventEnd(null);
6765
assertEquals(
68-
"[2021-05-12 04:20:00.000000,)",
69-
dto.getEventIntervalAsString()
70-
);
66+
"[2021-05-12 04:20:00.000000,)",
67+
dto.getEventIntervalAsString());
7168
}
7269
}

0 commit comments

Comments
 (0)