Dark-Alex-17/ptp
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PAN-11 Fixed integration tests

Browse Source
This commit is contained in:
atusa17
2019-04-07 17:22:08 -06:00
parent 67f77d6c9e
commit 091215f1eb
3 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/src/integrationTest/java/edu/msudenver/tsp/services/ServicesTestConfig.java
-6
View File
@@ -14,10 +14,4 @@ public class ServicesTestConfig {
public UserService userService(final RestService restService) { public UserService userService(final RestService restService) {
return new UserService(restService); return new UserService(restService);
} }
@Bean
@Autowired
public DefinitionService definitionService(final RestService restService) {
return new DefinitionService(restService);
}
} }
services/src/integrationTest/resources/test.properties
+3 -3
View File
@@ -1,3 +1,3 @@
persistence.api.connection.timeout.milliseconds = 5000 persistence.api.connection.timeout.milliseconds=5000
persistence.api.socket.timeout.milliseconds = 10000 persistence.api.socket.timeout.milliseconds=10000
persistence.api.base.url = http://localhost:8090/ persistence.api.base.url=http://localhost:8090/
services/src/main/java/edu/msudenver/tsp/services/dto/Account.java
+3 -1
View File
@@ -4,6 +4,8 @@ import com.google.gson.annotations.SerializedName;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size; import javax.validation.constraints.Size;
import java.io.Serializable; import java.io.Serializable;
@@ -15,7 +17,7 @@ public class Account extends BaseDto implements Serializable {
@Size(max = 50) private String username; @Size(max = 50) private String username;
@Size(max = 256) private String password; @Size(max = 256) private String password;
@NotNull private boolean administrator; @NotNull private boolean administrator;
@SerializedName("last_login") private Date lastLogin; @Temporal(TemporalType.DATE) @SerializedName("last_login") private Date lastLogin;
private static final long serialVersionUID = 7095627971593953734L; private static final long serialVersionUID = 7095627971593953734L;
} }