Export IsNumberMatchWithNumbers and IsNumberMatchWithOneNumber.

Both corresponding methods in libphonenumber (Java) are public, which
allows to pass PhoneNumber objects with an explicitly set region. Thus
we export the corresponding functions here, too.

Author: ak-ionos

matcher.go

@@ -30,7 +30,7 @@ func ContainsOnlyValidXChars(number *PhoneNumber, candidate string) bool {
 				// This is the carrier code case, in which the 'X's
 				// always precede the national significant number.
 				index++
-				if isNumberMatchWithOneNumber(number, candidate[index:]) != NSN_MATCH {
+				if IsNumberMatchWithOneNumber(number, candidate[index:]) != NSN_MATCH {
 					return false
 				}
 				// This is the extension sign case, in which the 'x'

phonenumbers.go

@@ -3072,7 +3072,7 @@ func buildNationalNumberForParsing(
 // Returns NO_MATCH otherwise.
 // For example, the numbers +1 345 657 1234 and 657 1234 are a SHORT_NSN_MATCH.
 // The numbers +1 345 657 1234 and 345 657 are a NO_MATCH.
-func isNumberMatchWithNumbers(firstNumberIn, secondNumberIn *PhoneNumber) MatchType {
+func IsNumberMatchWithNumbers(firstNumberIn, secondNumberIn *PhoneNumber) MatchType {
 	// Make copies of the phone number so that the numbers passed in are not edited.
 	var firstNumber, secondNumber *PhoneNumber
 	firstNumber = &PhoneNumber{}
@@ -3159,14 +3159,14 @@ func isNationalNumberSuffixOfTheOther(firstNumber, secondNumber *PhoneNumber) bo
 func IsNumberMatch(firstNumber, secondNumber string) MatchType {
 	firstNumberAsProto, err := Parse(firstNumber, UNKNOWN_REGION)
 	if err == nil {
-		return isNumberMatchWithOneNumber(firstNumberAsProto, secondNumber)
+		return IsNumberMatchWithOneNumber(firstNumberAsProto, secondNumber)
 	} else if err != ErrInvalidCountryCode {
 		return NOT_A_NUMBER
 	}
 
 	secondNumberAsProto, err := Parse(secondNumber, UNKNOWN_REGION)
 	if err == nil {
-		return isNumberMatchWithOneNumber(secondNumberAsProto, firstNumber)
+		return IsNumberMatchWithOneNumber(secondNumberAsProto, firstNumber)
 	} else if err != ErrInvalidCountryCode {
 		return NOT_A_NUMBER
 	}
@@ -3180,19 +3180,19 @@ func IsNumberMatch(firstNumber, secondNumber string) MatchType {
 	if err != nil {
 		return NOT_A_NUMBER
 	}
-	return isNumberMatchWithNumbers(&firstNumberProto, &secondNumberProto)
+	return IsNumberMatchWithNumbers(&firstNumberProto, &secondNumberProto)
 }
 
 // Takes two phone numbers and compares them for equality. This is a
 // convenience wrapper for IsNumberMatch(PhoneNumber, PhoneNumber). No
 // default region is known.
-func isNumberMatchWithOneNumber(
+func IsNumberMatchWithOneNumber(
 	firstNumber *PhoneNumber, secondNumber string) MatchType {
 	// First see if the second number has an implicit country calling
 	// code, by attempting to parse it.
 	secondNumberAsProto, err := Parse(secondNumber, UNKNOWN_REGION)
 	if err == nil {
-		return isNumberMatchWithNumbers(firstNumber, secondNumberAsProto)
+		return IsNumberMatchWithNumbers(firstNumber, secondNumberAsProto)
 	}
 	if err != ErrInvalidCountryCode {
 		return NOT_A_NUMBER
@@ -3209,7 +3209,7 @@ func isNumberMatchWithOneNumber(
 		if err != nil {
 			return NOT_A_NUMBER
 		}
-		match := isNumberMatchWithNumbers(
+		match := IsNumberMatchWithNumbers(
 			firstNumber, secondNumberWithFirstNumberRegion)
 		if match == EXACT_MATCH {
 			return NSN_MATCH
@@ -3223,7 +3223,7 @@ func isNumberMatchWithOneNumber(
 		if err != nil {
 			return NOT_A_NUMBER
 		}
-		return isNumberMatchWithNumbers(firstNumber, secondNumberProto)
+		return IsNumberMatchWithNumbers(firstNumber, secondNumberProto)
 	}
 }
 

phonenumbers_test.go

@@ -827,6 +827,101 @@ func TestSetItalianLeadinZerosForPhoneNumber(t *testing.T) {
 	}
 }
 
+func TestIsNumberMatchWithNumbers(t *testing.T) {
+	tcs := []struct {
+		num1     string
+		reg1     string
+		num2     string
+		reg2     string
+		expected MatchType
+	}{
+		{
+			"+49 721 123456", "DE", "0049 721 123456", "DE", EXACT_MATCH,
+		},
+		{
+			"721 123456", "DE", "721 123456", "DE", EXACT_MATCH,
+		},
+		{
+			"+49 721 123456", "DE", "0721-123456", "DE", EXACT_MATCH,
+		},
+		{
+			"+49 721 123456", "DE", "0049 721-123456", "DE", EXACT_MATCH,
+		},
+		{
+			"+49 721 123456", "DE", "0049 0721 123456", "DE", EXACT_MATCH,
+		},
+		{
+			"721 123456", "DE", "+49 721 123456", "", EXACT_MATCH,
+		},
+		{
+			"0721-123456", "DE", "+49 721 123456", "DE", EXACT_MATCH,
+		},
+		{
+			"721123456", "ES", "+34 721 123456", "ES", EXACT_MATCH,
+		},
+		{
+			"0721 123456", "DE", "+49 721 123456", "ZZ", EXACT_MATCH,
+		},
+		{
+			"0721-123456", "", "+49 721 123456", "DE", NO_MATCH,
+		},
+		{
+			"0721-123456", "ES", "+49 721 123456", "DE", NO_MATCH,
+		},
+		{
+			"0721 123456", "ES", "0721 123456", "DE", NO_MATCH,
+		},
+		{
+			"123456", "DE", "0721 123456", "DE", SHORT_NSN_MATCH,
+		},
+		{
+			"0721 123456", "", "123456", "", SHORT_NSN_MATCH,
+		},
+	}
+
+	for _, tc := range tcs {
+		p1, _ := Parse(tc.num1, tc.reg1)
+		p2, _ := Parse(tc.num2, tc.reg2)
+		result := IsNumberMatchWithNumbers(p1, p2)
+		if result != tc.expected {
+			t.Errorf(`"%s"(%s) == "%s"(%s) returned %d when expecting %d`, tc.num1, tc.reg1, tc.num2, tc.reg2, result, tc.expected)
+		}
+	}
+}
+
+func TestIsNumberMatchWithOneNumber(t *testing.T) {
+	tcs := []struct {
+		num1     string
+		reg1     string
+		num2     string
+		expected MatchType
+	}{
+		{
+			"+49 721 123456", "DE", "+49721123456", EXACT_MATCH,
+		},
+		{
+			"+49 721 123456", "DE", "0049 721 123456", NSN_MATCH,
+		},
+		{
+			"6502530000", "US", "1-650-253-0000", NSN_MATCH,
+		},
+		{
+			"123456", "DE", "+49 0721 123456", SHORT_NSN_MATCH,
+		},
+		{
+			"0721 123456", "ES", "+43 721 123456", NO_MATCH,
+		},
+	}
+
+	for _, tc := range tcs {
+		p1, _ := Parse(tc.num1, tc.reg1)
+		result := IsNumberMatchWithOneNumber(p1, tc.num2)
+		if result != tc.expected {
+			t.Errorf(`"%s"(%s) == "%s" returned %d when expecting %d`, tc.num1, tc.reg1, tc.num2, result, tc.expected)
+		}
+	}
+}
+
 ////////// Copied from java-libphonenumber
 /**
  * Unit tests for PhoneNumberUtil.java