Skip to content

Commit

Permalink
Avoid !!omap in repositories parameters #9 - test update
Browse files Browse the repository at this point in the history
  • Loading branch information
host6 committed Jan 6, 2018
1 parent d643a38 commit c49a9c4
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 24 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.google.common.io.Resources;
import org.junit.Before;
import org.junit.Test;
import org.scm4j.commons.URLContentLoader;
import org.scm4j.releaser.exceptions.EComponentConfigNoUrl;

import java.io.File;
Expand All @@ -17,12 +18,15 @@ public class VCSRepositoryFactoryTest {

@Before
public void setUp() throws Exception {
File ccFile = new File(Resources.getResource(this.getClass(), "urls-omap.yml").toURI());
File urlsMapping = new File(Resources.getResource(this.getClass(), "urls-mapping.yml").toURI());
File urlsSeq = new File(Resources.getResource(this.getClass(), "urls-sequence.yml").toURI());
File urlsSeqOmap = new File(Resources.getResource(this.getClass(), "urls-sequence-omap.yml").toURI());
File credsFile = new File(Resources.getResource(this.getClass(), "creds.yml").toURI());
IConfigUrls configUrls = new IConfigUrls() {
@Override
public String getCCUrls() {
return ccFile.toString();
return urlsMapping.toString() + URLContentLoader.URL_SEPARATOR +
urlsSeq.toString() + URLContentLoader.URL_SEPARATOR + urlsSeqOmap.toString();
}

@Override
Expand Down
8 changes: 8 additions & 0 deletions src/test/resources/org/scm4j/releaser/conf/urls-mapping.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
artA1|artA2:
url: http://url.com/svn/prjA
my(.*):
url: http://localhost/git/myProj$1
type: git
releaseBranchPrefix: B
developBranch: dev
releaseCommand: gradlew
22 changes: 0 additions & 22 deletions src/test/resources/org/scm4j/releaser/conf/urls-omap.yml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
!!omap
- svn1:
url: http://localhost/myProj
type: subversion
- ~:
url: https://github.com/qwerty/$0
type: svn
developBranch: branches/
6 changes: 6 additions & 0 deletions src/test/resources/org/scm4j/releaser/conf/urls-sequence.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
- git1:
url: http://localhost/git/myProj.git
type: null
- git2:
url: http://localhost/git/myProj
type: null

0 comments on commit c49a9c4

Please sign in to comment.