Skip to content
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

Jump to bottom

PI-2536 Fix NumberFormatException attempting to parse invalid PNCs #754

Merged
merged 2 commits into from
Sep 27, 2024
Merged

PI-2536 Fix NumberFormatException attempting to parse invalid PNCs #754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d7b879
PI-2536 Fix NumberFormatException attempting to parse invalid PNCs
marcus-bcl Sep 26, 2024
95a7dca
Switch to parameterized test
marcus-bcl Sep 27, 2024
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
2 changes: 1 addition & 1 deletion src/main/kotlin/uk/gov/justice/hmpps/probationsearch/services/CanonicalPnc.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ internal fun String.canonicalPNCNumberOrNull(): String? =
}

private fun String.isPNCNumber(): Boolean {
return this.matches("^([0-9]{2}|[0-9]{4})/[0-9]+[a-zA-Z]".toRegex())
return this.matches("^([0-9]{2}|[0-9]{4})/[0-9]{1,7}[a-zA-Z]".toRegex())
}

private fun String.toPNCNumber(): String {
Expand Down
83 changes: 49 additions & 34 deletions src/test/kotlin/uk/gov/justice/hmpps/probationsearch/services/CanonicalPncKtTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,44 +1,59 @@
package uk.gov.justice.hmpps.probationsearch.services

import org.assertj.core.api.Assertions.assertThat
import org.junit.jupiter.api.Test
import org.junit.jupiter.params.ParameterizedTest
import org.junit.jupiter.params.provider.Arguments.arguments
import org.junit.jupiter.params.provider.MethodSource

internal class CanonicalPncKtTest {
companion object {
@JvmStatic
fun validPNCs() = listOf(
arguments("2003/1234567A", "2003/1234567a"),
arguments("2003/0234567A", "2003/234567a"),
arguments("2003/0034567A", "2003/34567a"),
arguments("2003/0004567A", "2003/4567a"),
arguments("2003/0000567A", "2003/567a"),
arguments("2003/0000067A", "2003/67a"),
arguments("2003/0000007A", "2003/7a"),
arguments("2003/0000000A", "2003/0a"),
arguments("03/1234567A", "03/1234567a"),
arguments("03/0234567A", "03/234567a"),
arguments("03/0034567A", "03/34567a"),
arguments("03/0004567A", "03/4567a"),
arguments("03/0000567A", "03/567a"),
arguments("03/0000067A", "03/67a"),
arguments("03/0000007A", "03/7a"),
arguments("03/0000000A", "03/0a"),
)

@Test
internal fun `will convert to canonical form of PNC when it is valid`() {
assertThat("2003/1234567A".canonicalPNCNumber()).isEqualTo("2003/1234567a")
assertThat("2003/0234567A".canonicalPNCNumber()).isEqualTo("2003/234567a")
assertThat("2003/0034567A".canonicalPNCNumber()).isEqualTo("2003/34567a")
assertThat("2003/0004567A".canonicalPNCNumber()).isEqualTo("2003/4567a")
assertThat("2003/0000567A".canonicalPNCNumber()).isEqualTo("2003/567a")
assertThat("2003/0000067A".canonicalPNCNumber()).isEqualTo("2003/67a")
assertThat("2003/0000007A".canonicalPNCNumber()).isEqualTo("2003/7a")
assertThat("2003/0000000A".canonicalPNCNumber()).isEqualTo("2003/0a")
assertThat("03/1234567A".canonicalPNCNumber()).isEqualTo("03/1234567a")
assertThat("03/0234567A".canonicalPNCNumber()).isEqualTo("03/234567a")
assertThat("03/0034567A".canonicalPNCNumber()).isEqualTo("03/34567a")
assertThat("03/0004567A".canonicalPNCNumber()).isEqualTo("03/4567a")
assertThat("03/0000567A".canonicalPNCNumber()).isEqualTo("03/567a")
assertThat("03/0000067A".canonicalPNCNumber()).isEqualTo("03/67a")
assertThat("03/0000007A".canonicalPNCNumber()).isEqualTo("03/7a")
assertThat("03/0000000A".canonicalPNCNumber()).isEqualTo("03/0a")
@JvmStatic
fun invalidPNCs() = listOf(
arguments("203/1234567A"),
arguments("203/1234567"),
arguments("1234567A"),
arguments("2013"),
arguments("john smith"),
arguments("john/smith"),
arguments("16/11/2018"),
arguments("16-11-2018"),
arguments("111111/11A"),
arguments("SF68/945674U"),
arguments(""),
arguments("2010/BBBBBBBA"),
arguments("2003/012345678A"),
)
}

@Test
internal fun `will not convert to canonical form of PNC when it is not valid`() {
assertThat("2003/A".canonicalPNCNumber()).isEqualTo("2003/A")
assertThat("203/1234567A".canonicalPNCNumber()).isEqualTo("203/1234567A")
assertThat("203/1234567".canonicalPNCNumber()).isEqualTo("203/1234567")
assertThat("1234567A".canonicalPNCNumber()).isEqualTo("1234567A")
assertThat("2013".canonicalPNCNumber()).isEqualTo("2013")
assertThat("john smith".canonicalPNCNumber()).isEqualTo("john smith")
assertThat("john/smith".canonicalPNCNumber()).isEqualTo("john/smith")
assertThat("16/11/2018".canonicalPNCNumber()).isEqualTo("16/11/2018")
assertThat("16-11-2018".canonicalPNCNumber()).isEqualTo("16-11-2018")
assertThat("111111/11A".canonicalPNCNumber()).isEqualTo("111111/11A")
assertThat("SF68/945674U".canonicalPNCNumber()).isEqualTo("SF68/945674U")
assertThat("".canonicalPNCNumber()).isEqualTo("")
assertThat("2010/BBBBBBBA".canonicalPNCNumber()).isEqualTo("2010/BBBBBBBA")
@ParameterizedTest
@MethodSource("validPNCs")
internal fun `will convert to canonical form of PNC when it is valid`(actual: String, expected: String) {
assertThat(actual.canonicalPNCNumber()).isEqualTo(expected)
}

@ParameterizedTest
@MethodSource("invalidPNCs")
internal fun `will not convert to canonical form of PNC when it is not valid`(actual: String) {
assertThat(actual.canonicalPNCNumber()).isEqualTo(actual)
}
}
Loading