Fix FastConcurrentLruCacheTest

Author: SergeiPavlov

Orm/Xtensive.Orm.Tests.Core/Caching/FastConcurrentLruCacheTest.cs

@@ -39,20 +39,19 @@ public long Size
     [Test]
     public void ConstructorsTest()
     {
-      var cache = new LruCache<string, TestClass, TestClass>(
+      var cache = new FastConcurrentLruCache<string, TestClass>(
         1000,
         value => value.Text);
 
-      var cache1 = new LruCache<string, TestClass, TestClass>(
+      var cache1 = new FastConcurrentLruCache<string, TestClass>(
         1000,
-        (value) => value.Text,
-        new Biconverter<TestClass, TestClass>(value => value, value => value));
+        (value) => value.Text
+        );
 
 
       TestClass item = new TestClass("1");
       cache.Add(item);
       cache1.Add(item);
-      Assert.AreEqual(1, cache.Size);
       Assert.AreEqual(1, cache1.Count);
 
       for (int i=0;i<100000;i++) {
@@ -66,7 +65,7 @@ public void ConstructorDenyTest()
     {
       Assert.Throws<ArgumentOutOfRangeException>(() => {
         var cache =
-          new LruCache<string, TestClass, TestClass>(
+          new FastConcurrentLruCache<string, TestClass>(
             -1,
             value => value.Text
           );
@@ -76,7 +75,7 @@ public void ConstructorDenyTest()
     [Test]
     public void AddRemoveTest()
     {
-      var cache = new LruCache<string, TestClass, TestClass>(
+      var cache = new FastConcurrentLruCache<string, TestClass>(
         100,
         value => value.Text);
 
@@ -99,7 +98,7 @@ public void AddRemoveTest()
     [Test]
     public void AddDenyTest1()
     {
-      var cache = new LruCache<string, TestClass, TestClass>(
+      var cache = new FastConcurrentLruCache<string, TestClass>(
         100,
         value => value.Text);
       Assert.Throws<ArgumentNullException>(() => cache.Add(null));
@@ -109,7 +108,7 @@ public void AddDenyTest1()
     public void AddDenyTest3()
     {
       var cache =
-        new LruCache<string, BadTestClass, BadTestClass>(
+        new FastConcurrentLruCache<string, BadTestClass>(
           100,
           value => value.Identifier);
       Assert.Throws<ArgumentNullException>(() => cache.Add(new BadTestClass()));
@@ -119,7 +118,7 @@ public void AddDenyTest3()
     public void RemoveDenyTest1()
     {
       var cache =
-        new LruCache<string, TestClass, TestClass>(
+        new FastConcurrentLruCache<string, TestClass>(
           100,
           value => value.Text);
       Assert.Throws<ArgumentNullException>(() => cache.Remove(null));
@@ -129,7 +128,7 @@ public void RemoveDenyTest1()
     public void RemoveDenyTest2()
     {
       var cache =
-        new LruCache<string, TestClass, TestClass>(
+        new FastConcurrentLruCache<string, TestClass>(
           100,
           value => value.Text);
       Assert.Throws<ArgumentNullException>(() => cache.RemoveKey(null));
@@ -139,35 +138,13 @@ public void RemoveDenyTest2()
     public void RemoveDenyTest3()
     {
       var cache =
-        new LruCache<string, BadTestClass, BadTestClass>(
+        new FastConcurrentLruCache<string, BadTestClass>(
           100,
           value => value.Identifier);
       BadTestClass test1 = new BadTestClass();
       Assert.Throws<ArgumentNullException>(() => cache.Remove(test1));
     }
 
-    [Test]
-    public void IEnumerableTest()
-    {
-      var cache =
-        new LruCache<string, TestClass, TestClass>(
-          10000,
-          value => value.Text);
-      for (int i = 0; i < 100; i++)
-      {
-        cache.Add(new TestClass("item " + i));
-      }
-      Assert.AreEqual(100, cache.Count);
-
-      int itemsCount = 0;
-      foreach (TestClass testClass in cache)
-      {
-        Assert.IsTrue(testClass.Text.StartsWith("item"));
-        itemsCount++;
-      }
-      Assert.AreEqual(100, itemsCount);
-    }
-
     private static bool canFinish = true;
 
     [Test]

Orm/Xtensive.Orm/Caching/FastConcurrentLruCache{TKey, TItem}.cs

@@ -47,6 +47,7 @@ public override void Clear() =>        //TODO: Change to imp.Clear() after updat
     /// <inheritdoc/>
     public override TItem Add(TItem item, bool replaceIfExists)
     {
+      ArgumentValidator.EnsureArgumentNotNull(item, "item");
       var key = KeyExtractor(item);
       if (replaceIfExists) {
         imp.AddOrUpdate(key, item);