Skip to content

Commit 5409797

Browse files
Wadecksanderv32
authored andcommitted
[SECURITY-1438] Adjust test due to Secret bound with Jenkins
1 parent 19fabf6 commit 5409797

File tree

2 files changed

+45
-28
lines changed

2 files changed

+45
-28
lines changed
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
package org.jenkinsci.plugins.gogs;
2+
3+
import hudson.util.Secret;
4+
import org.junit.Rule;
5+
import org.junit.Test;
6+
import org.jvnet.hudson.test.JenkinsRule;
7+
import org.slf4j.Logger;
8+
import org.slf4j.LoggerFactory;
9+
10+
import static org.junit.Assert.assertSame;
11+
12+
public class GogsWebHookJenkinsTest {
13+
final Logger log = LoggerFactory.getLogger(GogsWebHookJenkinsTest.class);
14+
15+
@Rule
16+
public JenkinsRule j = new JenkinsRule();
17+
18+
@Test
19+
public void whenJobBranchNotMatchMustReturnError() {
20+
Secret secret = Secret.fromString(null);
21+
String[][] test_vals = {
22+
{null, "master", "true"},
23+
{null, "dev", "true"},
24+
{"", "master", "true"},
25+
{"", "dev", "true"},
26+
{"*", "master", "true"},
27+
{"*", "dev", "true"},
28+
{"dev", "master", "false"},
29+
{"dev", "dev", "true"},
30+
{"master", "master", "true"},
31+
{"master", "dev", "false"},
32+
};
33+
34+
for (int i = 0; i < test_vals.length; ++i) {
35+
String filter = test_vals[i][0];
36+
String ref = test_vals[i][1];
37+
boolean ret = Boolean.parseBoolean(test_vals[i][2]);
38+
39+
GogsProjectProperty property = new GogsProjectProperty(secret, false, filter);
40+
assertSame(String.format("branch filter check failed for [%s -> %s]", ref, filter), ret, property.filterBranch(ref));
41+
}
42+
43+
log.info("Test succeeded.");
44+
}
45+
}

src/test/java/org/jenkinsci/plugins/gogs/GogsWebHookTest.java

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -234,34 +234,6 @@ public void whenUriDoesNotContainUrlNameMustReturnError() throws Exception {
234234
log.info("Test succeeded.");
235235
}
236236

237-
@Test
238-
public void whenJobBranchNotMatchMustReturnError() throws Exception {
239-
Secret secret = Secret.fromString(null);
240-
String[][] test_vals = {
241-
{null, "master", "true"},
242-
{null, "dev", "true"},
243-
{"", "master", "true"},
244-
{"", "dev", "true"},
245-
{"*", "master", "true"},
246-
{"*", "dev", "true"},
247-
{"dev", "master", "false"},
248-
{"dev", "dev", "true"},
249-
{"master", "master", "true"},
250-
{"master", "dev", "false"},
251-
};
252-
253-
for (int i = 0; i < test_vals.length; ++i) {
254-
String filter = test_vals[i][0];
255-
String ref = test_vals[i][1];
256-
boolean ret = Boolean.parseBoolean(test_vals[i][2]);
257-
258-
GogsProjectProperty property = new GogsProjectProperty(secret, false, filter);
259-
assertSame(String.format("branch filter check failed for [%s -> %s]", ref, filter), ret, property.filterBranch(ref));
260-
}
261-
262-
log.info("Test succeeded.");
263-
}
264-
265237
//
266238
// Helper methods
267239
//

0 commit comments

Comments
 (0)