Skip to content

Commit 87b13b2

Browse files
authored
Prepare to eventually remove ChildNameGenerator.CHILD_NAME_FILE (#512)
1 parent d1e8380 commit 87b13b2

File tree

1 file changed

+0
-11
lines changed

1 file changed

+0
-11
lines changed

src/test/java/integration/MigrationTest.java

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,10 @@
2525

2626
package integration;
2727

28-
import com.cloudbees.hudson.plugins.folder.ChildNameGenerator;
2928
import hudson.model.Job;
3029
import hudson.model.TopLevelItem;
3130
import integration.harness.BasicMultiBranchProjectFactory;
32-
import java.io.File;
3331
import java.io.IOException;
34-
import java.nio.charset.StandardCharsets;
3532
import java.util.Collections;
3633
import java.util.HashMap;
3734
import java.util.Map;
@@ -42,7 +39,6 @@
4239
import jenkins.scm.impl.mock.MockSCMController;
4340
import jenkins.scm.impl.mock.MockSCMDiscoverBranches;
4441
import jenkins.scm.impl.mock.MockSCMNavigator;
45-
import org.apache.commons.io.FileUtils;
4642
import org.apache.commons.io.IOUtils;
4743
import org.apache.commons.lang.StringUtils;
4844
import org.junit.AfterClass;
@@ -54,7 +50,6 @@
5450
import static org.hamcrest.MatcherAssert.assertThat;
5551
import static org.hamcrest.Matchers.containsInAnyOrder;
5652
import static org.hamcrest.Matchers.instanceOf;
57-
import static org.hamcrest.Matchers.is;
5853
import static org.hamcrest.Matchers.notNullValue;
5954

6055
public class MigrationTest {
@@ -228,13 +223,7 @@ private void assertDataMigrated(TopLevelItem foo) throws Exception {
228223
jobByName.put(j.getFullName(), j);
229224
jobByDirName.put(jobDirName, j);
230225
jobByDisplayName.put(j.getFullDisplayName(), j);
231-
File nameFile = new File(j.getRootDir(), ChildNameGenerator.CHILD_NAME_FILE);
232-
assertThat("Exists: " + nameFile, nameFile.isFile(), is(true));
233-
assertThat("Contents: " + nameFile, FileUtils.readFileToString(nameFile, StandardCharsets.UTF_8), is(j.getName()));
234226
}
235-
File nameFile = new File(p.getRootDir(), ChildNameGenerator.CHILD_NAME_FILE);
236-
assertThat("Exists: " + nameFile, nameFile.isFile(), is(true));
237-
assertThat("Contents: " + nameFile, FileUtils.readFileToString(nameFile, StandardCharsets.UTF_8), is(p.getName()));
238227
}
239228
assertThat("Display Names are repo names", byDisplayName.keySet(), containsInAnyOrder(
240229
"test.example.com",

0 commit comments

Comments
 (0)