templates: keep fingerPrint a list of models
We decided against "abusing" the first entry in the fingerPrint list as the name of the device family/class. The reason is that there might be templates which have no such class, which would be impossible to determine if only "fingerPrint" is available. Instead the plan is to introduce a separate "templateName" property. Note that the sync-ui currently still assumes that the first fingerPrint entry can be shown to the user. To avoid confusion (device is called "Nokia N85", shown as "Nokia 7210c") we have to keep one template per model.
This commit is contained in:
parent
bafde8080f
commit
e3399289ab
2 changed files with 5 additions and 5 deletions
|
@ -1727,7 +1727,7 @@ protected:
|
|||
help1.doit();
|
||||
CPPUNIT_ASSERT_EQUAL_DIFF("Available configuration templates:\n"
|
||||
" template name = template description matching score in percent (100% = exact match)\n"
|
||||
" Nokia S40 = Template for Nokia S40 series Phone 100%\n"
|
||||
" Nokia 7210c = Template for Nokia S40 series Phone 100%\n"
|
||||
" SyncEvolution Client = SyncEvolution server side template 40%\n",
|
||||
help1.m_out.str());
|
||||
CPPUNIT_ASSERT_EQUAL_DIFF("", help1.m_err.str());
|
||||
|
@ -1735,7 +1735,7 @@ protected:
|
|||
help2.doit();
|
||||
CPPUNIT_ASSERT_EQUAL_DIFF("Available configuration templates:\n"
|
||||
" template name = template description matching score in percent (100% = exact match)\n"
|
||||
" Nokia S40 = Template for Nokia S40 series Phone 100%\n"
|
||||
" Nokia 7210c = Template for Nokia S40 series Phone 100%\n"
|
||||
" SyncEvolution Client = SyncEvolution server side template 40%\n",
|
||||
help2.m_out.str());
|
||||
CPPUNIT_ASSERT_EQUAL_DIFF("", help2.m_err.str());
|
||||
|
@ -1743,7 +1743,7 @@ protected:
|
|||
help3.doit();
|
||||
CPPUNIT_ASSERT_EQUAL_DIFF("Available configuration templates:\n"
|
||||
" template name = template description matching score in percent (100% = exact match)\n"
|
||||
" Nokia S40 = Template for Nokia S40 series Phone 60%\n"
|
||||
" Nokia 7210c = Template for Nokia S40 series Phone 60%\n"
|
||||
" SyncEvolution Client = SyncEvolution server side template 20%\n",
|
||||
help3.m_out.str());
|
||||
CPPUNIT_ASSERT_EQUAL_DIFF("", help3.m_err.str());
|
||||
|
@ -1752,7 +1752,7 @@ protected:
|
|||
CPPUNIT_ASSERT_EQUAL_DIFF("Available configuration templates:\n"
|
||||
" template name = template description matching score in percent (100% = exact match)\n"
|
||||
" SyncEvolution Client = SyncEvolution server side template 100%\n"
|
||||
" Nokia S40 = Template for Nokia S40 series Phone 40%\n",
|
||||
" Nokia 7210c = Template for Nokia S40 series Phone 40%\n",
|
||||
help4.m_out.str());
|
||||
CPPUNIT_ASSERT_EQUAL_DIFF("", help4.m_err.str());
|
||||
}
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
fingerprint = Nokia S40,Nokia 7210c,Nokia
|
||||
fingerprint = Nokia 7210c,Nokia
|
||||
description = Template for Nokia S40 series Phone
|
||||
|
|
Loading…
Reference in a new issue