Skip to content

Commit

Permalink
Allow duplicate localized entries
Browse files Browse the repository at this point in the history
- Fixes #1214
  • Loading branch information
AndersAbel committed Nov 26, 2020
1 parent e8e3e79 commit c256cd4
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 6 deletions.
22 changes: 16 additions & 6 deletions Sustainsys.Saml2/Metadata/LocalizedEntryCollection.cs
Original file line number Diff line number Diff line change
@@ -1,13 +1,23 @@
using System.Collections.ObjectModel;
using System.Collections;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Globalization;

namespace Sustainsys.Saml2.Metadata
{
public class LocalizedEntryCollection<T> : KeyedCollection<string, T> where T : LocalizedEntry
public class LocalizedEntryCollection<T> : IEnumerable<T>
where T : LocalizedEntry
{
protected override string GetKeyForItem(T item)
{
return item.Language;
}
private List<T> items = new List<T>();

public void Add(T item) => items.Add(item);

public void Clear() => items.Clear();

public int Count => items.Count;

public IEnumerator<T> GetEnumerator() => items.GetEnumerator();

IEnumerator IEnumerable.GetEnumerator() => items.GetEnumerator();
}
}
24 changes: 24 additions & 0 deletions Tests/Tests.Shared/Metadata/MetadataSerializerTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5650,6 +5650,23 @@ public static void AddOrganizationTestData()
};

AddTestData("Organization1", xml, obj);

xml = @"<?xml version='1.0' encoding='UTF-8'?>
<Organization xmlns='urn:oasis:names:tc:SAML:2.0:metadata'>
<OrganizationName xml:lang='en'>Acme Ltd</OrganizationName>
<OrganizationName xml:lang='en'>Ooops, duplicate entry</OrganizationName>
</Organization>";

obj = new Organization
{
Names = {
new LocalizedName("Acme Ltd", "en"),
new LocalizedName("Ooops, duplicate entry", "en")
},
};

AddTestData("OrganizationDuplicateNameEntries", xml, obj);

}

[TestMethod]
Expand All @@ -5659,6 +5676,13 @@ public void MetadataSerializerTests_ReadOrganization()
serializer.TestReadOrganization(reader));
}

[TestMethod]
public void MetadataSerializerTests_ReadOrganizationWithDuplicateNameEntries()
{
ReadTest("OrganizationDuplicateNameEntries", (serializer, reader) =>
serializer.TestReadOrganization(reader));
}

[TestMethod]
public void MetadataSerializerTests_WriteOrganization()
{
Expand Down

0 comments on commit c256cd4

Please sign in to comment.