Skip to content

Commit 8ac37e3

Browse files
goekaygoekay
committed
refactor tests
1 parent e653602 commit 8ac37e3

File tree

6 files changed

+19
-14
lines changed

6 files changed

+19
-14
lines changed

‎src/test/java/de/rwth/idsg/steve/ApplicationJsonTest.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package de.rwth.idsg.steve;
22

33
import de.rwth.idsg.steve.ocpp.OcppVersion;
4+
import de.rwth.idsg.steve.utils.OcppJsonChargePoint;
5+
import de.rwth.idsg.steve.utils.__DatabasePreparer__;
46
import lombok.extern.slf4j.Slf4j;
57
import ocpp.cs._2015._10.AuthorizationStatus;
68
import ocpp.cs._2015._10.AuthorizeRequest;
@@ -13,7 +15,7 @@
1315
import org.junit.BeforeClass;
1416
import org.junit.Test;
1517

16-
import static de.rwth.idsg.steve.Utils.getRandomString;
18+
import static de.rwth.idsg.steve.utils.Helpers.getRandomString;
1719

1820
/**
1921
* @author Sevket Goekay <goekay@dbis.rwth-aachen.de>

‎src/test/java/de/rwth/idsg/steve/ApplicationTest.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package de.rwth.idsg.steve;
22

3+
import de.rwth.idsg.steve.utils.__DatabasePreparer__;
34
import lombok.extern.slf4j.Slf4j;
45
import ocpp.cs._2010._08.AuthorizationStatus;
56
import ocpp.cs._2010._08.AuthorizeRequest;
@@ -13,11 +14,11 @@
1314
import org.junit.BeforeClass;
1415
import org.junit.Test;
1516

16-
import static de.rwth.idsg.steve.Utils.getForOcpp12;
17-
import static de.rwth.idsg.steve.Utils.getForOcpp15;
18-
import static de.rwth.idsg.steve.Utils.getForOcpp16;
19-
import static de.rwth.idsg.steve.Utils.getPath;
20-
import static de.rwth.idsg.steve.Utils.getRandomString;
17+
import static de.rwth.idsg.steve.utils.Helpers.getForOcpp12;
18+
import static de.rwth.idsg.steve.utils.Helpers.getForOcpp15;
19+
import static de.rwth.idsg.steve.utils.Helpers.getForOcpp16;
20+
import static de.rwth.idsg.steve.utils.Helpers.getPath;
21+
import static de.rwth.idsg.steve.utils.Helpers.getRandomString;
2122

2223
/**
2324
* @author Sevket Goekay <goekay@dbis.rwth-aachen.de>

‎src/test/java/de/rwth/idsg/steve/OperationalTestSoapOCPP16.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import de.rwth.idsg.steve.repository.dto.Reservation;
77
import de.rwth.idsg.steve.repository.dto.Transaction;
88
import de.rwth.idsg.steve.repository.dto.TransactionDetails;
9+
import de.rwth.idsg.steve.utils.__DatabasePreparer__;
910
import jooq.steve.db.tables.records.TransactionRecord;
1011
import lombok.extern.slf4j.Slf4j;
1112
import ocpp.cs._2015._10.AuthorizationStatus;
@@ -40,9 +41,9 @@
4041
import java.util.Arrays;
4142
import java.util.List;
4243

43-
import static de.rwth.idsg.steve.Utils.getForOcpp16;
44-
import static de.rwth.idsg.steve.Utils.getPath;
45-
import static de.rwth.idsg.steve.Utils.getRandomString;
44+
import static de.rwth.idsg.steve.utils.Helpers.getForOcpp16;
45+
import static de.rwth.idsg.steve.utils.Helpers.getPath;
46+
import static de.rwth.idsg.steve.utils.Helpers.getRandomString;
4647

4748
/**
4849
* @author Andreas Heuvels <andreas.heuvels@rwth-aachen.de>

src/test/java/de/rwth/idsg/steve/Utils.java renamed to src/test/java/de/rwth/idsg/steve/utils/Helpers.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package de.rwth.idsg.steve;
1+
package de.rwth.idsg.steve.utils;
22

33
import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
44
import org.apache.cxf.ws.addressing.WSAddressingFeature;
@@ -12,7 +12,7 @@
1212
* @author Andreas Heuvels <andreas.heuvels@rwth-aachen.de>
1313
* @since 06.04.18
1414
*/
15-
public class Utils {
15+
public class Helpers {
1616

1717
public static String getRandomString() {
1818
return UUID.randomUUID().toString();

src/test/java/de/rwth/idsg/steve/OcppJsonChargePoint.java renamed to src/test/java/de/rwth/idsg/steve/utils/OcppJsonChargePoint.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
package de.rwth.idsg.steve;
1+
package de.rwth.idsg.steve.utils;
22

33
import com.fasterxml.jackson.core.JsonParser;
44
import com.fasterxml.jackson.core.TreeNode;
55
import com.fasterxml.jackson.databind.JsonNode;
66
import com.fasterxml.jackson.databind.ObjectMapper;
7+
import de.rwth.idsg.steve.SteveException;
78
import de.rwth.idsg.steve.ocpp.OcppVersion;
89
import de.rwth.idsg.steve.ocpp.RequestType;
910
import de.rwth.idsg.steve.ocpp.ResponseType;
@@ -54,7 +55,7 @@ public class OcppJsonChargePoint {
5455
private CountDownLatch receivedResponsesSignal;
5556
private Session session;
5657

57-
OcppJsonChargePoint(OcppVersion version, String chargeBoxId, String pathPrefix) {
58+
public OcppJsonChargePoint(OcppVersion version, String chargeBoxId, String pathPrefix) {
5859
this.version = version;
5960
this.chargeBoxId = chargeBoxId;
6061
this.connectionPath = pathPrefix + chargeBoxId;

src/test/java/de/rwth/idsg/steve/__DatabasePreparer__.java renamed to src/test/java/de/rwth/idsg/steve/utils/__DatabasePreparer__.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package de.rwth.idsg.steve;
1+
package de.rwth.idsg.steve.utils;
22

33
import com.google.common.collect.Sets;
44
import de.rwth.idsg.steve.config.BeanConfiguration;

0 commit comments

Comments
 (0)