[qtcontacts-sqlite] Allow '+' in DTMF section when validating phone n…

…umber Also add unit tests for phone numebr validation.
sailfishos · Apr 28, 2014 · d8f21d4 · d8f21d4
1 parent 25964b7
commit d8f21d4
Show file tree

Hide file tree

Showing 6 changed files with 464 additions and 5 deletions.
diff --git a/src/extensions/qtcontacts-extensions_impl.h b/src/extensions/qtcontacts-extensions_impl.h
@@ -81,6 +81,9 @@ QString normalize(const QString &input, int flags, int maxCharacters)
                 // This is the start of the diallable number
                 subset.append(*it);
                 initialChar = *it;
+            } else if (firstDtmfIndex != -1) {
+                // Allow inside the DMTF section
+                subset.append(*it);
             } else if (flags & QtContactsSqliteExtensions::ValidatePhoneNumber) {
                 // Not valid in this location
                 return QString();
@@ -110,7 +113,10 @@ QString normalize(const QString &input, int flags, int maxCharacters)
                         }
                     }
                     break;
-                } else if (firstDtmfIndex == -1) {
+                }
+
+                // Otherwise, continue with processing
+                if (firstDtmfIndex == -1) {
                     firstDtmfIndex = subset.length();
                 }
                 subset.append(*it);

diff --git a/tests/auto/aggregation/aggregation.pro b/tests/auto/aggregation/aggregation.pro
@@ -4,8 +4,7 @@ include(../../common.pri)
 QT += contacts-private
 
 INCLUDEPATH += \
-    ../../../src/engine/ \
-    ../../../src/extensions/
+    ../../../src/engine/
 
 HEADERS += \
     ../../../src/engine/contactid_p.h \

diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
@@ -1,3 +1,3 @@
 TEMPLATE = subdirs
 
-SUBDIRS = qcontactmanager aggregation qcontactmanagerfiltering
+SUBDIRS = qcontactmanager aggregation qcontactmanagerfiltering phonenumber
diff --git a/tests/auto/phonenumber/phonenumber.pro b/tests/auto/phonenumber/phonenumber.pro
@@ -0,0 +1,10 @@
+include(../../common.pri)
+
+TARGET = tst_phonenumber
+
+QT += contacts-private
+
+HEADERS += \
+    ../../util.h
+SOURCES += \
+    tst_phonenumber.cpp