Skip to content

Commit e4ad4da

Browse files
committed
Merge pull request #27 from HtmlUnit/feature/fixes
Fixes
2 parents 998dee2 + 4f3b464 commit e4ad4da

494 files changed

Lines changed: 15668 additions & 15221 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,5 @@
1313
!/packages/repositories.config
1414
!/tools/*
1515
/tools/.DS_Store
16-
/*.tss
16+
/*.tss
17+
/TestResult.xml

NHtmlUnit.nuspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
<projectUrl>https://github.com/HtmlUnit/NHtmlUnit</projectUrl>
1111
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1212
<description>NHtmlUnit is a .NET wrapper of HtmlUnit; a "GUI-less browser for Java programs". It allows you to write code to test web applications with a headless, automated browser.</description>
13-
<releaseNotes>Updated to version 2.19 of HtmlUnit.</releaseNotes>
14-
<copyright>Copyright © OKB AS 2015</copyright>
13+
<releaseNotes>Updated to version 7.4.5196 of IKVM.</releaseNotes>
14+
<copyright>Copyright © OKB AS 2016</copyright>
1515
<tags>testing htmlunit nhtmlunit headless browser</tags>
1616
<dependencies>
1717
<dependency id="IKVM" version="7.4.5196.0" />

app/NHtmlUnit/Generated/Activex/Javascript/Msxml/XMLDOMCharacterData.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,8 @@ public virtual string SubstringData(int offset, int count)
6767
// Generating method code for getData
6868
public virtual object GetData()
6969
{
70-
return WObj.getData();
70+
var arg = WObj.getData();
71+
return ObjectWrapper.CreateWrapper<object>(arg);
7172
}
7273

7374
// Generating method code for setData

app/NHtmlUnit/Generated/Activex/Javascript/Msxml/XMLDOMDocument.cs

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -117,56 +117,64 @@ public virtual bool IsPreserveWhiteSpaceDuringLoad()
117117
// Generating method code for createAttribute
118118
public virtual object CreateAttribute(string name)
119119
{
120-
return WObj.createAttribute(name);
120+
var arg = WObj.createAttribute(name);
121+
return ObjectWrapper.CreateWrapper<object>(arg);
121122
}
122123

123124
// Generating method code for createCDATASection
124125
public virtual object CreateCDATASection(string data)
125126
{
126-
return WObj.createCDATASection(data);
127+
var arg = WObj.createCDATASection(data);
128+
return ObjectWrapper.CreateWrapper<object>(arg);
127129
}
128130

129131
// Generating method code for createComment
130132
public virtual object CreateComment(string data)
131133
{
132-
return WObj.createComment(data);
134+
var arg = WObj.createComment(data);
135+
return ObjectWrapper.CreateWrapper<object>(arg);
133136
}
134137

135138
// Generating method code for createDocumentFragment
136139
public virtual object CreateDocumentFragment()
137140
{
138-
return WObj.createDocumentFragment();
141+
var arg = WObj.createDocumentFragment();
142+
return ObjectWrapper.CreateWrapper<object>(arg);
139143
}
140144

141145
// Generating method code for createElement
142146
public virtual object CreateElement(string tagName)
143147
{
144-
return WObj.createElement(tagName);
148+
var arg = WObj.createElement(tagName);
149+
return ObjectWrapper.CreateWrapper<object>(arg);
145150
}
146151

147152
// Generating method code for createNode
148153
public virtual object CreateNode(object type, string name, object namespaceURI)
149154
{
150-
return WObj.createNode(type, name, namespaceURI);
155+
var arg = WObj.createNode(type, name, namespaceURI);
156+
return ObjectWrapper.CreateWrapper<object>(arg);
151157
}
152158

153159
// Generating method code for createProcessingInstruction
154160
public virtual object CreateProcessingInstruction(string target, string data)
155161
{
156-
return WObj.createProcessingInstruction(target, data);
162+
var arg = WObj.createProcessingInstruction(target, data);
163+
return ObjectWrapper.CreateWrapper<object>(arg);
157164
}
158165

159166
// Generating method code for createTextNode
160167
public virtual object CreateTextNode(string data)
161168
{
162-
return WObj.createTextNode(data);
169+
var arg = WObj.createTextNode(data);
170+
return ObjectWrapper.CreateWrapper<object>(arg);
163171
}
164172

165173
// Generating method code for getElementsByTagName
166174
public virtual IList<NHtmlUnit.W3C.Dom.INode> GetElementsByTagName(string tagName)
167175
{
168-
169-
return new NodeListWrapper<NHtmlUnit.W3C.Dom.INode>(WObj.getElementsByTagName(tagName));
176+
177+
return new NodeListWrapper<NHtmlUnit.W3C.Dom.INode>(WObj.getElementsByTagName(tagName));
170178
}
171179

172180
// Generating method code for getProperty
@@ -190,7 +198,8 @@ public virtual bool LoadXML(string strXML)
190198
// Generating method code for nodeFromID
191199
public virtual object NodeFromID(string id)
192200
{
193-
return WObj.nodeFromID(id);
201+
var arg = WObj.nodeFromID(id);
202+
return ObjectWrapper.CreateWrapper<object>(arg);
194203
}
195204

196205
// Generating method code for setProperty

app/NHtmlUnit/Generated/Activex/Javascript/Msxml/XMLDOMElement.cs

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,19 +43,22 @@ public virtual void RemoveAttribute(string name)
4343
// Generating method code for getAttribute
4444
public virtual object GetAttribute(string name)
4545
{
46-
return WObj.getAttribute(name);
46+
var arg = WObj.getAttribute(name);
47+
return ObjectWrapper.CreateWrapper<object>(arg);
4748
}
4849

4950
// Generating method code for getAttributeNode
5051
public virtual object GetAttributeNode(string name)
5152
{
52-
return WObj.getAttributeNode(name);
53+
var arg = WObj.getAttributeNode(name);
54+
return ObjectWrapper.CreateWrapper<object>(arg);
5355
}
5456

5557
// Generating method code for removeAttributeNode
5658
public virtual NHtmlUnit.Activex.Javascript.Msxml.XMLDOMAttribute RemoveAttributeNode(NHtmlUnit.Activex.Javascript.Msxml.XMLDOMAttribute att)
5759
{
58-
return ObjectWrapper.CreateWrapper<NHtmlUnit.Activex.Javascript.Msxml.XMLDOMAttribute>(WObj.removeAttributeNode((com.gargoylesoftware.htmlunit.activex.javascript.msxml.XMLDOMAttribute)att.WrappedObject));
60+
var arg = WObj.removeAttributeNode((com.gargoylesoftware.htmlunit.activex.javascript.msxml.XMLDOMAttribute)att.WrappedObject);
61+
return ObjectWrapper.CreateWrapper<NHtmlUnit.Activex.Javascript.Msxml.XMLDOMAttribute>(arg);
5962
}
6063

6164
// Generating method code for setAttribute
@@ -67,14 +70,15 @@ public virtual void SetAttribute(string name, string value)
6770
// Generating method code for setAttributeNode
6871
public virtual NHtmlUnit.Activex.Javascript.Msxml.XMLDOMAttribute SetAttributeNode(NHtmlUnit.Activex.Javascript.Msxml.XMLDOMAttribute newAtt)
6972
{
70-
return ObjectWrapper.CreateWrapper<NHtmlUnit.Activex.Javascript.Msxml.XMLDOMAttribute>(WObj.setAttributeNode((com.gargoylesoftware.htmlunit.activex.javascript.msxml.XMLDOMAttribute)newAtt.WrappedObject));
73+
var arg = WObj.setAttributeNode((com.gargoylesoftware.htmlunit.activex.javascript.msxml.XMLDOMAttribute)newAtt.WrappedObject);
74+
return ObjectWrapper.CreateWrapper<NHtmlUnit.Activex.Javascript.Msxml.XMLDOMAttribute>(arg);
7175
}
7276

7377
// Generating method code for getElementsByTagName
7478
public virtual IList<NHtmlUnit.W3C.Dom.INode> GetElementsByTagName(string tagName)
7579
{
76-
77-
return new NodeListWrapper<NHtmlUnit.W3C.Dom.INode>(WObj.getElementsByTagName(tagName));
80+
81+
return new NodeListWrapper<NHtmlUnit.W3C.Dom.INode>(WObj.getElementsByTagName(tagName));
7882
}
7983

8084
// Generating method code for normalize

app/NHtmlUnit/Generated/Activex/Javascript/Msxml/XMLDOMNamedNodeMap.cs

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,37 +40,43 @@ public System.Int32 Length
4040
// Generating method code for getNamedItemWithoutSyntheticClassAttr
4141
public virtual object GetNamedItemWithoutSyntheticClassAttr(string name)
4242
{
43-
return WObj.getNamedItemWithoutSyntheticClassAttr(name);
43+
var arg = WObj.getNamedItemWithoutSyntheticClassAttr(name);
44+
return ObjectWrapper.CreateWrapper<object>(arg);
4445
}
4546

4647
// Generating method code for item
4748
public virtual object Item(int index)
4849
{
49-
return WObj.item(index);
50+
var arg = WObj.item(index);
51+
return ObjectWrapper.CreateWrapper<object>(arg);
5052
}
5153

5254
// Generating method code for getNamedItem
5355
public virtual object GetNamedItem(string name)
5456
{
55-
return WObj.getNamedItem(name);
57+
var arg = WObj.getNamedItem(name);
58+
return ObjectWrapper.CreateWrapper<object>(arg);
5659
}
5760

5861
// Generating method code for getWithFallback
5962
public virtual object GetWithFallback(string name)
6063
{
61-
return WObj.getWithFallback(name);
64+
var arg = WObj.getWithFallback(name);
65+
return ObjectWrapper.CreateWrapper<object>(arg);
6266
}
6367

6468
// Generating method code for nextNode
6569
public virtual object NextNode()
6670
{
67-
return WObj.nextNode();
71+
var arg = WObj.nextNode();
72+
return ObjectWrapper.CreateWrapper<object>(arg);
6873
}
6974

7075
// Generating method code for removeNamedItem
7176
public virtual object RemoveNamedItem(string name)
7277
{
73-
return WObj.removeNamedItem(name);
78+
var arg = WObj.removeNamedItem(name);
79+
return ObjectWrapper.CreateWrapper<object>(arg);
7480
}
7581

7682
// Generating method code for reset
@@ -82,7 +88,8 @@ public virtual void Reset()
8288
// Generating method code for setNamedItem
8389
public virtual object SetNamedItem(NHtmlUnit.Activex.Javascript.Msxml.XMLDOMNode node)
8490
{
85-
return WObj.setNamedItem((com.gargoylesoftware.htmlunit.activex.javascript.msxml.XMLDOMNode)node.WrappedObject);
91+
var arg = WObj.setNamedItem((com.gargoylesoftware.htmlunit.activex.javascript.msxml.XMLDOMNode)node.WrappedObject);
92+
return ObjectWrapper.CreateWrapper<object>(arg);
8693
}
8794

8895
}

app/NHtmlUnit/Generated/Activex/Javascript/Msxml/XMLDOMNode.cs

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -192,32 +192,36 @@ public System.Object Xml
192192
// Generating method code for replaceChild
193193
public virtual object ReplaceChild(object newChild, object oldChild)
194194
{
195-
return WObj.replaceChild(newChild, oldChild);
195+
var arg = WObj.replaceChild(newChild, oldChild);
196+
return ObjectWrapper.CreateWrapper<object>(arg);
196197
}
197198

198199
// Generating method code for removeChild
199200
public virtual object RemoveChild(object childNode)
200201
{
201-
return WObj.removeChild(childNode);
202+
var arg = WObj.removeChild(childNode);
203+
return ObjectWrapper.CreateWrapper<object>(arg);
202204
}
203205

204206
// Generating method code for selectNodes
205207
public virtual IList<NHtmlUnit.W3C.Dom.INode> SelectNodes(string expression)
206208
{
207-
208-
return new NodeListWrapper<NHtmlUnit.W3C.Dom.INode>(WObj.selectNodes(expression));
209+
210+
return new NodeListWrapper<NHtmlUnit.W3C.Dom.INode>(WObj.selectNodes(expression));
209211
}
210212

211213
// Generating method code for appendChild
212214
public virtual object AppendChild(object newChild)
213215
{
214-
return WObj.appendChild(newChild);
216+
var arg = WObj.appendChild(newChild);
217+
return ObjectWrapper.CreateWrapper<object>(arg);
215218
}
216219

217220
// Generating method code for cloneNode
218221
public virtual object CloneNode(bool deep)
219222
{
220-
return WObj.cloneNode(deep);
223+
var arg = WObj.cloneNode(deep);
224+
return ObjectWrapper.CreateWrapper<object>(arg);
221225
}
222226

223227
// Generating method code for hasChildNodes
@@ -229,7 +233,8 @@ public virtual bool HasChildNodes()
229233
// Generating method code for selectSingleNode
230234
public virtual object SelectSingleNode(string expression)
231235
{
232-
return WObj.selectSingleNode(expression);
236+
var arg = WObj.selectSingleNode(expression);
237+
return ObjectWrapper.CreateWrapper<object>(arg);
233238
}
234239

235240
}

app/NHtmlUnit/Generated/Activex/Javascript/Msxml/XMLDOMNodeList.cs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,15 @@ public System.Int32 Length
4040
// Generating method code for item
4141
public virtual object Item(object index)
4242
{
43-
return WObj.item(index);
43+
var arg = WObj.item(index);
44+
return ObjectWrapper.CreateWrapper<object>(arg);
4445
}
4546

4647
// Generating method code for nextNode
4748
public virtual object NextNode()
4849
{
49-
return WObj.nextNode();
50+
var arg = WObj.nextNode();
51+
return ObjectWrapper.CreateWrapper<object>(arg);
5052
}
5153

5254
// Generating method code for reset
@@ -64,13 +66,15 @@ public virtual net.sourceforge.htmlunit.corejs.javascript.Scriptable Construct(n
6466
// Generating method code for call
6567
public virtual object Call(net.sourceforge.htmlunit.corejs.javascript.Context cx, net.sourceforge.htmlunit.corejs.javascript.Scriptable scope, net.sourceforge.htmlunit.corejs.javascript.Scriptable thisObj, System.Object[] args)
6668
{
67-
return WObj.call(cx, scope, thisObj, args);
69+
var arg = WObj.call(cx, scope, thisObj, args);
70+
return ObjectWrapper.CreateWrapper<object>(arg);
6871
}
6972

7073
// Generating method code for item
7174
public virtual NHtmlUnit.W3C.Dom.INode Item(int index)
7275
{
73-
return ObjectWrapper.CreateWrapper<NHtmlUnit.W3C.Dom.INode>(WObj.item(index));
76+
var arg = WObj.item(index);
77+
return ObjectWrapper.CreateWrapper<NHtmlUnit.W3C.Dom.INode>(arg);
7478
}
7579

7680
}

app/NHtmlUnit/Generated/Activex/Javascript/Msxml/XMLDOMText.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ public XMLDOMText()
2929
// Generating method code for splitText
3030
public virtual object SplitText(int offset)
3131
{
32-
return WObj.splitText(offset);
32+
var arg = WObj.splitText(offset);
33+
return ObjectWrapper.CreateWrapper<object>(arg);
3334
}
3435

3536
}

app/NHtmlUnit/Generated/Activex/Javascript/Msxml/XMLHTTPRequest.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,8 @@ public virtual void SetRequestHeader(string name, string value)
107107
// Generating method code for getOnreadystatechange
108108
public virtual object GetOnreadystatechange()
109109
{
110-
return WObj.getOnreadystatechange();
110+
var arg = WObj.getOnreadystatechange();
111+
return ObjectWrapper.CreateWrapper<object>(arg);
111112
}
112113

113114
// Generating method code for setOnreadystatechange

0 commit comments

Comments
 (0)