Skip to content

Commit 8ffdfe9

Browse files
thescouser89thescouser89
authored
Merge pull request #55 from thescouser89/tests
Start working on tests for dingrogu
2 parents 4361d2a + 7a9ede3 commit 8ffdfe9

File tree

14 files changed

+368
-6
lines changed

14 files changed

+368
-6
lines changed

‎api/src/main/java/org/jboss/pnc/dingrogu/api/dto/workflow/RepositoryCreationDTO.java

+5
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,18 @@
22

33
import lombok.Builder;
44
import lombok.Data;
5+
import org.jboss.pnc.api.enums.JobNotificationType;
56

67
@Data
78
@Builder
89
public class RepositoryCreationDTO {
910

11+
public String orchUrl;
1012
public String repourUrl;
13+
1114
public String externalRepoUrl;
1215
public String ref;
16+
public boolean preBuildSyncEnabled;
17+
public JobNotificationType jobNotificationType;
1318

1419
}

‎common/pom.xml

+10
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,16 @@
3535
<groupId>org.jboss.pnc</groupId>
3636
<artifactId>common</artifactId>
3737
</dependency>
38+
<dependency>
39+
<groupId>io.quarkus</groupId>
40+
<artifactId>quarkus-junit5</artifactId>
41+
<scope>test</scope>
42+
</dependency>
43+
<dependency>
44+
<groupId>org.assertj</groupId>
45+
<artifactId>assertj-core</artifactId>
46+
<scope>test</scope>
47+
</dependency>
3848
</dependencies>
3949

4050
<build>

‎common/src/main/java/org/jboss/pnc/dingrogu/common/GitUrlParser.java

+8-3
Original file line numberDiff line numberDiff line change
@@ -122,19 +122,21 @@ public static String generateInternalGitRepoName(String externalUrl) {
122122
} else {
123123
return repository;
124124
}
125-
} else {
125+
} else if (externalUrl.contains("/")) {
126126
String[] a = externalUrl.split("/");
127127
if (a.length != 0) {
128128
return a[a.length - 1];
129129
} else {
130130
return null;
131131
}
132+
} else {
133+
return null;
132134
}
133135
}
134136

135137
/**
136-
* Transforms the readwrite SCM url to the readoonly one. It assumes we are using Gerrit with git+ssh protocol in
137-
* url or GitLab with SCP-like git url format.
138+
* Transforms the readwrite SCM url to the readonly one. It assumes we are using Gerrit with git+ssh protocol in url
139+
* or GitLab with SCP-like git url format.
138140
*
139141
* For Gerrit it replaces the protocol for "https" and adds "/gerrit" as the first path element.
140142
*
@@ -151,6 +153,9 @@ public static String scmRepoURLReadOnly(String scmUrl) {
151153
// Gerrit
152154
try {
153155
URI uri = new URI(scmUrl);
156+
if (uri.getHost() == null || uri.getPath() == null) {
157+
return null;
158+
}
154159
return "https" + "://" + uri.getHost() + "/gerrit" + uri.getPath();
155160

156161
} catch (URISyntaxException e) {

‎common/src/main/java/org/jboss/pnc/dingrogu/common/NotificationHelper.java

+8-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public class NotificationHelper {
1313
* "Not really running" (like WAITING) to a final state since that task didn't do anything
1414
*
1515
* @param notificationRequest notificationRequest
16-
* @return
16+
* @return boolean
1717
*/
1818
public static boolean isFromRunningToFinal(NotificationRequest notificationRequest) {
1919
State stateBefore = notificationRequest.getBefore();
@@ -27,6 +27,13 @@ public static boolean isFromRunningToFinal(NotificationRequest notificationReque
2727
return stateAfter.isFinal();
2828
}
2929

30+
/**
31+
* Figure out if all rex tasks are now in a final state
32+
*
33+
* @param tasks collection of Rex tasks
34+
*
35+
* @return boolean
36+
*/
3037
public static boolean areAllRexTasksInFinalState(Collection<TaskDTO> tasks) {
3138
return tasks.stream().allMatch(task -> task.getState().isFinal());
3239
}

‎common/src/main/java/org/jboss/pnc/dingrogu/common/TaskHelper.java

+5
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ public class TaskHelper {
1313
private static final Request.Header JSON_HEADER = new Request.Header("Content-Type", MediaType.APPLICATION_JSON);
1414
private static final Request.Header ACCEPT_JSON_HEADER = new Request.Header("Accept", MediaType.APPLICATION_JSON);
1515

16+
/**
17+
* Get a list of HTTP headers to add to a request based on the MDC values for that task
18+
*
19+
* @return list of headers
20+
*/
1621
public static List<Request.Header> getHTTPHeaders() {
1722

1823
List<Request.Header> headers = new ArrayList<>();

‎common/src/test/java/org/jboss/pnc/dingrogu/common/ConstantsTest.java

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
package org.jboss.pnc.dingrogu.common;
2+
3+
import org.junit.jupiter.api.Test;
4+
5+
import static org.assertj.core.api.Assertions.assertThat;
6+
7+
class ConstantsTest {
8+
9+
@Test
10+
void checkIfAllVariablesSubstituted() {
11+
assertThat(Constants.BUILD_TIME).doesNotContain("@");
12+
assertThat(Constants.COMMIT_HASH).doesNotContain("@");
13+
assertThat(Constants.DINGROGU_VERSION).doesNotContain("@");
14+
}
15+
16+
}

‎common/src/test/java/org/jboss/pnc/dingrogu/common/GitUrlParserTest.java

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
package org.jboss.pnc.dingrogu.common;
2+
3+
import org.junit.jupiter.api.Test;
4+
5+
import static org.assertj.core.api.Assertions.assertThat;
6+
import static org.junit.jupiter.api.Assertions.*;
7+
8+
class GitUrlParserTest {
9+
10+
@Test
11+
void generateInternalGitRepoName() {
12+
String gitRepository = "[email protected]:project-ncl/dingrogu";
13+
assertThat(GitUrlParser.generateInternalGitRepoName(gitRepository)).isEqualTo("project-ncl/dingrogu");
14+
15+
String gitRepository2 = "https://github.com/project-ncl/dingrogu.git";
16+
assertThat(GitUrlParser.generateInternalGitRepoName(gitRepository2)).isEqualTo("project-ncl/dingrogu");
17+
18+
String badGitRepository = "hellohub";
19+
assertThat(GitUrlParser.generateInternalGitRepoName(badGitRepository)).isNull();
20+
}
21+
22+
@Test
23+
void scmRepoURLReadOnly() {
24+
String readwriteUrlGitlab = "[email protected]:project-ncl/bpm.git";
25+
String readonlyUrlGitlab = "https://gitlab.com/project-ncl/bpm.git";
26+
assertThat(GitUrlParser.scmRepoURLReadOnly(readwriteUrlGitlab)).isEqualTo(readonlyUrlGitlab);
27+
28+
String badReadwriteUrlGitlab = "safdltgitlacomproject-ncl";
29+
assertThat(GitUrlParser.scmRepoURLReadOnly(badReadwriteUrlGitlab)).isNull();
30+
}
31+
}

‎common/src/test/java/org/jboss/pnc/dingrogu/common/NotificationHelperTest.java

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
package org.jboss.pnc.dingrogu.common;
2+
3+
import org.jboss.pnc.rex.common.enums.State;
4+
import org.jboss.pnc.rex.dto.TaskDTO;
5+
import org.jboss.pnc.rex.model.requests.NotificationRequest;
6+
import org.junit.jupiter.api.Test;
7+
8+
import java.util.List;
9+
10+
import static org.assertj.core.api.Assertions.*;
11+
12+
class NotificationHelperTest {
13+
14+
@Test
15+
void areAllTasksInFinalState() {
16+
TaskDTO taskDTONotFinished = TaskDTO.builder().state(State.UP).build();
17+
TaskDTO taskDTOFailed = TaskDTO.builder().state(State.FAILED).build();
18+
TaskDTO taskDTOStopped = TaskDTO.builder().state(State.STOPPED).build();
19+
TaskDTO taskDTOStopping = TaskDTO.builder().state(State.STOPPING).build();
20+
assertThat(NotificationHelper.areAllRexTasksInFinalState(List.of(taskDTONotFinished))).isFalse();
21+
assertThat(NotificationHelper.areAllRexTasksInFinalState(List.of(taskDTONotFinished, taskDTOStopped)))
22+
.isFalse();
23+
assertThat(NotificationHelper.areAllRexTasksInFinalState(List.of(taskDTONotFinished, taskDTOStopping)))
24+
.isFalse();
25+
26+
assertThat(NotificationHelper.areAllRexTasksInFinalState(List.of(taskDTOFailed, taskDTOStopped))).isTrue();
27+
}
28+
29+
@Test
30+
void isFromRunningToFinal() {
31+
NotificationRequest upToSuccessful = NotificationRequest.builder()
32+
.before(State.UP)
33+
.after(State.SUCCESSFUL)
34+
.build();
35+
NotificationRequest startingToSuccessful = NotificationRequest.builder()
36+
.before(State.STARTING)
37+
.after(State.SUCCESSFUL)
38+
.build();
39+
NotificationRequest startingToUp = NotificationRequest.builder().before(State.STARTING).after(State.UP).build();
40+
41+
assertThat(NotificationHelper.isFromRunningToFinal(upToSuccessful)).isTrue();
42+
assertThat(NotificationHelper.isFromRunningToFinal(startingToSuccessful)).isTrue();
43+
assertThat(NotificationHelper.isFromRunningToFinal(startingToUp)).isFalse();
44+
}
45+
}

‎common/src/test/java/org/jboss/pnc/dingrogu/common/TaskHelperTest.java

+53
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
package org.jboss.pnc.dingrogu.common;
2+
3+
import org.jboss.pnc.api.constants.MDCHeaderKeys;
4+
import org.jboss.pnc.api.dto.Request;
5+
import org.junit.jupiter.api.Test;
6+
import org.slf4j.MDC;
7+
8+
import java.util.List;
9+
import java.util.Map;
10+
import java.util.Optional;
11+
12+
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
13+
import static org.junit.jupiter.api.Assertions.*;
14+
15+
class TaskHelperTest {
16+
17+
@Test
18+
void getHTTPHeadersBasic() {
19+
List<Request.Header> headers = TaskHelper.getHTTPHeaders();
20+
21+
Optional<Request.Header> headerContentType = headers.stream()
22+
.filter(header -> header.getName().equals("Content-Type"))
23+
.findAny();
24+
assertThat(headerContentType).isPresent();
25+
26+
Optional<Request.Header> headerAccept = headers.stream()
27+
.filter(header -> header.getName().equals("Accept"))
28+
.findAny();
29+
assertThat(headerAccept).isPresent();
30+
}
31+
32+
@Test
33+
void getHttpHeadersWithMdc() {
34+
Map<String, String> contextMap = Map.of(
35+
MDCHeaderKeys.USER_ID.getMdcKey(),
36+
"dustin",
37+
MDCHeaderKeys.PROCESS_CONTEXT.getMdcKey(),
38+
"process-context");
39+
MDC.setContextMap(contextMap);
40+
List<Request.Header> headers = TaskHelper.getHTTPHeaders();
41+
Optional<Request.Header> headerUserId = headers.stream()
42+
.filter(header -> header.getName().equals(MDCHeaderKeys.USER_ID.getHeaderName()))
43+
.findAny();
44+
assertThat(headerUserId).isPresent();
45+
assertThat(headerUserId.get().getValue()).isEqualTo("dustin");
46+
47+
Optional<Request.Header> headerProcessContext = headers.stream()
48+
.filter(header -> header.getName().equals(MDCHeaderKeys.PROCESS_CONTEXT.getHeaderName()))
49+
.findAny();
50+
assertThat(headerProcessContext).isPresent();
51+
assertThat(headerProcessContext.get().getValue()).isEqualTo("process-context");
52+
}
53+
}

‎pom.xml

+22
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,18 @@
186186
<artifactId>unirest-modules-jackson</artifactId>
187187
<version>4.4.5</version>
188188
</dependency>
189+
<dependency>
190+
<groupId>org.assertj</groupId>
191+
<artifactId>assertj-core</artifactId>
192+
<version>3.27.3</version>
193+
<scope>test</scope>
194+
</dependency>
195+
<dependency>
196+
<groupId>org.instancio</groupId>
197+
<artifactId>instancio-junit</artifactId>
198+
<version>5.3.0</version>
199+
<scope>test</scope>
200+
</dependency>
189201
</dependencies>
190202
</dependencyManagement>
191203
<repositories>
@@ -274,6 +286,16 @@
274286
<autoReleaseAfterClose>false</autoReleaseAfterClose>
275287
</configuration>
276288
</plugin>
289+
<plugin>
290+
<artifactId>maven-surefire-plugin</artifactId>
291+
<version>${surefire-plugin.version}</version>
292+
<configuration>
293+
<systemPropertyVariables>
294+
<java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
295+
<maven.home>${maven.home}</maven.home>
296+
</systemPropertyVariables>
297+
</configuration>
298+
</plugin>
277299
</plugins>
278300
</build>
279301
<profiles>

‎rest-adapter/pom.xml

+25
Original file line numberDiff line numberDiff line change
@@ -62,5 +62,30 @@
6262
<groupId>org.jboss.pnc</groupId>
6363
<artifactId>common</artifactId>
6464
</dependency>
65+
<dependency>
66+
<groupId>io.quarkus</groupId>
67+
<artifactId>quarkus-junit5</artifactId>
68+
<scope>test</scope>
69+
</dependency>
70+
<dependency>
71+
<groupId>io.quarkus</groupId>
72+
<artifactId>quarkus-junit5-mockito</artifactId>
73+
<scope>test</scope>
74+
</dependency>
75+
<dependency>
76+
<groupId>org.assertj</groupId>
77+
<artifactId>assertj-core</artifactId>
78+
<scope>test</scope>
79+
</dependency>
80+
<dependency>
81+
<groupId>org.assertj</groupId>
82+
<artifactId>assertj-core</artifactId>
83+
<scope>test</scope>
84+
</dependency>
85+
<dependency>
86+
<groupId>org.instancio</groupId>
87+
<artifactId>instancio-junit</artifactId>
88+
<scope>test</scope>
89+
</dependency>
6590
</dependencies>
6691
</project>

‎rest-adapter/src/main/java/org/jboss/pnc/dingrogu/restadapter/adapter/ReqourAdjustAdapter.java

-2
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,6 @@ public void start(String correlationId, StartRequest startRequest) {
6161

6262
ReqourAdjustDTO reqourAdjustDTO = objectMapper.convertValue(startRequest.getPayload(), ReqourAdjustDTO.class);
6363

64-
String callbackUrl = AdapterEndpoint.getCallbackAdapterEndpoint(dingroguUrl, getAdapterName(), correlationId);
65-
6664
// Generate DTO to submit to Reqour
6765
InternalGitRepositoryUrl internalUrl = InternalGitRepositoryUrl.builder()
6866
.readonlyUrl(GitUrlParser.scmRepoURLReadOnly(reqourAdjustDTO.getScmRepoURL()))

0 commit comments

Comments
 (0)