Skip to content

Commit 9a303f1

Browse files
ahornacevladak
authored andcommitted
Move repositories to test resources
fixes #2244
1 parent a0fd478 commit 9a303f1

File tree

244 files changed

+90
-144
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

244 files changed

+90
-144
lines changed

opengrok-indexer/build.xml

Lines changed: 0 additions & 82 deletions
This file was deleted.

opengrok-indexer/pom.xml

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -343,26 +343,6 @@ Portions Copyright (c) 2020-2020, Lubos Kosco <[email protected]>.
343343
</executions>
344344
</plugin>
345345

346-
<plugin>
347-
<groupId>org.apache.maven.plugins</groupId>
348-
<artifactId>maven-antrun-plugin</artifactId>
349-
<version>3.0.0</version>
350-
<executions>
351-
<execution>
352-
<id>build-config-files</id>
353-
<phase>process-test-classes</phase>
354-
<goals>
355-
<goal>run</goal>
356-
</goals>
357-
<configuration>
358-
<target unless="skipTests">
359-
<ant target="-post-compile-test"/>
360-
</target>
361-
</configuration>
362-
</execution>
363-
</executions>
364-
</plugin>
365-
366346
<plugin>
367347
<groupId>org.apache.maven.plugins</groupId>
368348
<artifactId>maven-checkstyle-plugin</artifactId>

opengrok-indexer/src/test/java/org/opengrok/indexer/history/BitKeeperRepositoryTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public boolean accept(File dir, String name) {
6969
public void setUp() {
7070
try {
7171
testRepo = new TestRepository();
72-
testRepo.create(getClass().getResourceAsStream("repositories.zip"));
72+
testRepo.create(getClass().getResource("/repositories"));
7373
final File root = new File(testRepo.getSourceRoot(), "bitkeeper");
7474
bkRepo = (BitKeeperRepository) RepositoryFactory.getRepository(root);
7575
bkFiles = Arrays.asList(root.list(new BitKeeperFilenameFilter()));

opengrok-indexer/src/test/java/org/opengrok/indexer/history/BoundaryChangesetsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public class BoundaryChangesetsTest {
5353
@BeforeEach
5454
public void setUp() throws Exception {
5555
repositories = new TestRepository();
56-
repositories.create(getClass().getResourceAsStream("repositories.zip"));
56+
repositories.create(getClass().getResource("/repositories"));
5757

5858
File reposRoot = new File(repositories.getSourceRoot(), "git");
5959
Repository repo = RepositoryFactory.getRepository(reposRoot);

opengrok-indexer/src/test/java/org/opengrok/indexer/history/CVSRepositoryTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import java.io.FileOutputStream;
2929
import java.io.FileWriter;
3030
import java.io.IOException;
31+
import java.net.URISyntaxException;
3132
import java.nio.channels.FileChannel;
3233
import java.util.ArrayList;
3334
import java.util.Collections;
@@ -62,9 +63,9 @@ public class CVSRepositoryTest {
6263
* Set up a test repository. Should be called by the tests that need it. The
6364
* test repository will be destroyed automatically when the test finishes.
6465
*/
65-
private void setUpTestRepository() throws IOException {
66+
private void setUpTestRepository() throws IOException, URISyntaxException {
6667
repository = new TestRepository();
67-
repository.create(getClass().getResourceAsStream("repositories.zip"));
68+
repository.create(getClass().getResource("/repositories"));
6869

6970
// Checkout cvsrepo anew in order to get the CVS/Root files point to
7071
// the temporary directory rather than the OpenGrok workspace directory

opengrok-indexer/src/test/java/org/opengrok/indexer/history/FileHistoryCacheTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ class FileHistoryCacheTest {
9090
@BeforeEach
9191
public void setUp() throws Exception {
9292
repositories = new TestRepository();
93-
repositories.create(getClass().getResourceAsStream("repositories.zip"));
93+
repositories.create(getClass().getResource("/repositories"));
9494

9595
cache = new FileHistoryCache();
9696
cache.initialize();

opengrok-indexer/src/test/java/org/opengrok/indexer/history/GitRepositoryTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import java.io.IOException;
3030
import java.io.InputStream;
3131
import java.io.Writer;
32+
import java.net.URISyntaxException;
3233
import java.nio.file.Path;
3334
import java.nio.file.Paths;
3435
import java.util.Arrays;
@@ -76,8 +77,8 @@ public class GitRepositoryTest {
7677
private GitRepository instance;
7778

7879
@BeforeAll
79-
public static void setUpClass() throws IOException {
80-
repository.create(GitRepositoryTest.class.getResourceAsStream("repositories.zip"));
80+
public static void setUpClass() throws IOException, URISyntaxException {
81+
repository.create(GitRepositoryTest.class.getResource("/repositories"));
8182
}
8283

8384
@AfterAll

opengrok-indexer/src/test/java/org/opengrok/indexer/history/HistoryGuruTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public static void setUpClass() throws Exception {
7373
savedNestingMaximum = env.getNestingMaximum();
7474

7575
repository = new TestRepository();
76-
repository.create(HistoryGuru.class.getResourceAsStream("repositories.zip"));
76+
repository.create(HistoryGuru.class.getResource("/repositories"));
7777
RepositoryFactory.initializeIgnoredNames(env);
7878
FileUtilities.getAllFiles(new File(repository.getSourceRoot()),
7979
FILES, true);

opengrok-indexer/src/test/java/org/opengrok/indexer/history/MercurialIsWorkingTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public class MercurialIsWorkingTest {
4343

4444
@BeforeAll
4545
public static void setUpClass() throws Exception {
46-
repository.create(RepositoryFactoryTest.class.getResourceAsStream("repositories.zip"));
46+
repository.create(RepositoryFactoryTest.class.getResource("/repositories"));
4747
}
4848

4949
@AfterAll

opengrok-indexer/src/test/java/org/opengrok/indexer/history/MercurialRepositoryTest.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import java.io.File;
3535
import java.io.IOException;
3636
import java.io.InputStream;
37+
import java.net.URISyntaxException;
3738
import java.nio.file.Paths;
3839
import java.util.ArrayList;
3940
import java.util.Arrays;
@@ -84,13 +85,13 @@ public class MercurialRepositoryTest {
8485
* Set up a test repository. Should be called by the tests that need it. The
8586
* test repository will be destroyed automatically when the test finishes.
8687
*/
87-
private void setUpTestRepository() throws IOException {
88+
private void setUpTestRepository() throws IOException, URISyntaxException {
8889
repository = new TestRepository();
89-
repository.create(getClass().getResourceAsStream("repositories.zip"));
90+
repository.create(getClass().getResource("/repositories"));
9091
}
9192

9293
@BeforeEach
93-
public void setup() throws IOException {
94+
public void setup() throws IOException, URISyntaxException {
9495
setUpTestRepository();
9596
}
9697

0 commit comments

Comments
 (0)