Merge

dibiancoj · Jun 8, 2016 · b478a31 · b478a31
2 parents 6eeff58 + 7d6afdc
commit b478a31
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/Linq4Javascript/Scripts/UnitTestsRegular.js b/Linq4Javascript/Scripts/UnitTestsRegular.js
diff --git a/Linq4Javascript/Scripts/UnitTestsRegular.ts b/Linq4Javascript/Scripts/UnitTestsRegular.ts
@@ -3633,10 +3633,12 @@ test('JLinq.ElementAt.Test.1', function () {
 test('JLinq.ElementAt.ChainTest.1', function () {
 
     //*** ElementAt doens't have a lazy iterator...it just returns the element.
+    //build the base query
+    var BaseQuery = UnitTestFramework._Array.Where(x => x.Id > 1);
 
     //go build the query
-    var ElementAt0 = UnitTestFramework._Array.Where(x => x.Id > 1).ElementAt(0);
-    var ElementAt1 = UnitTestFramework._Array.Where(x => x.Id > 1).ElementAt(1);
+    var ElementAt0 = BaseQuery.ElementAt(0);
+    var ElementAt1 = BaseQuery.ElementAt(1);
 
     //****To-UnitTestFramework._Array Test****
 
@@ -3653,7 +3655,7 @@ test('JLinq.ElementAt.ChainTest.1', function () {
 
         //go run the method that should blow up
         UnitTestFramework._Array.Where(x => x.Id > 1).ElementAt(5)
-    }, 'ArgumentOutOfRangeException. The size of the collection is less then the index specified. There are only ' + UnitTestFramework._Array.Where(x => x.Id > 1).Count() + ' elements in the query.');
+    }, 'ArgumentOutOfRangeException. The size of the collection is less then the index specified. There are only ' + BaseQuery.Count() + ' elements in the query.');
 });
 
 //#endregion
@@ -3685,10 +3687,11 @@ test('JLinq.ElementAtDefault.Test.1', function () {
 test('JLinq.ElementAtDefault.ChainTest.1', function () {
 
     //*** ElementAt doens't have a lazy iterator...it just returns the element.
+    var BaseQuery = UnitTestFramework._Array.Where(x => x.Id > 1);
 
     //go build the query
-    var ElementAtDefault0 = UnitTestFramework._Array.Where(x => x.Id > 1).ElementAtDefault(0);
-    var ElementAtDefault1 = UnitTestFramework._Array.Where(x => x.Id > 1).ElementAtDefault(1);
+    var ElementAtDefault0 = BaseQuery.ElementAtDefault(0);
+    var ElementAtDefault1 = BaseQuery.ElementAtDefault(1);
 
     //****To-UnitTestFramework._Array Test****