Skip to content

Commit 5d0eb6e

Browse files
author
Joel Mongård
committed
refactor: Improve naming
1 parent 8d24031 commit 5d0eb6e

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

src/main/kotlin/git/semver/plugin/semver/MutableSemVersion.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ internal class MutableSemVersion(
237237
bumpPre = 0
238238
}
239239

240-
fun toSemVersion(): SemInfoVersion {
240+
fun toSemInfoVersion(): SemInfoVersion {
241241
return SemInfoVersion(sha, major, minor, patch, preRelease, commitCount, initialVersion)
242242
}
243243

src/main/kotlin/git/semver/plugin/semver/VersionFinder.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class VersionFinder(private val settings: SemverSettings, private val tags: Map<
1616
if (!semVersion.isPreRelease && updated) {
1717
semVersion.setPreRelease(PreRelease.parse(defaultPreRelease))
1818
}
19-
return semVersion.toSemVersion()
19+
return semVersion.toSemInfoVersion()
2020
}
2121

2222
fun getReleaseVersion(commit: Commit, newPreRelease: String?): SemInfoVersion {
@@ -27,7 +27,7 @@ class VersionFinder(private val settings: SemverSettings, private val tags: Map<
2727
if (newPreRelease != null) {
2828
semVersion.setPreRelease(PreRelease.parse(newPreRelease))
2929
}
30-
return semVersion.toSemVersion()
30+
return semVersion.toSemInfoVersion()
3131
}
3232

3333
fun getChangeLog(commit: Commit): List<Commit> {

src/test/kotlin/git/semver/plugin/semver/MutableSemVersionTest.kt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ class MutableSemVersionTest {
8383
@Test
8484
fun testInfoVersionSha() {
8585
val actualVersion = MutableSemVersion.tryParse(Tag("1.0.0", SHA))
86-
assertThat(actualVersion?.toSemVersion()).hasToString("1.0.0+sha.8727a3e")
86+
assertThat(actualVersion?.toSemInfoVersion()).hasToString("1.0.0+sha.8727a3e")
8787
}
8888

8989
@Test
@@ -97,10 +97,10 @@ class MutableSemVersionTest {
9797
semver.updateFromCommit(commit, settings, null)
9898
semver.applyPendingChanges(false, true)
9999

100-
val actual = semver.toSemVersion().revisionString()
100+
val actual = semver.toSemInfoVersion().revisionString()
101101

102102
assertThat(actual).isEqualTo("1.2.3.4")
103-
assertThat(semver.toSemVersion()).hasToString("1.2.4+004.sha.8727a3e")
103+
assertThat(semver.toSemInfoVersion()).hasToString("1.2.4+004.sha.8727a3e")
104104
}
105105

106106
@ParameterizedTest
@@ -114,13 +114,14 @@ class MutableSemVersionTest {
114114
])
115115
fun toInfoVersionString(version: String, v2: Boolean, expected: String) {
116116
val actualVersion = MutableSemVersion.tryParse(Tag(version, SHA))
117-
assertThat(actualVersion?.toSemVersion()?.toInfoVersionString(v2 = v2)).isEqualTo(expected)
117+
assertThat(actualVersion?.toSemInfoVersion()?.toInfoVersionString(v2 = v2)).isEqualTo(expected)
118118
}
119119

120120
@Test
121121
fun toInfoVersionString_preReleaseLast() {
122122
val version = MutableSemVersion.tryParse(Tag("1.2.3-SNAPSHOT", SHA))
123-
assertThat(version?.toSemVersion()?.toInfoVersionString(shaLength = 7, appendPreReleaseLast = true))
123+
assertThat(version?.toSemInfoVersion()?.toInfoVersionString(shaLength = 7, appendPreReleaseLast = true))
124124
.isEqualTo("1.2.3+sha.8727a3e-SNAPSHOT")
125125
}
126+
126127
}

0 commit comments

Comments
 (0)