Explicitly add CollectingAlertHandler so it is generated. Fixes #17.

Author: asbjornu

app/NHtmlUnit/Generated/CollectingAlertHandler.cs

@@ -0,0 +1,50 @@
+// Generated class v2.19.0.0, don't modify
+
+using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Linq;
+using System.Text;
+
+namespace NHtmlUnit
+{
+   public partial class CollectingAlertHandler : ObjectWrapper, NHtmlUnit.IAlertHandler
+   {
+      static CollectingAlertHandler()
+      {
+         ObjectWrapper.RegisterWrapperCreator((com.gargoylesoftware.htmlunit.CollectingAlertHandler o) =>
+            new CollectingAlertHandler(o));
+      }
+
+      public CollectingAlertHandler(com.gargoylesoftware.htmlunit.CollectingAlertHandler wrappedObject) : base(wrappedObject) {}
+
+      public com.gargoylesoftware.htmlunit.CollectingAlertHandler WObj
+      {
+         get { return (com.gargoylesoftware.htmlunit.CollectingAlertHandler)WrappedObject; }
+      }
+
+      public CollectingAlertHandler(java.util.List list)
+         : this(new com.gargoylesoftware.htmlunit.CollectingAlertHandler(list)) {}
+
+      public CollectingAlertHandler()
+         : this(new com.gargoylesoftware.htmlunit.CollectingAlertHandler()) {}
+
+
+      public IList<System.String> CollectedAlerts
+      {
+         get
+         {
+            return new ShallowListWrapper<System.String>(
+               WObj.getCollectedAlerts());
+         }
+       }
+// Generating method code for handleAlert
+      public virtual void HandleAlert(NHtmlUnit.IPage page, string message)
+      {
+         WObj.handleAlert((com.gargoylesoftware.htmlunit.Page)page.WrappedObject, message);
+      }
+
+   }
+
+
+}

app/NHtmlUnit/NHtmlUnit.csproj

@@ -173,6 +173,7 @@
     <Compile Include="Generated\BrowserVersion.cs" />
     <Compile Include="Generated\BrowserVersionFeatures.cs" />
     <Compile Include="Generated\Cache.cs" />
+    <Compile Include="Generated\CollectingAlertHandler.cs" />
     <Compile Include="Generated\CookieManager.cs" />
     <Compile Include="Generated\DialogWindow.cs" />
     <Compile Include="Generated\FormEncodingType.cs" />
@@ -1151,6 +1152,7 @@
     <Compile Include="NonGenerated\BrowserVersion.cs" />
     <Compile Include="NonGenerated\BrowserVersionFeatures.cs" />
     <Compile Include="NonGenerated\Cache.cs" />
+    <Compile Include="NonGenerated\CollectingAlertHandler.cs" />
     <Compile Include="NonGenerated\CookieManager.cs" />
     <Compile Include="NonGenerated\DialogWindow.cs" />
     <Compile Include="NonGenerated\FormEncodingType.cs" />

app/NHtmlUnit/NonGenerated/CollectingAlertHandler.cs

@@ -0,0 +1,10 @@
+// Generated class v2.19.0.0, can be modified
+
+namespace NHtmlUnit
+{
+   public partial class CollectingAlertHandler
+   {
+   }
+
+
+}

app/NHtmlUnit/NonGenerated/ObjectWrapper.cs

@@ -18,7 +18,7 @@ namespace NHtmlUnit
 {
     public class ObjectWrapper : IObjectWrapper
     {
-        private static readonly Dictionary<Type, Func<object, object>> creatorDict =
+        private static readonly Dictionary<Type, Func<object, object>> WrapperCreators =
             new Dictionary<Type, Func<object, object>>();
 
         private readonly object wrappedObject;
@@ -45,25 +45,25 @@ public object WrappedObject
         public static T CreateWrapper<T>(object wrappedObject)
         {
             if (wrappedObject == null)
-                return (T)wrappedObject;
+                return default(T);
 
-            Func<object, object> creator = null;
+            Func<object, object> creator;
             var fromType = wrappedObject.GetType();
 
-            // Search up type hierche until we find a matching creator
+            // Search up type hierchy until we find a matching creator
             do
             {
-                if (!creatorDict.TryGetValue(fromType, out creator))
+                if (!WrapperCreators.TryGetValue(fromType, out creator))
                     fromType = fromType.BaseType;
             } while (creator == null && fromType != null);
 
             if (creator == null)
             {
-                Console.WriteLine("No creator found for " + wrappedObject.GetType().FullName);
-                throw new InvalidOperationException();
+                throw new InvalidOperationException("No creator found for " + wrappedObject.GetType().FullName);
             }
 
-            return (T)creator(wrappedObject);
+            var wrapper = creator(wrappedObject);
+            return (T)wrapper;
         }
 
 
@@ -72,8 +72,7 @@ public override bool Equals(object obj)
             var otherObjectWrapper = obj as ObjectWrapper;
 
             return otherObjectWrapper != null
-                       ? WrappedObject.Equals(otherObjectWrapper.WrappedObject)
-                       : false;
+                && WrappedObject.Equals(otherObjectWrapper.WrappedObject);
         }
 
 
@@ -91,7 +90,7 @@ public override string ToString()
 
         internal static void RegisterWrapperCreator<T>(Func<T, ObjectWrapper> wrapperCreator)
         {
-            creatorDict.Add(typeof(T), o => wrapperCreator((T)o));
+            WrapperCreators.Add(typeof(T), o => wrapperCreator((T)o));
         }
 
 

app/NHtmlUnitGenerator/Program.cs

@@ -52,7 +52,7 @@ private static void Main(string[] args)
             //GetJavaPropsFromType(typeof(HtmlPage));
             //GetJavaPropsFromType(typeof(HtmlInput));
 
-            wrapperRep.GenerateUntilDone(typeof(DomNode), typeof(WebClient), typeof(HtmlPage));
+            wrapperRep.GenerateUntilDone(typeof(DomNode), typeof(WebClient), typeof(HtmlPage), typeof(CollectingAlertHandler));
 
             wrapperRep.GenerateAssemblyInfo();
             wrapperRep.GenerateNuspec();

app/NHtmlUnitGenerator/WrapperMethodInfo.cs

@@ -47,7 +47,8 @@ public MethodInfo TargetMethodInfo
 
         internal void GenerateMethodCode(StringBuilder sb)
         {
-            sb.AppendLine("// Generating method code for " + TargetMethodInfo.Name);
+            var methodName = TargetMethodInfo.Name;
+            sb.AppendLine("// Generating method code for " + methodName);
 
             var validListMapping = WrapperRepository.GetValidMapping(TargetMethodInfo.ReturnType);
             var returnValueIsWrappedList = validListMapping != null;
@@ -95,7 +96,7 @@ internal void GenerateMethodCode(StringBuilder sb)
 
             // Change from camelCase to UpperCamelCase
 
-            string origName = TargetMethodInfo.Name;
+            string origName = methodName;
             string transformedName = origName.Substring(0, 1).ToUpper() + origName.Substring(1);
 
             // Check for condition where a method name has same name as property
@@ -143,7 +144,7 @@ internal void GenerateMethodCode(StringBuilder sb)
                 // Generate function call
                 var functionCallSb = new StringBuilder();
 
-                functionCallSb.AppendFormat("WObj.{0}(", TargetMethodInfo.Name);
+                functionCallSb.AppendFormat("WObj.{0}(", methodName);
 
                 firstParameter = true;
                 foreach (var mp in parameters)

tests/IntegrationTests/WebClientTests.cs

@@ -11,15 +11,27 @@
 
 using System;
 using System.Linq;
+using java.util;
 using NHtmlUnit;
 using NHtmlUnit.Html;
 using NUnit.Framework;
+using List = java.util.List;
 
 namespace IntegrationTests
 {
     [TestFixture]
     public class WebClientTests
     {
+        [Test]
+        public void CanSetAlertHandler()
+        {
+            var webClient = new WebClient(BrowserVersion.FIREFOX_38);
+
+            List collectedAlerts = new ArrayList();
+            var alertHandler = new CollectingAlertHandler(collectedAlerts);
+            webClient.AlertHandler = alertHandler;
+        }
+
         [Test]
         public void DoWikipediaSearch()
         {
@@ -31,7 +43,7 @@ public void DoWikipediaSearch()
             webClient.Options.CssEnabled = true;
 
             var page = webClient.GetHtmlPage("http://wikipedia.org");
-      
+
             page.GetElementById<HtmlInput>("searchInput").Type("network");
 
             var searchButton = page.HtmlElementDescendants