Skip to content

Commit 2b79023

Browse files
mcanoymcanoy
committed
fix up tests
1 parent d0adb4a commit 2b79023

File tree

7 files changed

+95
-30
lines changed

7 files changed

+95
-30
lines changed

‎src/main/java/com/redhat/labs/omp/service/EngagementService.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
@ApplicationScoped
3232
public class EngagementService {
33-
public static Logger LOGGER = LoggerFactory.getLogger(EngagementService.class);
33+
public static final Logger LOGGER = LoggerFactory.getLogger(EngagementService.class);
3434

3535
private static final String ENGAGEMENT_PROJECT_NAME = "iac";
3636
private static final String DEFAULT_BRANCH = "master";
@@ -94,7 +94,7 @@ public Project createEngagement(Engagement engagement, String author, String aut
9494
authorEmail, project.isFirst());
9595

9696
if (LOGGER.isDebugEnabled()) {
97-
commit.getActions().stream().forEach(file -> LOGGER.debug("Action File path :: " + file.getFilePath()));
97+
commit.getActions().stream().forEach(file -> LOGGER.debug("Action File path :: {}", file.getFilePath()));
9898
}
9999

100100
// send commit to gitlab
@@ -125,7 +125,7 @@ public List<Hook> getHooks(String customer, String engagment) {
125125
return hookService.getProjectHooks(project.get().getId());
126126
}
127127

128-
return new ArrayList<Hook>();
128+
return new ArrayList<>();
129129
}
130130

131131
public Response createHook(String customerName, String engagementName, Hook hook) {
@@ -145,7 +145,7 @@ public Response createHook(String customerName, String engagementName, Hook hook
145145

146146
public Status getProjectStatus(String customerName, String engagementName) {
147147
Status status = null;
148-
Optional<File> file = fileService.getFile(this.getPath(customerName, engagementName), "status.json");
148+
Optional<File> file = fileService.getFile(this.getPath(customerName, engagementName), STATUS_FILE);
149149
if(file.isPresent()) {
150150
status = json.fromJson(file.get().getContent(), Status.class);
151151
}

‎src/main/java/com/redhat/labs/omp/utils/EncodingUtils.java‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,8 @@
77
import java.util.Base64;
88

99
public class EncodingUtils {
10-
11-
public static boolean isDecodable(String val) {
12-
13-
try {
14-
Base64.getDecoder().decode(val.getBytes());
15-
} catch (IllegalArgumentException iae) {
16-
return false;
17-
}
18-
19-
return true;
20-
21-
}
10+
11+
private EncodingUtils() {}
2212

2313
public static byte[] base64Encode(byte[] src) {
2414
return Base64.getEncoder().encode(src);

‎src/test/java/com/redhat/labs/omp/mocks/MockGitLabService.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,9 @@ public void deleteFile(Integer projectId, String filePath, File file) {
222222

223223
@Override
224224
public Response commitMultipleFiles(Integer projectId, CommitMultiple commit) {
225-
// TODO: need to be able to have negative scenarios
225+
if("[email protected]".equals(commit.getAuthorEmail())) {
226+
return Response.ok().build();
227+
}
226228
return Response.status(201).build();
227229
}
228230

‎src/test/java/com/redhat/labs/omp/resource/ConfigResourceTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@
99
import io.restassured.http.ContentType;
1010

1111
@QuarkusTest
12-
public class ConfigResourceTest {
12+
class ConfigResourceTest {
1313

1414
@Test
15-
public void testGetConfigFileSuccess() {
15+
void testGetConfigFileSuccess() {
1616

1717
given().when().contentType(ContentType.JSON).get("/api/v1/config").then().statusCode(200).body(is(
1818
"{\"content\":\"---\\nproviders:\\n- label: AWS\\n value: ec2\\n regions:\\n - label: US East 1 (N. Virginia)\\n value: us-east-1\\n - label: US East 2 (Ohio)\\n value: us-east-2\\nopenshift:\\n versions:\\n - label: v4.1\\n value: 4.1.31\\n - label: v4.2\\n value: 4.2.16\\n - label: v4.3\\n value: 4.3.0\\n persistent-storage:\\n - label: None\\n value: none\\n - label: 50GB\\n value: 50G\\n - label: 100GB\\n value: 100G\\n - label: 250GB\\n value: 250G\\n - label: 500GB\\n value: 500G\\n cluster-size:\\n - label: Small\\n value: small\\nuser-management:\\n rbac:\\n roles:\\n - label: Developer \\n value: developer\\n - label: Observer \\n value: observer\\n - label: Admin \\n value: admin\\n\",\"encoding\":\"base64\",\"file_path\":\"schema/config.yml\"}"));
1919

2020
}
2121

2222
@Test
23-
public void testGetConfigFileSuccessV2() {
23+
void testGetConfigFileSuccessV2() {
2424

2525
given().when().contentType(ContentType.JSON).get("/api/v2/config").then().statusCode(200).body(is(
2626
"{\"providers\":[{\"label\":\"AWS\",\"value\":\"ec2\",\"regions\":[{\"label\":\"US East 1 (N. Virginia)\","
@@ -35,7 +35,7 @@ public void testGetConfigFileSuccessV2() {
3535
}
3636

3737
@Test
38-
public void testGetHookFileSuccess() {
38+
void testGetHookFileSuccess() {
3939

4040
given()
4141
.when()

‎src/test/java/com/redhat/labs/omp/resource/EngagementResourceTest.java‎

Lines changed: 30 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
import io.restassured.http.ContentType;
1212

1313
@QuarkusTest
14-
public class EngagementResourceTest {
14+
class EngagementResourceTest {
1515

1616

1717
@Test
18-
public void testGetAllEngagementsSuccess() {
18+
void testGetAllEngagementsSuccess() {
1919

2020
given()
2121
.when()
@@ -33,7 +33,7 @@ public void testGetAllEngagementsSuccess() {
3333
}
3434

3535
@Test
36-
public void testCreateEngagementSuccess() {
36+
void testCreateEngagementSuccess() {
3737
given()
3838
.when()
3939
.contentType(ContentType.JSON)
@@ -46,7 +46,7 @@ public void testCreateEngagementSuccess() {
4646
}
4747

4848
@Test
49-
public void testUpdateEngagementSuccess() {
49+
void testUpdateEngagementSuccess() {
5050
given()
5151
.when()
5252
.contentType(ContentType.JSON)
@@ -59,7 +59,7 @@ public void testUpdateEngagementSuccess() {
5959
}
6060

6161
@Test
62-
public void testGetWebhooksSuccess() {
62+
void testGetWebhooksSuccess() {
6363
given()
6464
.when()
6565
.contentType(ContentType.JSON)
@@ -71,7 +71,7 @@ public void testGetWebhooksSuccess() {
7171
}
7272

7373
@Test
74-
public void testCreateProjectHookSuccess() {
74+
void testCreateProjectHookSuccess() {
7575
given()
7676
.when()
7777
.contentType(ContentType.JSON)
@@ -82,7 +82,29 @@ public void testCreateProjectHookSuccess() {
8282
}
8383

8484
@Test
85-
public void testGetStatusSuccess() {
85+
void testCreateProjectHookFailAlreadyExists() {
86+
given()
87+
.when()
88+
.contentType(ContentType.JSON)
89+
.body("{\"push_events\": true, \"url\": \"http://webhook.edu/hook\"}")
90+
.post("/api/v1/engagements/customer/jello/lemon/hooks")
91+
.then()
92+
.statusCode(400);
93+
}
94+
95+
@Test
96+
void testCreateProjectHookFailNoProject() {
97+
given()
98+
.when()
99+
.contentType(ContentType.JSON)
100+
.body("{\"push_events\": true, \"url\": \"https://lodestar/webhooks/blah\"}")
101+
.post("/api/v1/engagements/customer/nope/tutti-frutti/hooks")
102+
.then()
103+
.statusCode(400);
104+
}
105+
106+
@Test
107+
void testGetStatusSuccess() {
86108
given()
87109
.when()
88110
.contentType(ContentType.JSON)
@@ -94,7 +116,7 @@ public void testGetStatusSuccess() {
94116
}
95117

96118
@Test
97-
public void testGetProjectSuccess() {
119+
void testGetProjectSuccess() {
98120
given()
99121
.when()
100122
.contentType(ContentType.JSON)

‎src/test/java/com/redhat/labs/omp/service/EngagementServiceTest.java‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
package com.redhat.labs.omp.service;
2+
3+
import static org.junit.jupiter.api.Assertions.assertEquals;
4+
import static org.junit.jupiter.api.Assertions.assertNotNull;
5+
import static org.junit.jupiter.api.Assertions.assertThrows;
6+
7+
import java.util.List;
8+
9+
import javax.inject.Inject;
10+
11+
import org.junit.jupiter.api.Test;
12+
13+
import com.redhat.labs.exception.UnexpectedGitLabResponseException;
14+
import com.redhat.labs.omp.models.Engagement;
15+
import com.redhat.labs.omp.models.gitlab.Hook;
16+
17+
import io.quarkus.test.junit.QuarkusTest;
18+
19+
@QuarkusTest
20+
class EngagementServiceTest {
21+
22+
@Inject
23+
EngagementService engagementService;
24+
25+
@Test void testCreateEngagementGroupFail() {
26+
27+
Engagement e = Engagement.builder().customerName("customer").projectName("project").build();
28+
Exception exception = assertThrows(UnexpectedGitLabResponseException.class, () -> {
29+
engagementService.createEngagement(e, "Test Banana", "[email protected]");
30+
});
31+
32+
assertEquals("failed to create group", exception.getMessage());
33+
}
34+
35+
@Test void testCreateEngagementCommitFileFail() {
36+
37+
Engagement e = Engagement.builder().customerName("project1").projectName("project1").build();
38+
Exception exception = assertThrows(UnexpectedGitLabResponseException.class, () -> {
39+
engagementService.createEngagement(e, "Test Banana", "[email protected]");
40+
});
41+
42+
assertEquals("failed to commit files for engagement creation.", exception.getMessage());
43+
}
44+
45+
@Test void testGetHooksNone() {
46+
List<Hook> hooks = engagementService.getHooks("nope", "nada");
47+
assertNotNull(hooks);
48+
assertEquals(0, hooks.size());
49+
50+
}
51+
}

‎src/test/java/com/redhat/labs/omp/service/ProjectServiceTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import io.quarkus.test.junit.QuarkusTest;
1919

2020
@QuarkusTest
21-
public class ProjectServiceTest {
21+
class ProjectServiceTest {
2222

2323
@Inject
2424
ProjectService projectService;

0 commit comments

Comments
 (0)