// Check that the name has been read (N).
- ASSERT_EQ("Test", TestFile.NameForename);
- ASSERT_EQ("3", TestFile.NameAltID);
- ASSERT_EQ("kw", TestFile.NameLanguage);
+ ASSERT_EQ("Test", TestFile.NameForename);
+
+ // Check the ALTID parameter.
+
+ ASSERT_EQ("3", TestFile.NameAltID);
+
+ // Check the LANGUAGE parameter.
+
+ ASSERT_EQ("kw", TestFile.NameLanguage);
+
+ // Check the SORT-AS parameter.
+
+ ASSERT_EQ("Contact,Test", TestFile.NameDisplayAs);
+ // Check the extra tokens parameter.
+
+ ASSERT_EQ("TEST=Yes", TestFile.NameTokens);
}