Skip to content

Fix ignoreMissingOldVersion and NewVersion check #175

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
siom79 merged 1 commit into from
Sep 13, 2017
Merged

Fix ignoreMissingOldVersion and NewVersion check #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions japicmp/src/main/java/japicmp/versioning/VersionChange.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@ public VersionChange(List<SemanticVersion> oldVersions, List<SemanticVersion> ne

public Optional<SemanticVersion.ChangeType> computeChangeType() throws JApiCmpException {
if (this.oldVersions.isEmpty()) {
if (ignoreMissingOldVersion) {
if (!ignoreMissingOldVersion) {
throw new JApiCmpException(JApiCmpException.Reason.IllegalArgument, "Could not extract semantic version for at least one old version. Please " +
"follow the rules for semantic versioning.");
} else {
return Optional.absent();
}
}
if (this.newVersions.isEmpty()) {
if (ignoreMissingNewVersion) {
if (!ignoreMissingNewVersion) {
throw new JApiCmpException(JApiCmpException.Reason.IllegalArgument, "Could not extract semantic version for at least one new version. Please " +
"follow the rules for semantic versioning.");
} else {
Expand Down
29 changes: 22 additions & 7 deletions japicmp/src/test/java/japicmp/versioning/VersionChangeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,21 +74,36 @@ public void testTwoVersionsMajorChangeNotAllVersionsTheSameAndDifferentNumberofA
fail();
}

@Test
@Test(expected = JApiCmpException.class)
public void testMissingOldVersion() {
VersionChange vc = new VersionChange(Collections.singletonList(new SemanticVersion(1, 2, 3)), Collections.singletonList(new SemanticVersion(1, 2, 3)), true, false);
assertThat(vc.computeChangeType().get(), is(SemanticVersion.ChangeType.UNCHANGED));
VersionChange vc = new VersionChange(Collections.<SemanticVersion>emptyList(), Collections.singletonList(new SemanticVersion(1, 2, 3)), false, false);
vc.computeChangeType();
fail();
}

@Test
public void testIgnoreMissingOldVersion() {
VersionChange vc = new VersionChange(Collections.<SemanticVersion>emptyList(), Collections.singletonList(new SemanticVersion(1, 2, 3)), true, false);
assertThat(vc.computeChangeType().isPresent(), is(false));
}

@Test(expected = JApiCmpException.class)
public void testMissingNewVersion() {
VersionChange vc = new VersionChange(Collections.singletonList(new SemanticVersion(1, 2, 3)), Collections.singletonList(new SemanticVersion(1, 2, 3)), false, true);
assertThat(vc.computeChangeType().get(), is(SemanticVersion.ChangeType.UNCHANGED));
VersionChange vc = new VersionChange(Collections.singletonList(new SemanticVersion(1, 2, 3)), Collections.<SemanticVersion>emptyList(), false, false);
vc.computeChangeType();
fail();
}

@Test
public void testNoParameter() {
VersionChange vc = new VersionChange(new ArrayList<SemanticVersion>(), new ArrayList<SemanticVersion>(), false, false);
public void testIgnoreMissingNewVersion() {
VersionChange vc = new VersionChange(Collections.singletonList(new SemanticVersion(1, 2, 3)), Collections.<SemanticVersion>emptyList(), false, true);
assertThat(vc.computeChangeType().isPresent(), is(false));
}

@Test(expected = JApiCmpException.class)
public void testNoParameter() {
VersionChange vc = new VersionChange(Collections.<SemanticVersion>emptyList(), Collections.<SemanticVersion>emptyList(), false, false);
vc.computeChangeType();
fail();
}
}