From 6aec984d296f3ed557c23473400504af3b1ccc86 Mon Sep 17 00:00:00 2001
From: "Jan N. Klug" <jan.n.klug@rub.de>
Date: Thu, 22 Apr 2021 10:28:57 +0200
Subject: [PATCH] fix phonebook lookup

---
 .../phonebook/Tr064PhonebookImpl.java         | 11 +++-
 .../phonebook/Tr064PhonebookImplTest.java     | 62 +++++++++++++++++++
 2 files changed, 70 insertions(+), 3 deletions(-)
 create mode 100644 bundles/org.smarthomej.binding.tr064/src/test/java/org/smarthomej/binding/tr064/internal/phonebook/Tr064PhonebookImplTest.java

diff --git a/bundles/org.smarthomej.binding.tr064/src/main/java/org/smarthomej/binding/tr064/internal/phonebook/Tr064PhonebookImpl.java b/bundles/org.smarthomej.binding.tr064/src/main/java/org/smarthomej/binding/tr064/internal/phonebook/Tr064PhonebookImpl.java
index 42767d15fc..198723652a 100644
--- a/bundles/org.smarthomej.binding.tr064/src/main/java/org/smarthomej/binding/tr064/internal/phonebook/Tr064PhonebookImpl.java
+++ b/bundles/org.smarthomej.binding.tr064/src/main/java/org/smarthomej/binding/tr064/internal/phonebook/Tr064PhonebookImpl.java
@@ -97,8 +97,13 @@ public String toString() {
         return "Phonebook{" + "phonebookName='" + phonebookName + "', phonebook=" + phonebook + '}';
     }
 
-    private String normalizeNumber(String number) {
-        // Naive normalization: remove all non-digit characters
-        return number.replaceAll("[^0-9]\\+\\*", "");
+    /**
+     * normalize a phone number (remove everything except digits and *) for comparison
+     *
+     * @param number the input phone number string
+     * @return normalized phone number string
+     */
+    public final String normalizeNumber(String number) {
+        return number.replaceAll("[^0-9\\*\\+]", "");
     }
 }
diff --git a/bundles/org.smarthomej.binding.tr064/src/test/java/org/smarthomej/binding/tr064/internal/phonebook/Tr064PhonebookImplTest.java b/bundles/org.smarthomej.binding.tr064/src/test/java/org/smarthomej/binding/tr064/internal/phonebook/Tr064PhonebookImplTest.java
new file mode 100644
index 0000000000..7e41cf528d
--- /dev/null
+++ b/bundles/org.smarthomej.binding.tr064/src/test/java/org/smarthomej/binding/tr064/internal/phonebook/Tr064PhonebookImplTest.java
@@ -0,0 +1,62 @@
+/**
+ * Copyright (c) 2021 Contributors to the SmartHome/J project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.smarthomej.binding.tr064.internal.phonebook;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.when;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.eclipse.jetty.client.HttpClient;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
+
+/**
+ * The {@link Tr064PhonebookImplTest} class implements test cases for the {@link Tr064PhonebookImpl} class
+ *
+ * @author Jan N. Klug - Initial contribution
+ */
+@NonNullByDefault
+@MockitoSettings(strictness = Strictness.WARN)
+@ExtendWith(MockitoExtension.class)
+public class Tr064PhonebookImplTest {
+    @Mock
+    private @NonNullByDefault({}) HttpClient httpClient;
+
+    // key -> input, value -> output
+    public static Collection<Map.Entry<String, String>> phoneNumbers() {
+        return List.of( //
+                Map.entry("**820", "**820"), //
+                Map.entry("49200123456", "49200123456"), //
+                Map.entry("+49-200-123456", "+49200123456"), //
+                Map.entry("49 (200) 123456", "49200123456"), //
+                Map.entry("+49 200/123456", "+49200123456"));
+    }
+
+    @ParameterizedTest
+    @MethodSource("phoneNumbers")
+    public void testNormalization(Map.Entry<String, String> input) {
+        when(httpClient.newRequest((String) any())).thenThrow(new IllegalArgumentException("testing"));
+        Tr064PhonebookImpl testPhonebook = new Tr064PhonebookImpl(httpClient, "", 0);
+        Assertions.assertEquals(input.getValue(), testPhonebook.normalizeNumber(input.getKey()));
+    }
+}