fix encoding of unittest

Author: neuecc

sandbox/ConsoleApp/Program.cs

@@ -1,44 +1,84 @@
 using Cysharp.Web;
-using Refit;
 using System.Net.Http.Json;
 using System.Runtime.Serialization;
 using System.Text;
 
-var httpClient = new HttpClient { BaseAddress = new Uri("http://localhost:5000") };
+//var httpClient = new HttpClient { BaseAddress = new Uri("http://localhost:5000") };
 //var api = RestService.For<IMinimumAPI>(client);
 //await api.Get(10, "octocat");
 
+System.Globalization.CultureInfo.CurrentCulture = System.Globalization.CultureInfo.InvariantCulture;
+Console.WriteLine(System.Globalization.CultureInfo.CurrentCulture);
 
+var a = System.Text.Encodings.Web.UrlEncoder.Default.Encode("hoge and 日本語 japanese");
+var b = System.Text.Encodings.Web.UrlEncoder.Default.Encode(a);
+//Console.WriteLine(b);
 
+var req = new PagingRequest
+{
+    SortDirection = SortDirection.Default,
+    CurrentPage = 10,
+    SortBy = "hoge and 日本語 japanese"
+};
+
+var nullreq = new PagingRequest
+{
+    SortDirection = SortDirection.Asc,
+    CurrentPage = 8888,
+    SortBy = null
+};
+
+var one = WebSerializer.ToQueryString(req);
+var two = WebSerializer.ToQueryString("/hogemoge", req);
+var three = WebSerializer.ToQueryString(nullreq);
+var four = WebSerializer.ToQueryString("/hogemoge", nullreq);
 
-//var q = WebSerializer.ToQueryString(req);
 
-var tweet = new Tweet("foo", DateTimeOffset.Now.ToUnixTimeSeconds());
-var user = new User(1999, "baz");
+Console.WriteLine(one);
 
 
-// use writer instead of StringBuilder
-var writer = new WebSerializerWriter();
+////var q = WebSerializer.ToQueryString(req);
 
-writer.NamePrefix = "tweet."; // set prefix by writer.
-WebSerializer.ToQueryString(writer, tweet); // serialize to writer
+//var tweet = new Tweet("foo", DateTimeOffset.Now.ToUnixTimeSeconds());
+//var user = new User(1999, "baz");
 
-writer.AppendConcatenate(); // Append '&'
 
-writer.NamePrefix = "user.";
-WebSerializer.ToQueryString(writer, user);
+//// use writer instead of StringBuilder
+//var writer = new WebSerializerWriter();
 
-var q = writer.GetStringBuilder().ToString(); // get inner stringbuilder.
+//writer.NamePrefix = "tweet."; // set prefix by writer.
+//WebSerializer.ToQueryString(writer, tweet); // serialize to writer
 
-// tweet.created=1641816933&tweet.msg=foo&user.id=1999&user.name=baz
-Console.WriteLine(q);
+//writer.AppendConcatenate(); // Append '&'
+
+//writer.NamePrefix = "user.";
+//WebSerializer.ToQueryString(writer, user);
+
+//var q = writer.GetStringBuilder().ToString(); // get inner stringbuilder.
+
+//// tweet.created=1641816933&tweet.msg=foo&user.id=1999&user.name=baz
+//Console.WriteLine(q);
 
 
 
 
 
 // ----
 
+
+public class PagingRequest
+{
+
+    [DataMember(Order = 1)]
+    public string? SortBy { get; init; }
+    [DataMember(Order = 2)]
+    public SortDirection SortDirection { get; init; }
+    [DataMember(Order = 0)]
+    public int CurrentPage { get; init; } = 1;
+}
+
+
+
 public record Tweet(string? msg, long created);
 public record User(long id, string? name);
 

tests/WebSerializer.Tests/StandardTest.cs

@@ -1,4 +1,7 @@
-using System.Runtime.Serialization;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Text.Encodings.Web;
+using System.Web;
 
 namespace WebSerializerTests;
 
@@ -7,11 +10,13 @@ public class StandardTest
     [Fact]
     public void ToQueryString()
     {
+
+
         var req = new PagingRequest
         {
             SortDirection = SortDirection.Default,
             CurrentPage = 10,
-            SortBy = "hoge and “ú–{Œê japanese"
+            SortBy = "hoge and 日本語 japanese"
         };
 
         var nullreq = new PagingRequest
@@ -21,6 +26,8 @@ public void ToQueryString()
             SortBy = null
         };
 
+
+
         var one = WebSerializer.ToQueryString(req);
         var two = WebSerializer.ToQueryString("/hogemoge", req);
         var three = WebSerializer.ToQueryString(nullreq);
@@ -39,7 +46,7 @@ public async Task ToHttpContent()
         {
             SortDirection = SortDirection.Default,
             CurrentPage = 10,
-            SortBy = "hoge and “ú–{Œê japanese"
+            SortBy = "hoge and 日本語 japanese"
         };
 
         var content = WebSerializer.ToHttpContent(req);
@@ -49,7 +56,7 @@ public async Task ToHttpContent()
         var form = new FormUrlEncodedContent(new KeyValuePair<string, string>[]
         {
             new ("CurrentPage", "10" ),
-            new ("SortBy", "hoge and “ú–{Œê japanese" ),
+            new ("SortBy", "hoge and 日本語 japanese" ),
             new ("SortDirection", "Default" ),
         });