Issue 189 - Implement API changes from #117, #153, #192 in libadblockplus

test/FilterEngine.cpp

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "BaseJsTest.h"
 
 namespace
 {
   typedef std::tr1::shared_ptr<AdblockPlus::FilterEngine> FilterEnginePtr;
 
   class VeryLazyFileSystem : public LazyFileSystem
   {
   public:
-    std::tr1::shared_ptr<std::istream> Read(const std::string& path) const
+    StatResult Stat(const std::string& path) const
     {
-      std::string dummyData("# Adblock Plus preferences");
-      return std::tr1::shared_ptr<std::istream>(new std::istringstream(dummyData));
+      return StatResult();
     }
   };
 
   template<class FileSystem, class LogSystem>
   class FilterEngineTestGeneric : public BaseJsTest
   {
   protected:
     FilterEnginePtr filterEngine;
 
     void SetUp()
@@ skipping 73 matching lines @@
   subscription->SetProperty("stringFoo", "y");
   subscription->SetProperty("intFoo", 24);
   subscription->SetProperty("boolFoo", true);
   ASSERT_EQ("y", subscription->GetProperty("stringFoo")->AsString());
   ASSERT_EQ(24, subscription->GetProperty("intFoo")->AsInt());
   ASSERT_TRUE(subscription->GetProperty("boolFoo")->AsBool());
 }
 
 TEST_F(FilterEngineTest, AddRemoveSubscriptions)
 {
-  // There should be only the default subscription initially
-  ASSERT_EQ(1u, filterEngine->GetListedSubscriptions().size());
+  ASSERT_EQ(0u, filterEngine->GetListedSubscriptions().size());
   AdblockPlus::SubscriptionPtr subscription = filterEngine->GetSubscription("foo");
-  ASSERT_EQ(1u, filterEngine->GetListedSubscriptions().size());
+  ASSERT_EQ(0u, filterEngine->GetListedSubscriptions().size());
   ASSERT_FALSE(subscription->IsListed());
   subscription->AddToList();
-  ASSERT_EQ(2u, filterEngine->GetListedSubscriptions().size());
-  ASSERT_EQ(*subscription, *filterEngine->GetListedSubscriptions()[1]);
+  ASSERT_EQ(1u, filterEngine->GetListedSubscriptions().size());
+  ASSERT_EQ(*subscription, *filterEngine->GetListedSubscriptions()[0]);
   ASSERT_TRUE(subscription->IsListed());
   subscription->AddToList();
-  ASSERT_EQ(2u, filterEngine->GetListedSubscriptions().size());
-  ASSERT_EQ(*subscription, *filterEngine->GetListedSubscriptions()[1]);
+  ASSERT_EQ(1u, filterEngine->GetListedSubscriptions().size());
+  ASSERT_EQ(*subscription, *filterEngine->GetListedSubscriptions()[0]);
   ASSERT_TRUE(subscription->IsListed());
   subscription->RemoveFromList();
-  ASSERT_EQ(1u, filterEngine->GetListedSubscriptions().size());
+  ASSERT_EQ(0u, filterEngine->GetListedSubscriptions().size());
   ASSERT_FALSE(subscription->IsListed());
   subscription->RemoveFromList();
-  ASSERT_EQ(1u, filterEngine->GetListedSubscriptions().size());
+  ASSERT_EQ(0u, filterEngine->GetListedSubscriptions().size());
   ASSERT_FALSE(subscription->IsListed());
 }
 
 TEST_F(FilterEngineTest, SubscriptionUpdates)
 {
   AdblockPlus::SubscriptionPtr subscription = filterEngine->GetSubscription("foo");
   ASSERT_FALSE(subscription->IsUpdating());
   subscription->UpdateFilters();
 }
 
@@ skipping 152 matching lines @@
   ASSERT_EQ(AdblockPlus::Filter::TYPE_EXCEPTION, match5->GetType());
 }
 
 TEST_F(FilterEngineTest, FirstRunFlag)
 {
   ASSERT_FALSE(filterEngine->IsFirstRun());
 }
 
 TEST_F(FilterEngineTestNoData, FirstRunFlag)
 {
-  ASSERT_FALSE(filterEngine->IsFirstRun());
+  ASSERT_TRUE(filterEngine->IsFirstRun());
 }