Merge pull request #82 from bchavez/issue_80

🔥 GO GO GO 🚒
bchavez · Aug 4, 2016 · 714a2de · 714a2de
2 parents d7f9f93 + 29bcc59
commit 714a2de
Show file tree

Hide file tree

Showing 8 changed files with 74 additions and 9 deletions.
diff --git a/Source/RethinkDb.Driver.Tests/NLog.config b/Source/RethinkDb.Driver.Tests/NLog.config
@@ -29,6 +29,8 @@
     <target xsi:type="File" name="f" fileName="${basedir}/logs/${shortdate}.log"
             layout="${longdate} ${uppercase:${level}} ${message}" />
     -->
+      <target xsi:type="File" name="f" fileName="${basedir}/TRACE.log"
+            layout="${uppercase:${level}} ${message}" deleteOldFileOnStartup="true" />
       <target name="memory" xsi:type="Memory" layout="${uppercase:${level}} ${message}" />
       <target name="console" xsi:type="Console" layout="${uppercase:${level}} ${message}"/>
   </targets>
@@ -40,6 +42,6 @@
     Write all events with minimal level of Debug (So Debug, Info, Warn, Error and Fatal, but not Trace)  to "f"
     <logger name="*" minlevel="Debug" writeTo="f" />
     -->
-      <logger name="*" minlevel="Trace" writeTo="console, memory" />
+      <logger name="*" minlevel="Trace" writeTo="console, memory, f" />
   </rules>
 </nlog>
diff --git a/Source/RethinkDb.Driver.Tests/QueryTestFixture.cs b/Source/RethinkDb.Driver.Tests/QueryTestFixture.cs
@@ -84,6 +84,7 @@ public void AfterRunningTestSession()
         [SetUp]
         public  virtual void BeforeEachTest()
         {
+            Converter.InitializeDefault();
             EnsureConnection();
 
             try

diff --git a/Source/RethinkDb.Driver.Tests/ReQL/GroupingTests.cs b/Source/RethinkDb.Driver.Tests/ReQL/GroupingTests.cs
@@ -19,6 +19,12 @@ public class Game
     [TestFixture]
     public class GroupingTests : QueryTestFixture
     {
+        public override void BeforeEachTest()
+        {
+            base.BeforeEachTest();
+            ClearDefaultTable();
+        }
+
         [Test]
         public void can_read_grouping_reql_type()
         {

diff --git a/...thinkDb.Driver.Tests/ReQL/GitterIssues.cs → ...ethinkDb.Driver.Tests/ReQL/SlackIssues.cs b/...thinkDb.Driver.Tests/ReQL/GitterIssues.cs → ...ethinkDb.Driver.Tests/ReQL/SlackIssues.cs
@@ -1,16 +1,16 @@
-using System;
-using System.Dynamic;
 using System.Linq;
 using FluentAssertions;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
 using Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Serialization;
 using NUnit.Framework;
-using RethinkDb.Driver.Ast;
 using RethinkDb.Driver.Model;
 using RethinkDb.Driver.Tests.Utils;
 
 namespace RethinkDb.Driver.Tests.ReQL
 {
-    public class GitterQuestions : QueryTestFixture
+    public class SlackIssues : QueryTestFixture
     {
 
         public class Person
@@ -68,5 +68,51 @@ public void jakes_serilization_of_jobject_issue()
             var result = R.Db(DbName).Table(TableName).Insert(poco).RunResult(conn);
             result.AssertInserted(1);
         }
+
+
+        [Test]
+        public void olivers_datetimeoffset_issue()
+        {
+            ClearDefaultTable();
+
+            var settings = new JsonSerializerSettings
+                {
+                    ContractResolver = new CamelCasePropertyNamesContractResolver(),
+                    DateFormatHandling = DateFormatHandling.IsoDateFormat,
+                    DateParseHandling = DateParseHandling.None,
+                    DateTimeZoneHandling = DateTimeZoneHandling.Unspecified,
+                    Converters = new JsonConverter[] {new StringEnumConverter()},
+                    NullValueHandling = NullValueHandling.Ignore,
+                };
+
+            Net.Converter.Converters = settings.Converters.ToArray();
+
+            Net.Converter.Serializer = JsonSerializer.Create(settings);
+
+
+            var obj = new JObject
+                {
+                    ["time"] = "2016-08-04T00:00:00+00:00"
+                };
+
+            var insertResult = R.Db(DbName).Table(TableName).Insert(obj)
+                .RunResult(conn);
+
+            insertResult.Dump();
+
+            var key = insertResult.GeneratedKeys[0];
+
+            var getResult = R.Db(DbName).Table(TableName).Get(key)
+                .RunResult<JObject>(conn);
+
+            var timeThing = getResult["time"];
+
+            timeThing.Type.Should().Be(JTokenType.String);
+
+            var putBack = R.Db(DbName).Table(TableName).Update(getResult)
+                .RunResult(conn);
+
+            putBack.Dump();
+        }
     }
 }
diff --git a/Source/RethinkDb.Driver.Tests/RethinkDb.Driver.Tests.csproj b/Source/RethinkDb.Driver.Tests/RethinkDb.Driver.Tests.csproj
@@ -124,7 +124,6 @@
     <Compile Include="ReQL\Examples.cs" />
     <Compile Include="ReQL\ExperimentalTests.cs" />
     <Compile Include="ReQL\GitHubIssues.cs" />
-    <Compile Include="ReQL\GitterIssues.cs" />
     <Compile Include="ReQL\GroupingTests.cs" />
     <Compile Include="ReQL\JObjectTests.cs" />
     <Compile Include="ReQL\MapTests.cs" />
@@ -133,6 +132,7 @@
     <Compile Include="ReQL\BinaryTests.cs" />
     <Compile Include="ReQL\RunHelperTests.cs" />
     <Compile Include="ReQL\RxReactiveExtensionTests.cs" />
+    <Compile Include="ReQL\SlackIssues.cs" />
     <Compile Include="ReQL\StackOverflowQuestions.cs" />
     <Compile Include="TestLogContext.cs" />
     <Compile Include="Utils\ExtensionsForTesting.cs" />

diff --git a/Source/RethinkDb.Driver.Tests/TestLogContext.cs b/Source/RethinkDb.Driver.Tests/TestLogContext.cs
@@ -26,7 +26,6 @@ public static string LogText()
 
         public static void ResetContext()
         {
-            //Context = new TestLogContext();
             memoryTarget = LogManager.Configuration.FindTargetByName<MemoryTarget>("memory");
             memoryTarget.Logs.Clear();
         }

diff --git a/Source/RethinkDb.Driver/Net/Response.cs b/Source/RethinkDb.Driver/Net/Response.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
@@ -67,7 +68,8 @@ private Response(long token, ResponseType responseType)
         public static Response ParseFrom(long token, string buf)
         {
             Log.Trace($"JSON Recv: Token: {token}, JSON: {buf}");
-            var jsonResp = JObject.Parse(buf);
+
+            var jsonResp = ParseJson(buf);
             var responseType = jsonResp[TypeKey].ToObject<ResponseType>();
             var responseNotes = jsonResp[NotesKey]?.ToObject<List<ResponseNote>>() ?? new List<ResponseNote>();
             ErrorType? et = jsonResp[ErrorKey]?.ToObject<ErrorType>();
@@ -87,6 +89,15 @@ public static Response ParseFrom(long token, string buf)
             return res;
         }
 
+        private static JObject ParseJson(string buf)
+        {
+            using( var reader = new JsonTextReader(new StringReader(buf)) )
+            {                
+                return Converter.Serializer.Deserialize<JObject>(reader);
+            }
+        }
+
+
         internal virtual bool IsWaitComplete => this.Type == ResponseType.WAIT_COMPLETE;
 
         /* Whether the response is any kind of feed */

diff --git a/Source/RethinkDb.Driver/Utils/ExtensionsForType.cs b/Source/RethinkDb.Driver/Utils/ExtensionsForType.cs
@@ -12,7 +12,7 @@ public static bool IsASubclassOf(this Type type, Type other)
         }
         public static bool IsJToken(this Type type)
         {
-            return typeof(JToken).GetTypeInfo().IsAssignableFrom(type.GetTypeInfo());
+            return typeof(JToken) == type || type.IsASubclassOf(typeof(JToken));
         }
 
         public static bool IsGenericType(this Type type)
-Original file line number
+Diff line change
@@ Expand Up / @@ -84,6 +84,7 @@ public void AfterRunningTestSession() @@
             [SetUp]
             public  virtual void BeforeEachTest()
             {
+                Converter.InitializeDefault();
                 EnsureConnection();
                 try
@@ Expand Down @@