Skip to content

Commit eb5871e

Browse files
ndwndw
authored
Merge pull request #77 from ndw/update-legacy-dep
Update the legacy V2 release
2 parents 9bf1301 + 8f7dfd2 commit eb5871e

25 files changed

+381
-368
lines changed

‎XmlResolver/SampleApp/SampleApp.csproj

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
66
</PropertyGroup>
77

88
<ItemGroup>
@@ -16,9 +16,8 @@
1616
</ItemGroup>
1717

1818
<ItemGroup>
19-
<PackageReference Include="NuGet.Frameworks" Version="5.10.0" />
20-
<PackageReference Include="System.IO.Packaging" Version="5.0.0" />
21-
<PackageReference Include="XmlResolverData" Version="1.1.0" />
19+
<PackageReference Include="System.IO.Packaging" Version="8.0.1" />
20+
<PackageReference Include="XmlResolverData" Version="1.2.4" />
2221

2322
</ItemGroup>
2423

‎XmlResolver/UnitTests/CMNextTest.cs

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -26,101 +26,101 @@ public void Setup() {
2626
public void NextTest1() {
2727
Uri expected = UriUtils.Resolve(baseUri, "public.dtd");
2828
Uri result = manager.LookupPublic("http://example.com/system-next.dtd", "-//EXAMPLE//DTD Example//EN");
29-
Assert.AreEqual(expected, result);
29+
Assert.That(result, Is.EqualTo(expected));
3030
}
3131

3232
[Test]
33-
public void nextTest2() {
33+
public void NextTest2() {
3434
// no next required
3535
Uri expected = UriUtils.Resolve(baseUri, "system.dtd");
3636
Uri result = manager.LookupPublic("http://example.com/system.dtd", "-//EXAMPLE//DTD Example//EN");
37-
Assert.AreEqual(expected, result);
37+
Assert.That(result, Is.EqualTo(expected));
3838
}
3939

4040
[Test]
41-
public void nextTest3() {
41+
public void NextTest3() {
4242
Uri expected = UriUtils.Resolve(baseUri, "system-next.dtd");
4343
Uri result = manager.LookupSystem("http://example.com/system-next.dtd");
44-
Assert.AreEqual(expected, result);
44+
Assert.That(result, Is.EqualTo(expected));
4545
}
4646

4747
[Test]
48-
public void nextTest4() {
48+
public void NextTest4() {
4949
Uri expected = UriUtils.Resolve(baseUri, "system-next.dtd");
5050
Uri result = manager.LookupPublic("http://example.com/system-next.dtd", "-//EXAMPLE//DTD Example Next//EN");
51-
Assert.AreEqual(expected, result);
51+
Assert.That(result, Is.EqualTo(expected));
5252
}
5353

5454
[Test]
55-
public void nextTest5() {
55+
public void NextTest5() {
5656
Uri expected = UriUtils.Resolve(baseUri, "public-next.dtd");
5757
Uri result = manager.LookupPublic("http://example.com/miss.dtd", "-//EXAMPLE//DTD Example Next//EN");
58-
Assert.AreEqual(expected, result);
58+
Assert.That(result, Is.EqualTo(expected));
5959
}
6060

6161
[Test]
62-
public void nextTest6() {
62+
public void NextTest6() {
6363
Uri expected = UriUtils.Resolve(baseUri, "found-in-one.xml");
6464
Uri result = manager.LookupUri("http://example.com/document.xml");
65-
Assert.AreEqual(expected, result);
65+
Assert.That(result, Is.EqualTo(expected));
6666
}
6767

6868
[Test]
69-
public void nextTest7() {
69+
public void NextTest7() {
7070
// After looking in the next catalogs, continue in the following catalogs
7171
Uri result = manager.LookupSystem("http://example.com/found-in-following.dtd");
72-
Assert.NotNull(result);
73-
Assert.True(result.ToString().EndsWith("cm/following.dtd"));
72+
Assert.That(result, Is.Not.Null);
73+
Assert.That(result.ToString().EndsWith("cm/following.dtd"), Is.EqualTo(true));
7474
}
7575

7676
[Test]
77-
public void nextTest8() {
77+
public void NextTest8() {
7878
// After looking in the delegated catalogs, do not return to the following catalogs
7979
Uri result = manager.LookupSystem("http://example.com/delegated/but/not/found/in/delegated/catalogs.dtd");
80-
Assert.Null(result);
80+
Assert.That(result, Is.Null);
8181
}
8282

8383
[Test]
84-
public void delegateSystemTest1() {
84+
public void DelegateSystemTest1() {
8585
Uri expected = UriUtils.Resolve(baseUri, "delegated-to-one.dtd");
8686
Uri result = manager.LookupSystem("http://example.com/delegated/one/system.dtd");
87-
Assert.AreEqual(expected, result);
87+
Assert.That(result, Is.EqualTo(expected));
8888
}
8989

9090
[Test]
91-
public void delegateSystemTest2() {
91+
public void DelegateSystemTest2() {
9292
Uri expected = UriUtils.Resolve(baseUri, "delegated-to-two.dtd");
9393
Uri result = manager.LookupSystem("http://example.com/delegated/two/system.dtd");
94-
Assert.AreEqual(expected, result);
94+
Assert.That(result, Is.EqualTo(expected));
9595
}
9696

9797
[Test]
98-
public void delegateSystemTest3() {
98+
public void DelegateSystemTest3() {
9999
Uri expected = UriUtils.Resolve(baseUri, "three-from-two.dtd");
100100
Uri result = manager.LookupSystem("http://example.com/delegated/three/system.dtd");
101-
Assert.AreEqual(expected, result);
101+
Assert.That(result, Is.EqualTo(expected));
102102
}
103103

104104
[Test]
105-
public void delegateSystemTest4() {
105+
public void DelegateSystemTest4() {
106106
Uri expected = UriUtils.Resolve(baseUri, "test-from-two.dtd");
107107
Uri result = manager.LookupSystem("http://example.com/delegated/one/test/system.dtd");
108-
Assert.AreEqual(expected, result);
108+
Assert.That(result, Is.EqualTo(expected));
109109
}
110110

111111
[Test]
112-
public void delegateSystemTest5() {
112+
public void DelegateSystemTest5() {
113113
// This Uri is in nextone.xml, but because nextroot.xml delegates to different catalogs,
114114
// it's never seen by the resolver.
115115
Uri result = manager.LookupSystem("http://example.com/delegated/four/system.dtd");
116-
Assert.Null(result);
116+
Assert.That(result, Is.Null);
117117
}
118118

119119
[Test]
120-
public void delegateSystemTest6() {
120+
public void DelegateSystemTest6() {
121121
Uri expected = UriUtils.Resolve(baseUri, "five-from-two.dtd");
122122
Uri result = manager.LookupSystem("http://example.com/delegated/five/system.dtd");
123-
Assert.AreEqual(expected, result);
123+
Assert.That(result, Is.EqualTo(expected));
124124
}
125125
}
126-
}
126+
}

‎XmlResolver/UnitTests/CMPreferTest.cs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,38 +18,38 @@ public void Setup() {
1818
}
1919

2020
[Test]
21-
public void publicTest1() {
21+
public void PublicTest1() {
2222
Uri expected = UriUtils.Resolve(baseUri, "prefer-public.dtd");
2323
Uri result = manager.LookupPublic("http://example.com/miss", "-//EXAMPLE//DTD Example//EN");
24-
Assert.AreEqual(expected, result);
24+
Assert.That(result, Is.EqualTo(expected));
2525
}
2626

2727
[Test]
28-
public void publicTest2() {
28+
public void PublicTest2() {
2929
Uri expected = UriUtils.Resolve(baseUri, "system.dtd");
3030
Uri result = manager.LookupPublic("http://example.com/system.dtd", "-//EXAMPLE//DTD Example//EN");
31-
Assert.AreEqual(expected, result);
31+
Assert.That(result, Is.EqualTo(expected));
3232
}
3333

3434
[Test]
35-
public void publicTest3() {
35+
public void PublicTest3() {
3636
Uri expected = UriUtils.Resolve(baseUri, "prefer-system.dtd");
3737
Uri result = manager.LookupNotation("irrelevant", null, "-//EXAMPLE//DTD Example//EN");
38-
Assert.AreEqual(expected, result);
38+
Assert.That(result, Is.EqualTo(expected));
3939
}
4040

4141
[Test]
42-
public void publicTest4() {
42+
public void PublicTest4() {
4343
Uri expected = UriUtils.Resolve(baseUri, "prefer-system.dtd");
4444
Uri result = manager.LookupPublic(PublicId.EncodeUrn("-//EXAMPLE//DTD Example//EN").ToString(), null);
45-
Assert.AreEqual(expected, result);
45+
Assert.That(result, Is.EqualTo(expected));
4646
}
4747

4848
[Test]
49-
public void publicTest5() {
49+
public void PublicTest5() {
5050
Uri expected = UriUtils.Resolve(baseUri, "prefer-system.dtd");
5151
Uri result = manager.LookupPublic(PublicId.EncodeUrn("-//EXAMPLE//DTD Different//EN").ToString(), "-//EXAMPLE//DTD Example//EN");
52-
Assert.AreEqual(expected, result);
52+
Assert.That(result, Is.EqualTo(expected));
5353
}
5454
}
55-
}
55+
}

0 commit comments

Comments
 (0)