Fixed #307 - Internet.UserAgent() sometimes generated invalid user agent strings that could not be parsed by System.Net.Http.HttpRequestMessage.Headers.

Author: bchavez

HISTORY.md

@@ -1,3 +1,8 @@
+## v30.0.1-beta-3
+Release Date: 2020-06-29
+
+* Issue 307: Fixed `Internet.UserAgent()` sometimes generating invalid user agent strings that could not be parsed by `System.Net.Http.HttpRequestMessage.Headers`.
+
 ## v30.0.1-beta-2
 Release Date: 2020-06-20
 

Source/Bogus.Tests/Bogus.Tests.csproj

@@ -19,6 +19,9 @@
   <ItemGroup>
     <ProjectReference Include="..\Bogus\Bogus.csproj" />
   </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System.Net.Http" />
+  </ItemGroup>
   <ItemGroup>
     <None Update="Rantionary-3.0.17.rantpkg">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>

Source/Bogus.Tests/DataSetTests/InternetTests.cs

@@ -1,15 +1,22 @@
-using System.Linq;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
 using Bogus.DataSets;
 using FluentAssertions;
 using Xunit;
+using Xunit.Abstractions;
 using Z.ExtensionMethods;
 
 namespace Bogus.Tests.DataSetTests
 {
    public class InternetTests : SeededTest
    {
-      public InternetTests()
+      private readonly ITestOutputHelper console;
+
+      public InternetTests(ITestOutputHelper console)
       {
+         this.console = console;
          internet = new Internet();
       }
 
@@ -149,13 +156,19 @@ public void can_make_email_with_custom_options()
          email.Should().Be("cowboy.Beatty30@yahoo.com");
       }
 
-
       [Fact]
       public void can_pick_random_browser()
       {
-         Enumerable.Range(1, 200).Select(
-               i => internet.UserAgent())
-            .Dump();
+         var userAgents = Enumerable.Range(1, 1_000)
+            .Select(i => internet.UserAgent())
+            .ToArray();
+
+         var req = new System.Net.Http.HttpRequestMessage();
+         foreach( var userAgent in userAgents )
+         {
+            Action act = () => req.Headers.Add("User-Agent", userAgent);
+            act.ShouldNotThrow();
+         }
       }
 
       [Theory]

Source/Bogus/Vendor/UserAgentGenerator.cs

@@ -173,34 +173,36 @@ internal string BrowserAgent(string browser, string arch)
          {
             var safari = VersionString("safari");
             var os_ver = (arch == "mac")
-               ? "(Macintosh; " + RandomProc("mac") + " Mac OS X " + VersionString("osx", "_") + ") "
+               ? "(Macintosh; " + RandomProc("mac") + " Mac OS X " + VersionString("osx", "_") + ")"
                : (arch == "win")
                   ? "(Windows; U; Windows NT " + VersionString("nt") + ")"
-                  : "(X11; Linux " + RandomProc(arch);
+                  : "(X11; Linux " + RandomProc(arch) + ")";
 
             return "Mozilla/5.0 " + os_ver + " AppleWebKit/" + safari + " (KHTML, like Gecko) Chrome/" + VersionString("chrome") + " Safari/" + safari;
          }
          if( browser == "opera" )
          {
-            var presto_ver = " Presto/" + VersionString("presto") + " Version/" + VersionString("presto2") + ")";
             var os_ver = (arch == "win")
-               ? "(Windows NT " + VersionString("nt") + "; U; " + RandomLanguage() + presto_ver
+               ? "(Windows NT " + VersionString("nt") + "; U; " + RandomLanguage() +")"
                : (arch == "lin")
-                  ? "(X11; Linux " + RandomProc(arch) + "; U; " + RandomLanguage() + presto_ver
-                  : "(Macintosh; Intel Mac OS X " + VersionString("osx") + " U; " + RandomLanguage() + " Presto/" +
-                    VersionString("presto") + " Version/" + VersionString("presto2") + ")";
+                  ? "(X11; Linux " + RandomProc(arch) + "; U; " + RandomLanguage()+ ")"
+                  : "(Macintosh; Intel Mac OS X " + VersionString("osx") + " U; " + RandomLanguage() + ")";
 
-            return "Opera/" + this.Random.Number(9, 14) + "." + this.Random.Number(0, 99) + " " + os_ver;
+            var majorVersion = this.Random.Number(9, 14) + "." + this.Random.Number(0, 99);
+
+            var presto_ver = "Presto/" + VersionString("presto") + " Version/" + VersionString("presto2");
+
+            return "Opera/" + majorVersion + " " + os_ver + " " + presto_ver;
          }
          if( browser == "safari" )
          {
             var safari = VersionString("safari");
             var ver = this.Random.Number(4, 7) + "." + this.Random.Number(0, 1) + "." + this.Random.Number(0, 10);
             var os_ver = (arch == "mac")
-               ? "(Macintosh; " + RandomProc("mac") + " Mac OS X " + VersionString("osx", "_") + " rv:" + this.Random.Number(2, 6) + ".0; " + RandomLanguage() + ") "
+               ? "(Macintosh; " + RandomProc("mac") + " Mac OS X " + VersionString("osx", "_") + " rv:" + this.Random.Number(2, 6) + ".0; " + RandomLanguage() + ")"
                : "(Windows; U; Windows NT " + VersionString("nt") + ")";
 
-            return "Mozilla/5.0 " + os_ver + "AppleWebKit/" + safari + " (KHTML, like Gecko) Version/" + ver + " Safari/" + safari;
+            return "Mozilla/5.0 " + os_ver + " AppleWebKit/" + safari + " (KHTML, like Gecko) Version/" + ver + " Safari/" + safari;
          }
          if( browser == "iexplorer" )
          {