Skip to content

Commit 8aad96d

Browse files
ademarademar
committed
unit tests fixes
1 parent 3fa519e commit 8aad96d

File tree

8 files changed

+30
-150
lines changed

8 files changed

+30
-150
lines changed

‎EppLib.UnitTests/FuryExtensionLocalTest.cs‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ public void FuryLogin()
2929
services.Extensions.Add("urn:ietf:params:xml:ns:fury-2.0");
3030

3131
command.Services = services;
32+
command.TransactionId = "ABC-12345";
3233

3334
var xml = command.ToXml().InnerXml;
3435

@@ -63,8 +64,11 @@ public void FuryUpdateDomainWithPrivacy()
6364
string expected = File.ReadAllText("FuryDomainUpdateCommand.xml");
6465

6566
var command = new DomainUpdate("example.com");
66-
command.Password = "password2";
67-
command.Extensions.Add(new FuryDomainUpdateExtension(true));
67+
68+
var domainChange = new DomainChange { AuthInfo = "password2" };
69+
70+
command.DomainChange = domainChange;
71+
command.Extensions.Add(new FuryDomainUpdateExtension(false));
6872

6973
var xml = command.ToXml().InnerXml;
7074

@@ -84,10 +88,10 @@ public void FuryContactCreateWithPrivacy()
8488
"jdoe@example.com",
8589
new Telephone { Value = "+1.6471114444", Extension = "333" },
8690
new Telephone { Value = "+1.6471114445" });
87-
91+
//registrantContact.Password = "password";
8892
var command = new ContactCreate(registrantContact);
89-
90-
var furyExtension = new FuryContactCreateExtension("en", "CCT", null);
93+
command.Password = "password";
94+
var furyExtension = new FuryContactCreateExtension("EN", "CCT", null);
9195

9296
command.Extensions.Add(furyExtension);
9397

@@ -121,7 +125,7 @@ public void FuryContactUpdateWithPrivacy()
121125

122126
command.ContactChange = contactChange;
123127

124-
command.Extensions.Add(new FuryContactUpdateExtension ("fr","en"));
128+
command.Extensions.Add(new FuryContactUpdateExtension("fr", "en"));
125129

126130
var xml = command.ToXml().InnerXml;
127131

‎EppLib.UnitTests/TestData/FuryContactCreateCommand.xml‎

Lines changed: 1 addition & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
3-
<command>
4-
<create>
5-
<contact:create xmlns:contact="urn:ietf:params:xml:ns:contact-1.0">
6-
<contact:id>agreed6</contact:id>
7-
<contact:postalInfo type="loc">
8-
<contact:name>Test Contact1</contact:name>
9-
<contact:org>Test Organization</contact:org>
10-
<contact:addr>
11-
<contact:street>123 Main Street</contact:street>
12-
<contact:city>Ottawa</contact:city>
13-
<contact:sp>ON</contact:sp>
14-
<contact:pc>K1R 7S8</contact:pc>
15-
<contact:cc>CA</contact:cc>
16-
</contact:addr>
17-
</contact:postalInfo>
18-
<contact:voice>+1.6134375335</contact:voice>
19-
<contact:fax>+1.6134375366</contact:fax>
20-
<contact:email>jdoe@example.com</contact:email>
21-
<contact:authInfo>
22-
<contact:pw>password</contact:pw>
23-
</contact:authInfo>
24-
</contact:create>
25-
</create>
26-
<extension>
27-
<fury:create xmlns:fury="urn:ietf:params:xml:ns:fury-2.0">
28-
<fury:properties>
29-
<fury:property>
30-
<fury:key>LANGUAGE</fury:key>
31-
<fury:value>EN</fury:value>
32-
</fury:property>
33-
<fury:property>
34-
<fury:key>CPR</fury:key>
35-
<fury:value>CCT</fury:value>
36-
</fury:property>
37-
<fury:property>
38-
<fury:key>agreement_version</fury:key>
39-
<fury:value default="true"></fury:value>
40-
</fury:property>
41-
</fury:properties>
42-
</fury:create>
43-
</extension>
44-
</command>
45-
</epp>
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?><epp xsi:schemaLocation="urn:ietf:params:xml:ns:epp-1.0 epp-1.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:ietf:params:xml:ns:epp-1.0"><command><create><contact:create xmlns:contact="urn:ietf:params:xml:ns:contact-1.0" xsi:schemaLocation="urn:ietf:params:xml:ns:contact-1.0 contact-1.0.xsd"><contact:id>agreed6</contact:id><contact:postalInfo type="loc"><contact:name>Test Contact1</contact:name><contact:org>Test Organization</contact:org><contact:addr><contact:street>123 Main Street</contact:street><contact:city>Ottawa</contact:city><contact:sp>ON</contact:sp><contact:pc>K1R 7S8</contact:pc><contact:cc>CA</contact:cc></contact:addr></contact:postalInfo><contact:voice x="333">+1.6471114444</contact:voice><contact:fax>+1.6471114445</contact:fax><contact:email>jdoe@example.com</contact:email><contact:authInfo><contact:pw>password</contact:pw></contact:authInfo></contact:create></create><extension><fury:create xmlns:fury="urn:ietf:params:xml:ns:fury-2.0"><fury:properties><fury:property><fury:key>LANGUAGE</fury:key><fury:value>EN</fury:value></fury:property><fury:property><fury:key>CPR</fury:key><fury:value>CCT</fury:value></fury:property><fury:property><fury:key>agreement_version</fury:key><fury:value default="true" /></fury:property></fury:properties></fury:create></extension></command></epp>

‎EppLib.UnitTests/TestData/FuryDomainCreateCommand.xml‎

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<epp xsi:schemaLocation="urn:ietf:params:xml:ns:epp-1.0 epp-1.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:ietf:params:xml:ns:epp-1.0">
3-
<command>
4-
<create>
5-
<domain:create xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
6-
<domain:name>example.com</domain:name>
7-
<domain:registrant>jd1234</domain:registrant>
8-
<domain:contact type="admin">sh8013</domain:contact>
9-
<domain:contact type="tech">sh8013</domain:contact>
10-
<domain:authInfo>
11-
<domain:pw>2fooBAR</domain:pw>
12-
</domain:authInfo>
13-
</domain:create>
14-
</create>
15-
<extension>
16-
<fury:create xmlns:fury="urn:ietf:params:xml:ns:fury-2.0">
17-
<fury:properties>
18-
<fury:property>
19-
<fury:key>PRIVACY</fury:key>
20-
<fury:value>PRIVATE</fury:value>
21-
</fury:property>
22-
</fury:properties>
23-
</fury:create>
24-
</extension>
25-
</command>
26-
</epp>
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?><epp xsi:schemaLocation="urn:ietf:params:xml:ns:epp-1.0 epp-1.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:ietf:params:xml:ns:epp-1.0"><command><create><domain:create xmlns:domain="urn:ietf:params:xml:ns:domain-1.0" xsi:schemaLocation="urn:ietf:params:xml:ns:domain-1.0 domain-1.0.xsd"><domain:name>mydomain.ca</domain:name><domain:registrant>jd1234</domain:registrant><domain:contact type="admin">sh8013</domain:contact><domain:contact type="tech">sh8013</domain:contact><domain:authInfo><domain:pw>2fooBAR</domain:pw></domain:authInfo></domain:create></create><extension><fury:create xmlns:fury="urn:ietf:params:xml:ns:fury-2.0"><fury:properties><fury:property><fury:key>PRIVACY</fury:key><fury:value>PRIVATE</fury:value></fury:property></fury:properties></fury:create></extension></command></epp>

‎EppLib.UnitTests/TestData/FuryDomainUpdateCommand.xml‎

Lines changed: 1 addition & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
3-
<command>
4-
<update>
5-
<domain:update xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
6-
<domain:name>example.com</domain:name>
7-
<domain:chg>
8-
<domain:authInfo>
9-
<domain:pw>password2</domain:pw>
10-
</domain:authInfo>
11-
</domain:chg>
12-
</domain:update>
13-
</update>
14-
<extension>
15-
<fury:update xmlns:fury="urn:ietf:params:xml:ns:fury-2.0">
16-
<fury:add>
17-
<fury:properties>
18-
<fury:property>
19-
<fury:key>PRIVACY</fury:key>
20-
<fury:value>PUBLIC</fury:value>
21-
</fury:property>
22-
</fury:properties>
23-
</fury:add>
24-
<fury:rem>
25-
<fury:properties>
26-
<fury:property>
27-
<fury:key>PRIVACY</fury:key>
28-
<fury:value>PRIVATE</fury:value>
29-
</fury:property>
30-
</fury:properties>
31-
</fury:rem>
32-
</fury:update>
33-
</extension>
34-
</command>
35-
</epp>
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?><epp xsi:schemaLocation="urn:ietf:params:xml:ns:epp-1.0 epp-1.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:ietf:params:xml:ns:epp-1.0"><command><update><domain:update xmlns:domain="urn:ietf:params:xml:ns:domain-1.0" xsi:schemaLocation="urn:ietf:params:xml:ns:domain-1.0 domain-1.0.xsd"><domain:name>example.com</domain:name><domain:chg><domain:authInfo><domain:pw>password2</domain:pw></domain:authInfo></domain:chg></domain:update></update><extension><fury:update xmlns:fury="urn:ietf:params:xml:ns:fury-2.0"><fury:add><fury:properties><fury:property><fury:key>PRIVACY</fury:key><fury:value>PUBLIC</fury:value></fury:property></fury:properties></fury:add><fury:rem><fury:properties><fury:property><fury:key>PRIVACY</fury:key><fury:value>PRIVATE</fury:value></fury:property></fury:properties></fury:rem></fury:update></extension></command></epp>

‎EppLib.UnitTests/TestData/FuryLoginCommand.xml‎

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<epp xsi:schemaLocation="urn:ietf:params:xml:ns:epp-1.0 epp-1.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:ietf:params:xml:ns:epp-1.0">
3-
<command>
4-
<login>
5-
<clID>username</clID>
6-
<pw>password</pw>
7-
<options>
8-
<version>1.0</version>
9-
<lang>en</lang>
10-
</options>
11-
<svcs>
12-
<objURI>urn:ietf:params:xml:ns:epp-1.0</objURI>
13-
<objURI>urn:ietf:params:xml:ns:domain-1.0</objURI>
14-
<objURI>urn:ietf:params:xml:ns:host-1.0</objURI>
15-
<objURI>urn:ietf:params:xml:ns:contact-1.0</objURI>
16-
<svcExtension>
17-
<extURI>urn:ietf:params:xml:ns:fury-2.0</extURI>
18-
</svcExtension>
19-
</svcs>
20-
</login>
21-
<clTRID>ABC-12345</clTRID>
22-
</command>
23-
</epp>
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?><epp xsi:schemaLocation="urn:ietf:params:xml:ns:epp-1.0 epp-1.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:ietf:params:xml:ns:epp-1.0"><command><login><clID>username</clID><pw>password</pw><options><version>1.0</version><lang>en</lang></options><svcs><objURI>urn:ietf:params:xml:ns:epp-1.0</objURI><objURI>urn:ietf:params:xml:ns:domain-1.0</objURI><objURI>urn:ietf:params:xml:ns:host-1.0</objURI><objURI>urn:ietf:params:xml:ns:contact-1.0</objURI><svcExtension><extURI>urn:ietf:params:xml:ns:fury-2.0</extURI></svcExtension></svcs></login><clTRID>ABC-12345</clTRID></command></epp>

‎EppLib/Extensions/Fury/FuryContactCreateExtension.cs‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
using System.Collections.Generic;
1616
using System.Xml;
17-
using EppLib.Entities;
1817

1918
namespace EppLib.Extensions.Fury
2019
{
@@ -23,21 +22,22 @@ namespace EppLib.Extensions.Fury
2322
/// </summary>
2423
public class FuryContactCreateExtension : FuryExtension
2524
{
26-
private Dictionary<string,string> properties;
27-
28-
public FuryContactCreateExtension(string language,string cprCode,string agreement_version)
25+
private Dictionary<string, string> properties = new Dictionary<string, string>();
26+
27+
public FuryContactCreateExtension(string language, string cprCode, string agreement_version)
2928
{
30-
properties.Add("LANGUAGE", language);
31-
properties.Add("CPR", cprCode);
29+
if (!string.IsNullOrEmpty(language)) { properties.Add("LANGUAGE", language); }
30+
if (!string.IsNullOrEmpty(cprCode)) { properties.Add("CPR", cprCode); }
3231
properties.Add("agreement_version", agreement_version);
32+
3333
}
34-
34+
3535
public override XmlNode ToXml(XmlDocument doc)
3636
{
37-
var root = CreateElement(doc,"fury:create");
37+
var root = CreateElement(doc, "fury:create");
3838

3939
var propertiesNode = CreateElement(doc, "fury:properties");
40-
40+
4141
foreach (var a in properties)
4242
{
4343
var propertyNode = CreateElement(doc, "fury:property");
@@ -46,18 +46,19 @@ public override XmlNode ToXml(XmlDocument doc)
4646

4747
if (a.Value == null)
4848
{
49-
AddXmlElement(doc, propertyNode, "fury:value default", "");
49+
var e = AddXmlElement(doc, propertyNode, "fury:value", "");
50+
e.SetAttribute("default", "true");
5051
}
5152
else
5253
{
5354
AddXmlElement(doc, propertyNode, "fury:value", a.Value);
5455
}
5556

56-
propertiesNode.AppendChild(propertiesNode);
57+
propertiesNode.AppendChild(propertyNode);
5758
}
5859

5960
root.AppendChild(propertiesNode);
60-
61+
6162
return root;
6263
}
6364

‎EppLib/Extensions/Fury/FuryDomainCreateExtension.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public override XmlNode ToXml(XmlDocument doc)
3535
var propertyNode = CreateElement(doc, "fury:property");
3636
AddXmlElement(doc, propertyNode, "fury:key", "PRIVACY");
3737
AddXmlElement(doc, propertyNode, "fury:value", isPrivate ? "PRIVATE" : "PUBLIC");
38-
propertiesNode.AppendChild(propertiesNode);
38+
propertiesNode.AppendChild(propertyNode);
3939
root.AppendChild(propertiesNode);
4040

4141
return root;

‎EppLib/Extensions/Fury/FuryDomainUpdateExtension.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public override XmlNode ToXml(XmlDocument doc)
3939
AddXmlElement(doc, propertyNode, "fury:key", "PRIVACY");
4040
AddXmlElement(doc, propertyNode, "fury:value", isPrivate ? "PRIVATE" : "PUBLIC");
4141

42-
propertiesNode.AppendChild(propertiesNode);
42+
propertiesNode.AppendChild(propertyNode);
4343

4444
add.AppendChild(propertiesNode);
4545

@@ -54,7 +54,7 @@ public override XmlNode ToXml(XmlDocument doc)
5454
AddXmlElement(doc, propertyNode1, "fury:key", "PRIVACY");
5555
AddXmlElement(doc, propertyNode1, "fury:value", !isPrivate ? "PRIVATE" : "PUBLIC");
5656

57-
propertiesNode1.AppendChild(propertiesNode1);
57+
propertiesNode1.AppendChild(propertyNode1);
5858

5959
rem.AppendChild(propertiesNode1);
6060

0 commit comments

Comments
 (0)