und - Added unit tests for MeCard

We've added unit tests

---

We've added unit tests for the MeCard functionality.

---

Type: und
Breaking: False
Doc Required: False
Part: 1/1

VisualCard.Tests/ContactData.cs

@@ -31,6 +31,23 @@ namespace VisualCard.Tests
     public static class ContactData
     {
         #region singleVcardTwoContactShort
+        private static readonly string singleMeCardContactShort =
+            """
+            MECARD:N:Hood,Rick,,,;;
+            """
+        ;
+
+        private static readonly string singleVcardContactShortFromMeCard =
+            """
+            BEGIN:VCARD
+            VERSION:3.0
+            FN:Rick Hood
+            N:Hood;Rick;;;;
+            END:VCARD
+
+            """
+        ;
+
         private static readonly string singleVcardTwoContactShort =
             """
             BEGIN:VCARD
@@ -41,6 +58,19 @@ public static class ContactData
             """
         ;
 
+        private static readonly Card singleVcardContactShortFromMeCardInstance = new
+        (
+            null,
+            "3.0"
+        )
+        {
+            ContactNames = new NameInfo[]
+            {
+                new NameInfo(0, Array.Empty<string>(), "Rick", "Hood", Array.Empty<string>(), Array.Empty<string>(), Array.Empty<string>())
+            },
+            ContactFullName = "Rick Hood"
+        };
+
         private static readonly Card singleVcardTwoContactShortInstance = new
         (
             null,
@@ -106,6 +136,53 @@ public static class ContactData
         #endregion
 
         #region singleVcardTwoContact
+        private static readonly string singleMeCardContact =
+            """
+            MECARD:N:Sanders,John,,,;TEL:495-522-3560;EMAIL:[email protected];ADR:,,Los Angeles,,,,USA;NOTE:Note test for VisualCard;;
+            """
+        ;
+
+        private static readonly string singleVcardContactFromMeCard =
+            """
+            BEGIN:VCARD
+            VERSION:3.0
+            FN:John Sanders
+            N:Sanders;John;;;;
+            TEL;TYPE=CELL:495-522-3560
+            ADR;TYPE=HOME:;;Los Angeles;;;;USA
+            EMAIL;TYPE=HOME:[email protected]
+            NOTE:Note test for VisualCard
+            END:VCARD
+
+            """
+        ;
+
+        private static readonly Card singleVcardContactInstanceFromMeCard = new
+        (
+            null,
+            "3.0"
+        )
+        {
+            ContactNames = new NameInfo[]
+            {
+                new NameInfo(0, Array.Empty<string>(), "John", "Sanders", Array.Empty<string>(), Array.Empty<string>(), Array.Empty<string>())
+            },
+            ContactFullName = "John Sanders",
+            ContactTelephones = new TelephoneInfo[]
+            {
+                new TelephoneInfo(0, Array.Empty<string>(), new string[] { "CELL" }, "495-522-3560")
+            },
+            ContactAddresses = new AddressInfo[]
+            {
+                new AddressInfo(0, Array.Empty<string>(), new string[] { "HOME" }, "", "", "Los Angeles", "", "", "", "USA")
+            },
+            ContactNotes = "Note test for VisualCard",
+            ContactMails = new EmailInfo[]
+            {
+                new EmailInfo(0, Array.Empty<string>(), new string[] { "HOME" }, "[email protected]")
+            }
+        };
+
         private static readonly string singleVcardTwoContact =
             """
             BEGIN:VCARD
@@ -892,6 +969,24 @@ public static class ContactData
             multipleVcardFourContacts,
         };
 
+        /// <summary>
+        /// Test MeCard contacts
+        /// </summary>
+        public static readonly string[] meCardContacts =
+        {
+            singleMeCardContactShort,
+            singleMeCardContact,
+        };
+
+        /// <summary>
+        /// Test MeCard contacts
+        /// </summary>
+        public static readonly (string, string)[] vCardFromMeCardContacts =
+        {
+            (singleMeCardContactShort, singleVcardContactShortFromMeCard),
+            (singleMeCardContact, singleVcardContactFromMeCard),
+        };
+
         /// <summary>
         /// All the remaining valid contacts
         /// </summary>
@@ -926,6 +1021,8 @@ public static class ContactData
             vcardThreeOldSampleInstanceOne,
             vcardThreeOldSampleInstanceTwo,
             vcardThreeOldSampleInstanceThree,
+            singleVcardContactInstanceFromMeCard,
+            singleVcardContactShortFromMeCardInstance,
         };
     }
 }

VisualCard.Tests/ContactParseTests.cs

@@ -27,6 +27,7 @@
 using Shouldly;
 using System.Collections.Generic;
 using System.IO;
+using VisualCard.Converters;
 using VisualCard.Parsers;
 using VisualCard.Parts;
 
@@ -127,6 +128,94 @@ public void ParseDifferentContactsSaveToStringAndTestEquality(string cardText)
             foundCards.ShouldAllBe((b) => b);
         }
 
+        [Test]
+        [TestCaseSource(typeof(ContactData), nameof(ContactData.vCardFromMeCardContacts))]
+        public void ParseAndCheckDifferentMeCardContacts((string, string) cardText)
+        {
+            List<BaseVcardParser> parsers = new();
+            Should.NotThrow(() => parsers = MeCard.GetContactsFromMeCardString(cardText.Item1));
+            Card card = default;
+            foreach (BaseVcardParser parser in parsers)
+                Should.NotThrow(() => card = parser.Parse());
+            card.SaveToString().ShouldBe(cardText.Item2);
+        }
+
+        [Test]
+        [TestCaseSource(typeof(ContactData), nameof(ContactData.meCardContacts))]
+        public void ParseDifferentMeCardContacts(string cardText)
+        {
+            List<BaseVcardParser> parsers = new();
+            Should.NotThrow(() => parsers = MeCard.GetContactsFromMeCardString(cardText));
+            foreach (BaseVcardParser parser in parsers)
+                Should.NotThrow(parser.Parse);
+        }
+
+        [Test]
+        [TestCaseSource(typeof(ContactData), nameof(ContactData.meCardContacts))]
+        public void ParseDifferentMeCardContactsAndTestEquality(string cardText)
+        {
+            List<BaseVcardParser> parsers = new();
+            List<Card> cards = new();
+
+            // Parse the cards
+            Should.NotThrow(() => parsers = MeCard.GetContactsFromMeCardString(cardText));
+            foreach (BaseVcardParser parser in parsers)
+                cards.Add(Should.NotThrow(parser.Parse));
+
+            // Test equality with available data
+            List<bool> foundCards = new();
+            foreach (Card card in cards)
+            {
+                bool found = false;
+                foreach (Card expectedCard in ContactData.vCardContactsInstances)
+                    if (expectedCard == card)
+                    {
+                        found = true;
+                        break;
+                    }
+                foundCards.Add(found);
+            }
+            foundCards.ShouldAllBe((b) => b);
+        }
+
+        [Test]
+        [TestCaseSource(typeof(ContactData), nameof(ContactData.meCardContacts))]
+        public void ParseDifferentMeCardContactsSaveToStringAndTestEquality(string cardText)
+        {
+            List<BaseVcardParser> parsers = new();
+            List<Card> cards = new();
+            List<Card> savedCards = new();
+
+            // Parse the cards
+            Should.NotThrow(() => parsers = MeCard.GetContactsFromMeCardString(cardText));
+            foreach (BaseVcardParser parser in parsers)
+                cards.Add(Should.NotThrow(parser.Parse));
+
+            // Save all the cards to strings and re-parse
+            foreach (Card card in cards)
+            {
+                string saved = Should.NotThrow(card.SaveToString);
+                Should.NotThrow(() => parsers = CardTools.GetCardParsersFromString(saved));
+                foreach (BaseVcardParser parser in parsers)
+                    savedCards.Add(Should.NotThrow(parser.Parse));
+            }
+
+            // Test equality with available data
+            List<bool> foundCards = new();
+            foreach (Card card in savedCards)
+            {
+                bool found = false;
+                foreach (Card expectedCard in ContactData.vCardContactsInstances)
+                    if (expectedCard == card)
+                    {
+                        found = true;
+                        break;
+                    }
+                foundCards.Add(found);
+            }
+            foundCards.ShouldAllBe((b) => b);
+        }
+
         [Test]
         [TestCaseSource(typeof(ContactDataBogus), nameof(ContactDataBogus.invalidContacts))]
         public void InvalidContactShouldThrowWhenGettingCardParsers(string cardText)
@@ -157,4 +246,4 @@ public void BogusButSeemsValidShouldNotThrowWhenParsing(string cardText)
                 Should.NotThrow(parser.Parse);
         }
     }
-}
+}

VisualCard/Converters/MeCard.cs

@@ -88,6 +88,10 @@ public static List<BaseVcardParser> GetContactsFromMeCardString(string meCardStr
                     if (value.StartsWith("ADR:"))
                         values[i] = $"ADR;TYPE=HOME{values[i].Substring(3)}";
 
+                    // As VisualCard doesn't support EMAIL: yet, why don't we just make it EMAIL; until we improve type detecion?
+                    if (value.StartsWith("EMAIL:"))
+                        values[i] = $"EMAIL;TYPE=HOME{values[i].Substring(5)}";
+
                     // MeCard stores birthday date in this format:
                     // 19700310
                     // Digit 1-4: Year