Undo deleting files for prevent conflicts with master branch

Author: veblush

src/Newtonsoft.Json.Tests/Linq/JsonPath/JPathExecuteTests.cs

@@ -0,0 +1,198 @@
+#region License
+// Copyright (c) 2007 James Newton-King
+//
+// Permission is hereby granted, free of charge, to any person
+// obtaining a copy of this software and associated documentation
+// files (the "Software"), to deal in the Software without
+// restriction, including without limitation the rights to use,
+// copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following
+// conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+// OTHER DEALINGS IN THE SOFTWARE.
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Linq.JsonPath;
+#if NETFX_CORE
+using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
+using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
+using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
+#elif DNXCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
+using NUnit.Framework;
+#endif
+
+namespace Newtonsoft.Json.Tests.Linq.JsonPath
+{
+    [TestFixture]
+    public class QueryExpressionTests : TestFixtureBase
+    {
+        [Test]
+        public void AndExpressionTest()
+        {
+            CompositeExpression compositeExpression = new CompositeExpression
+            {
+                Operator = QueryOperator.And,
+                Expressions = new List<QueryExpression>
+                {
+                    new BooleanQueryExpression
+                    {
+                        Operator = QueryOperator.Exists,
+                        Path = new List<PathFilter>
+                        {
+                            new FieldFilter
+                            {
+                                Name = "FirstName"
+                            }
+                        }
+                    },
+                    new BooleanQueryExpression
+                    {
+                        Operator = QueryOperator.Exists,
+                        Path = new List<PathFilter>
+                        {
+                            new FieldFilter
+                            {
+                                Name = "LastName"
+                            }
+                        }
+                    }
+                }
+            };
+
+            JObject o1 = new JObject
+            {
+                {"Title","Title!"},
+                {"FirstName", "FirstName!"},
+                {"LastName", "LastName!"}
+            };
+
+            Assert.IsTrue(compositeExpression.IsMatch(o1));
+
+            JObject o2 = new JObject
+            {
+                {"Title","Title!"},
+                {"FirstName", "FirstName!"}
+            };
+
+            Assert.IsFalse(compositeExpression.IsMatch(o2));
+
+            JObject o3 = new JObject
+            {
+                {"Title","Title!"}
+            };
+
+            Assert.IsFalse(compositeExpression.IsMatch(o3));
+        }
+        
+        [Test]
+        public void OrExpressionTest()
+        {
+            CompositeExpression compositeExpression = new CompositeExpression
+            {
+                Operator = QueryOperator.Or,
+                Expressions = new List<QueryExpression>
+                {
+                    new BooleanQueryExpression
+                    {
+                        Operator = QueryOperator.Exists,
+                        Path = new List<PathFilter>
+                        {
+                            new FieldFilter
+                            {
+                                Name = "FirstName"
+                            }
+                        }
+                    },
+                    new BooleanQueryExpression
+                    {
+                        Operator = QueryOperator.Exists,
+                        Path = new List<PathFilter>
+                        {
+                            new FieldFilter
+                            {
+                                Name = "LastName"
+                            }
+                        }
+                    }
+                }
+            };
+
+            JObject o1 = new JObject
+            {
+                {"Title","Title!"},
+                {"FirstName", "FirstName!"},
+                {"LastName", "LastName!"}
+            };
+
+            Assert.IsTrue(compositeExpression.IsMatch(o1));
+
+            JObject o2 = new JObject
+            {
+                {"Title","Title!"},
+                {"FirstName", "FirstName!"}
+            };
+
+            Assert.IsTrue(compositeExpression.IsMatch(o2));
+
+            JObject o3 = new JObject
+            {
+                {"Title","Title!"}
+            };
+
+            Assert.IsFalse(compositeExpression.IsMatch(o3));
+        }
+
+        [Test]
+        public void BooleanExpressionTest()
+        {
+            BooleanQueryExpression e1 = new BooleanQueryExpression
+            {
+                Operator = QueryOperator.LessThan,
+                Value = new JValue(3),
+                Path = new List<PathFilter>
+                {
+                    new ArrayIndexFilter()
+                }
+            };
+
+            Assert.IsTrue(e1.IsMatch(new JArray(1, 2, 3, 4, 5)));
+            Assert.IsTrue(e1.IsMatch(new JArray(2, 3, 4, 5)));
+            Assert.IsFalse(e1.IsMatch(new JArray(3, 4, 5)));
+            Assert.IsFalse(e1.IsMatch(new JArray(4, 5)));
+
+            BooleanQueryExpression e2 = new BooleanQueryExpression
+            {
+                Operator = QueryOperator.LessThanOrEquals,
+                Value = new JValue(3),
+                Path = new List<PathFilter>
+                {
+                    new ArrayIndexFilter()
+                }
+            };
+
+            Assert.IsTrue(e2.IsMatch(new JArray(1, 2, 3, 4, 5)));
+            Assert.IsTrue(e2.IsMatch(new JArray(2, 3, 4, 5)));
+            Assert.IsTrue(e2.IsMatch(new JArray(3, 4, 5)));
+            Assert.IsFalse(e2.IsMatch(new JArray(4, 5)));
+        }
+    }
+}

src/Newtonsoft.Json.Tests/Linq/JsonPath/JPathParseTests.cs

@@ -0,0 +1,40 @@
+using System.Collections.Generic;
+using System.Globalization;
+using Newtonsoft.Json.Utilities;
+
+namespace Newtonsoft.Json.Linq.JsonPath
+{
+    internal class ArrayIndexFilter : PathFilter
+    {
+        public int? Index { get; set; }
+
+        public override IEnumerable<JToken> ExecuteFilter(IEnumerable<JToken> current, bool errorWhenNoMatch)
+        {
+            foreach (JToken t in current)
+            {
+                if (Index != null)
+                {
+                    JToken v = GetTokenIndex(t, errorWhenNoMatch, Index.Value);
+
+                    if (v != null)
+                        yield return v;
+                }
+                else
+                {
+                    if (t is JArray || t is JConstructor)
+                    {
+                        foreach (JToken v in t)
+                        {
+                            yield return v;
+                        }
+                    }
+                    else
+                    {
+                        if (errorWhenNoMatch)
+                            throw new JsonException("Index * not valid on {0}.".FormatWith(CultureInfo.InvariantCulture, t.GetType().Name));
+                    }
+                }
+            }
+        }
+    }
+}

src/Newtonsoft.Json.Tests/Linq/JsonPath/QueryExpressionTests.cs

@@ -0,0 +1,23 @@
+using System.Collections.Generic;
+
+namespace Newtonsoft.Json.Linq.JsonPath
+{
+    internal class ArrayMultipleIndexFilter : PathFilter
+    {
+        public List<int> Indexes { get; set; }
+
+        public override IEnumerable<JToken> ExecuteFilter(IEnumerable<JToken> current, bool errorWhenNoMatch)
+        {
+            foreach (JToken t in current)
+            {
+                foreach (int i in Indexes)
+                {
+                    JToken v = GetTokenIndex(t, errorWhenNoMatch, i);
+
+                    if (v != null)
+                        yield return v;
+                }
+            }
+        }
+    }
+}

src/Newtonsoft.Json/Linq/JsonPath/ArrayIndexFilter.cs

@@ -0,0 +1,74 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using Newtonsoft.Json.Utilities;
+
+namespace Newtonsoft.Json.Linq.JsonPath
+{
+    internal class ArraySliceFilter : PathFilter
+    {
+        public int? Start { get; set; }
+        public int? End { get; set; }
+        public int? Step { get; set; }
+
+        public override IEnumerable<JToken> ExecuteFilter(IEnumerable<JToken> current, bool errorWhenNoMatch)
+        {
+            if (Step == 0)
+                throw new JsonException("Step cannot be zero.");
+
+            foreach (JToken t in current)
+            {
+                JArray a = t as JArray;
+                if (a != null)
+                {
+                    // set defaults for null arguments
+                    int stepCount = Step ?? 1;
+                    int startIndex = Start ?? ((stepCount > 0) ? 0 : a.Count - 1);
+                    int stopIndex = End ?? ((stepCount > 0) ? a.Count : -1);
+
+                    // start from the end of the list if start is negitive
+                    if (Start < 0) startIndex = a.Count + startIndex;
+
+                    // end from the start of the list if stop is negitive
+                    if (End < 0) stopIndex = a.Count + stopIndex;
+
+                    // ensure indexes keep within collection bounds
+                    startIndex = Math.Max(startIndex, (stepCount > 0) ? 0 : int.MinValue);
+                    startIndex = Math.Min(startIndex, (stepCount > 0) ? a.Count : a.Count - 1);
+                    stopIndex = Math.Max(stopIndex, -1);
+                    stopIndex = Math.Min(stopIndex, a.Count);
+
+                    bool positiveStep = (stepCount > 0);
+
+                    if (IsValid(startIndex, stopIndex, positiveStep))
+                    {
+                        for (int i = startIndex; IsValid(i, stopIndex, positiveStep); i += stepCount)
+                        {
+                            yield return a[i];
+                        }
+                    }
+                    else
+                    {
+                        if (errorWhenNoMatch)
+                            throw new JsonException("Array slice of {0} to {1} returned no results.".FormatWith(CultureInfo.InvariantCulture,
+                                Start != null ? Start.Value.ToString(CultureInfo.InvariantCulture) : "*",
+                                End != null ? End.Value.ToString(CultureInfo.InvariantCulture) : "*"));
+                    }
+                }
+                else
+                {
+                    if (errorWhenNoMatch)
+                        throw new JsonException("Array slice is not valid on {0}.".FormatWith(CultureInfo.InvariantCulture, t.GetType().Name));
+                }
+            }
+        }
+
+        private bool IsValid(int index, int stopIndex, bool positiveStep)
+        {
+            if (positiveStep)
+                return (index < stopIndex);
+
+            return (index > stopIndex);
+        }
+    }
+}

src/Newtonsoft.Json/Linq/JsonPath/ArrayMultipleIndexFilter.cs

@@ -0,0 +1,43 @@
+using System.Collections.Generic;
+using System.Globalization;
+using Newtonsoft.Json.Utilities;
+
+namespace Newtonsoft.Json.Linq.JsonPath
+{
+    internal class FieldFilter : PathFilter
+    {
+        public string Name { get; set; }
+
+        public override IEnumerable<JToken> ExecuteFilter(IEnumerable<JToken> current, bool errorWhenNoMatch)
+        {
+            foreach (JToken t in current)
+            {
+                JObject o = t as JObject;
+                if (o != null)
+                {
+                    if (Name != null)
+                    {
+                        JToken v = o[Name];
+
+                        if (v != null)
+                            yield return v;
+                        else if (errorWhenNoMatch)
+                            throw new JsonException("Property '{0}' does not exist on JObject.".FormatWith(CultureInfo.InvariantCulture, Name));
+                    }
+                    else
+                    {
+                        foreach (KeyValuePair<string, JToken> p in o)
+                        {
+                            yield return p.Value;
+                        }
+                    }
+                }
+                else
+                {
+                    if (errorWhenNoMatch)
+                        throw new JsonException("Property '{0}' not valid on {1}.".FormatWith(CultureInfo.InvariantCulture, Name ?? "*", t.GetType().Name));
+                }
+            }
+        }
+    }
+}