* src/**/*: Flush; syncs to DbLinq r1053. Adds

[mono.git] / mcs / class / System.Data.Linq / src / DbLinq / Test / Providers / ReadTest.cs

diff --git a/mcs/class/System.Data.Linq/src/DbLinq/Test/Providers/ReadTest.cs b/mcs/class/System.Data.Linq/src/DbLinq/Test/Providers/ReadTest.cs
index 4197f7e773e76f8147bf763c82d480a8d08b30c4..64317c45b35e119c0700b93b85302cf61267ac39 100644 (file)
--- a/mcs/class/System.Data.Linq/src/DbLinq/Test/Providers/ReadTest.cs
+++ b/mcs/class/System.Data.Linq/src/DbLinq/Test/Providers/ReadTest.cs
@@ -340,9 +340,8 @@ using DataLinq = DbLinq.Data.Linq;
             Northwind db = CreateDB();\r
             var q = from t in db.Territories\r
                     select t;\r
-            var employeeCount = q.Count();\r
+            var territoryCount = q.FirstOrDefault();\r
             db.ObjectTrackingEnabled = false;\r
-            Assert.AreEqual(4, employeeCount, "Expected for employees, got count=" + employeeCount);\r
         }\r
 \r
         [Test]\r
@@ -352,9 +351,8 @@ using DataLinq = DbLinq.Data.Linq;
             Northwind db = CreateDB();\r
             var q = from t in db.Territories\r
                     select t;\r
-            var employeeCount = q.Count();\r
+            var territoryCount = q.FirstOrDefault();\r
             db.DeferredLoadingEnabled = false;\r
-            Assert.AreEqual(4, employeeCount, "Expected for employees, got count=" + employeeCount);\r
         }\r
 \r
         [Test]\r
@@ -365,10 +363,46 @@ using DataLinq = DbLinq.Data.Linq;
             db.ObjectTrackingEnabled = false;\r
             var q = from t in db.Territories\r
                     select t;\r
-            var employeeCount = q.Count();\r
+            var territoryCount = q.Count();\r
             db.SubmitChanges();\r
         }\r
 \r
+        [Test]\r
+        public void C16_GettingProperty_DeferredLoadingEnabled2False()\r
+        {\r
+            Northwind db = CreateDB();\r
+            db.DeferredLoadingEnabled = false;\r
+            var q = from t in db.Territories\r
+                    select t;\r
+            Territory territory = q.FirstOrDefault();\r
+            Assert.IsNotNull(territory);\r
+            Assert.IsNull(territory.Region);\r
+        }\r
+\r
+        [Test]\r
+        public void C17_GettingProperty_ObjectTrackingEnabled2False()\r
+        {\r
+            Northwind db = CreateDB();\r
+            db.ObjectTrackingEnabled = false;\r
+            var q = from t in db.Territories\r
+                    select t;\r
+            Territory territory = q.FirstOrDefault();\r
+            Assert.IsNotNull(territory);\r
+            Assert.IsNull(territory.Region);\r
+        }\r
+\r
+        [Test]\r
+        public void C18_GettingProperty_LazyLoaded()\r
+        {\r
+            Northwind db = CreateDB();\r
+            var q = from t in db.Territories\r
+                    select t;\r
+            Territory territory = q.FirstOrDefault();\r
+            Assert.IsNotNull(territory);\r
+            Assert.IsNotNull(territory.Region);\r
+        }\r
+\r
+\r
         #endregion\r
 \r
         #region region D - select first or last - calls IQueryable.Execute instead of GetEnumerator\r