Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
30 changes: 30 additions & 0 deletions .github/workflows/unittests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: Unit Tests

on:
push:
branches: [ main ]
pull_request:
branches: [ main ]

jobs:
test:

runs-on: windows-latest

steps:
- uses: actions/checkout@v2

- name: Setup MSBuild
uses: microsoft/setup-msbuild@v1

- name: Setup NuGet.exe
uses: NuGet/setup-nuget@v1.0.5

- name: Restore NuGet packages
run: nuget restore NHtmlUnit.sln

- name: Build Solution
run: msbuild NHtmlUnit.sln

- name: Test Solution
run: packages\NUnit.ConsoleRunner.3.12.0\tools\nunit3-console.exe tests\IntegrationTests\bin\x64\Debug\IntegrationTests.dll
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
*.dotCover
*.nupkg
.DS_Store
/.vs
/_ReSharper.NHtmlUnit/
/packages/*
!/packages/repositories.config
Expand Down
26 changes: 26 additions & 0 deletions NHtmlUnit.nuspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?xml version="1.0"?>
<package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<metadata>
<id>NHtmlUnit</id>
<version>2.50.0.0</version>
<title>NHtmlUnit</title>
<authors>OKB AS</authors>
<owners>OKB AS</owners>
<licenseUrl>http://www.apache.org/licenses/LICENSE-2.0</licenseUrl>
<projectUrl>https://github.com/HtmlUnit/NHtmlUnit</projectUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<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>
<releaseNotes>Updated to version 7.4.5196 of IKVM.</releaseNotes>
<copyright>Copyright © OKB AS 2021</copyright>
<tags>testing htmlunit nhtmlunit headless browser</tags>
<dependencies>
<dependency id="IKVM" version="7.4.5196.0" />
</dependencies>
<frameworkAssemblies />
<references />
</metadata>
<files>
<file src="app\NHtmlUnit\bin\Release\HtmlUnit.dll" target="lib/net45" />
<file src="app\NHtmlUnit\bin\Release\NHtmlUnit.dll" target="lib/net45" />
</files>
</package>
7 changes: 5 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
| | **Status** |
| ---------------------: | :------------------------ |
| **GitHub** | [![GitHub release][1]][2] |
| **GitHub Actions** | [![Unit Tests][11]][12] |
| **NuGet** | [![NuGet][3]][4] |
| **Travis** (Linux) | [![Master][5]][6] |
| **AppVeyor** (Windows) | [![Master][7]][8] |
Expand Down Expand Up @@ -94,8 +95,10 @@ NHtmlUnit was written by @asbjornu and @beewarloc.
[6]: https://travis-ci.org/HtmlUnit/NHtmlUnit
[7]: https://img.shields.io/appveyor/ci/HtmlUnit/NHtmlUnit/master.svg
[8]: https://ci.appveyor.com/project/HtmlUnit/NHtmlUnit/branch/master
[9]: https://www.codefactor.io/repository/github/htmlunit/nhtmlunit/badge/master
[10]: https://www.codefactor.io/repository/github/htmlunit/nhtmlunit/overview/master
[9]: https://www.codefactor.io/repository/github/htmlunit/nhtmlunit/badge
[10]: https://www.codefactor.io/repository/github/htmlunit/nhtmlunit
[11]: https://github.com/HtmlUnit/NHtmlUnit/actions/workflows/unittests.yml/badge.svg
[12]: https://github.com/HtmlUnit/NHtmlUnit/actions/workflows/unittests.yml
[htmlunit]: http://htmlunit.sourceforge.net/
[ikvm]: http://www.ikvm.net/
[nuget]: https://nuget.org/packages/NHtmlUnit
Expand Down
6 changes: 3 additions & 3 deletions app/GlobalAssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#region License

// --------------------------------------------------
// Copyright © 2003-2016 OKB. All Rights Reserved.
// Copyright © 2003-2021 OKB. All Rights Reserved.
//
// This software is proprietary information of OKB.
// USE IS SUBJECT TO LICENSE TERMS.
Expand All @@ -14,6 +14,6 @@

[assembly : AssemblyCompany("OKB AS")]
[assembly : AssemblyProduct("NHtmlUnit")]
[assembly : AssemblyCopyright("Copyright © OKB AS 2016")]
[assembly : AssemblyTrademark("OKB AS 2016")]
[assembly : AssemblyCopyright("Copyright © OKB AS 2021")]
[assembly : AssemblyTrademark("OKB AS 2021")]
[assembly : ComVisible(false)]
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Generated class v2.19.0.0, don't modify
// Generated class v2.50.0.0, don't modify

using System;
using System.Collections.Generic;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Generated class v2.19.0.0, don't modify
// Generated class v2.50.0.0, don't modify

using System;
using System.Collections.Generic;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Generated class v2.19.0.0, don't modify
// Generated class v2.50.0.0, don't modify

using System;
using System.Collections.Generic;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Generated class v2.19.0.0, don't modify
// Generated class v2.50.0.0, don't modify

using System;
using System.Collections.Generic;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Generated class v2.19.0.0, don't modify
// Generated class v2.50.0.0, don't modify

using System;
using System.Collections.Generic;
Expand Down Expand Up @@ -47,14 +47,12 @@ public System.String Name
return WObj.getName();
}
}

public System.Boolean Specified
{
get
{
return WObj.getSpecified();
}
}
// Generating method code for isSpecified
public virtual bool IsSpecified()
{
return WObj.isSpecified();
}

// Generating method code for detachFromParent
public virtual void DetachFromParent()
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Generated class v2.19.0.0, don't modify
// Generated class v2.50.0.0, don't modify

using System;
using System.Collections.Generic;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Generated class v2.19.0.0, don't modify
// Generated class v2.50.0.0, don't modify

using System;
using System.Collections.Generic;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Generated class v2.19.0.0, don't modify
// Generated class v2.50.0.0, don't modify

using System;
using System.Collections.Generic;
Expand Down
40 changes: 13 additions & 27 deletions app/NHtmlUnit/Generated/Activex/Javascript/Msxml/XMLDOMDocument.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Generated class v2.19.0.0, don't modify
// Generated class v2.50.0.0, don't modify

using System;
using System.Collections.Generic;
Expand Down Expand Up @@ -55,19 +55,6 @@ public NHtmlUnit.Activex.Javascript.Msxml.XMLDOMParseError ParseError
}


public System.Boolean Async
{
get
{
return WObj.getAsync();
}
set
{
WObj.setAsync(value);
}

}

public NHtmlUnit.Activex.Javascript.Msxml.XMLDOMDocumentType Doctype
{
get
Expand All @@ -88,19 +75,6 @@ public NHtmlUnit.Activex.Javascript.Msxml.XMLDOMImplementation Implementation
}


public System.Boolean PreserveWhiteSpace
{
get
{
return WObj.getPreserveWhiteSpace();
}
set
{
WObj.setPreserveWhiteSpace(value);
}

}

public System.String Url
{
get
Expand All @@ -121,6 +95,18 @@ public virtual object CreateAttribute(string name)
return ObjectWrapper.CreateWrapper<object>(arg);
}

// Generating method code for isAsync
public virtual bool IsAsync()
{
return WObj.isAsync();
}

// Generating method code for isPreserveWhiteSpace
public virtual bool IsPreserveWhiteSpace()
{
return WObj.isPreserveWhiteSpace();
}

// Generating method code for createCDATASection
public virtual object CreateCDATASection(string data)
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Generated class v2.19.0.0, don't modify
// Generated class v2.50.0.0, don't modify

using System;
using System.Collections.Generic;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Generated class v2.19.0.0, don't modify
// Generated class v2.50.0.0, don't modify

using System;
using System.Collections.Generic;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Generated class v2.19.0.0, don't modify
// Generated class v2.50.0.0, don't modify

using System;
using System.Collections.Generic;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Generated class v2.19.0.0, don't modify
// Generated class v2.50.0.0, don't modify

using System;
using System.Collections.Generic;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Generated class v2.19.0.0, don't modify
// Generated class v2.50.0.0, don't modify

using System;
using System.Collections.Generic;
Expand All @@ -8,7 +8,7 @@

namespace NHtmlUnit.Activex.Javascript.Msxml
{
public partial class XMLDOMNamedNodeMap : NHtmlUnit.Activex.Javascript.Msxml.MSXMLScriptable, NHtmlUnit.Javascript.IScriptableWithFallbackGetter
public partial class XMLDOMNamedNodeMap : NHtmlUnit.Activex.Javascript.Msxml.MSXMLScriptable
{
static XMLDOMNamedNodeMap()
{
Expand Down Expand Up @@ -58,13 +58,6 @@ public virtual object GetNamedItem(string name)
return ObjectWrapper.CreateWrapper<object>(arg);
}

// Generating method code for getWithFallback
public virtual object GetWithFallback(string name)
{
var arg = WObj.getWithFallback(name);
return ObjectWrapper.CreateWrapper<object>(arg);
}

// Generating method code for nextNode
public virtual object NextNode()
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Generated class v2.19.0.0, don't modify
// Generated class v2.50.0.0, don't modify

using System;
using System.Collections.Generic;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Generated class v2.19.0.0, don't modify
// Generated class v2.50.0.0, don't modify

using System;
using System.Collections.Generic;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Generated class v2.19.0.0, don't modify
// Generated class v2.50.0.0, don't modify

using System;
using System.Collections.Generic;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Generated class v2.19.0.0, don't modify
// Generated class v2.50.0.0, don't modify

using System;
using System.Collections.Generic;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Generated class v2.19.0.0, don't modify
// Generated class v2.50.0.0, don't modify

using System;
using System.Collections.Generic;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Generated class v2.19.0.0, don't modify
// Generated class v2.50.0.0, don't modify

using System;
using System.Collections.Generic;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Generated class v2.19.0.0, don't modify
// Generated class v2.50.0.0, don't modify

using System;
using System.Collections.Generic;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Generated class v2.19.0.0, don't modify
// Generated class v2.50.0.0, don't modify

using System;
using System.Collections.Generic;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Generated class v2.19.0.0, don't modify
// Generated class v2.50.0.0, don't modify

using System;
using System.Collections.Generic;
Expand Down
2 changes: 1 addition & 1 deletion app/NHtmlUnit/Generated/AjaxController.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Generated class v2.19.0.0, don't modify
// Generated class v2.50.0.0, don't modify

using System;
using System.Collections.Generic;
Expand Down
6 changes: 5 additions & 1 deletion app/NHtmlUnit/Generated/Attachment/IAttachmentHandler.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Wrapper for com.gargoylesoftware.htmlunit.attachment.AttachmentHandler
// Generated class v2.19.0.0, don't modify
// Generated class v2.50.0.0, don't modify

using System;
using System.Collections.Generic;
Expand All @@ -15,6 +15,10 @@ public interface IAttachmentHandler : NHtmlUnit.IObjectWrapper
{
// Generating method code for handleAttachment
void HandleAttachment(NHtmlUnit.IPage p);
// Generating method code for handleAttachment
bool HandleAttachment(NHtmlUnit.WebResponse response);
// Generating method code for isAttachment
bool IsAttachment(NHtmlUnit.WebResponse response);

}
}
Loading