Added unit tests

brave-intl · Feb 12, 2019 · 760af7d · 760af7d
1 parent 38c5b12
commit 760af7d
Show file tree

Hide file tree

Showing 18 changed files with 1,734 additions and 319 deletions.
diff --git a/src/bat_native_confirmations.cc b/src/bat_native_confirmations.cc
diff --git a/src/bat_native_confirmations.h b/src/bat_native_confirmations.h
diff --git a/src/mock_confirmations_client.cc b/src/mock_confirmations_client.cc
diff --git a/src/mock_confirmations_client.h b/src/mock_confirmations_client.h
diff --git a/src/refill_tokens.h b/src/refill_tokens.h
@@ -34,6 +34,8 @@ class RefillTokens {
 
   void Refill(const WalletInfo& wallet_info, const std::string& public_key);
 
+  void OnRefill(const Result result);
+
   void RetryGettingSignedTokens();
 
  private:
@@ -60,8 +62,6 @@ class RefillTokens {
       const std::string& response,
       const std::map<std::string, std::string>& headers);
 
-  void OnRefill(const Result result);
-
   bool ShouldRefillTokens() const;
   int CalculateAmountOfTokensToRefill() const;
 

diff --git a/src/unblinded_tokens.cc b/src/unblinded_tokens.cc
@@ -41,10 +41,12 @@ void UnblindedTokens::SetTokens(const std::vector<UnblindedToken>& tokens) {
   confirmations_->SaveState();
 }
 
-void UnblindedTokens::SetTokensFromList(const base::ListValue& list) {
+void UnblindedTokens::SetTokensFromList(const base::Value& list) {
+  base::ListValue list_values(list.GetList());
+
   std::vector<UnblindedToken> unblinded_tokens;
-  for (const auto& token_value : list) {
-    auto token_base64 = token_value.GetString();
+  for (const auto& value : list_values) {
+    auto token_base64 = value.GetString();
     auto token = UnblindedToken::decode_base64(token_base64);
     unblinded_tokens.push_back(token);
   }
@@ -53,8 +55,13 @@ void UnblindedTokens::SetTokensFromList(const base::ListValue& list) {
 }
 
 void UnblindedTokens::AddTokens(const std::vector<UnblindedToken>& tokens) {
-  unblinded_tokens_.insert(unblinded_tokens_.end(), tokens.begin(),
-      tokens.end());
+  for (const auto& token : tokens) {
+    if (TokenExists(token)) {
+      continue;
+    }
+
+    unblinded_tokens_.push_back(token);
+  }
 
   confirmations_->SaveState();
 }

diff --git a/src/unblinded_tokens.h b/src/unblinded_tokens.h
@@ -30,7 +30,7 @@ class UnblindedTokens {
   base::Value GetTokensAsList();
 
   void SetTokens(const std::vector<UnblindedToken>& tokens);
-  void SetTokensFromList(const base::ListValue& list);
+  void SetTokensFromList(const base::Value& list);
 
   void AddTokens(const std::vector<UnblindedToken>& tokens);
 

diff --git a/test/confirmations_client_mock.cc b/test/confirmations_client_mock.cc
@@ -9,42 +9,74 @@ namespace confirmations {
 MockLogStreamImpl::MockLogStreamImpl(
     const char* file,
     const int line,
-    const LogLevel log_level) {
+    const ledger::LogLevel log_level) {
   std::string level;
 
   switch (log_level) {
-    case LogLevel::LOG_ERROR: {
+    case ledger::LogLevel::LOG_ERROR: {
       level = "ERROR";
       break;
     }
-    case LogLevel::LOG_WARNING: {
+    case ledger::LogLevel::LOG_WARNING: {
       level = "WARNING";
       break;
     }
-    case LogLevel::LOG_INFO: {
+    case ledger::LogLevel::LOG_INFO: {
       level = "INFO";
       break;
     }
+    case ledger::LogLevel::LOG_DEBUG: {
+      level = "DEBUG";
+      break;
+    }
+    case ledger::LogLevel::LOG_REQUEST: {
+      level = "REQUEST";
+      break;
+    }
+    case ledger::LogLevel::LOG_RESPONSE: {
+      level = "RESPONSE";
+      break;
+    }
   }
 
-  log_message_ = level + ": in " + file + " on line "
-    + std::to_string(line) + ": ";
+  log_message_ = level + ": in " + std::string(file) + " on line "
+      + std::to_string(line) + ": ";
 }
 
 std::ostream& MockLogStreamImpl::stream() {
   std::cout << std::endl << log_message_;
   return std::cout;
 }
 
+MockVerboseLogStreamImpl::MockVerboseLogStreamImpl(
+    const char* file,
+    int line,
+    int vlog_level) {
+  log_message_ = "VLOG: in " + std::string(file) + " on line "
+      + std::to_string(line) + ": ";
+}
+
+std::ostream& MockVerboseLogStreamImpl::stream() {
+  std::cout << std::endl << log_message_;
+  return std::cout;
+}
+
 MockConfirmationsClient::MockConfirmationsClient() = default;
 
 MockConfirmationsClient::~MockConfirmationsClient() = default;
 
-std::unique_ptr<LogStream> MockConfirmationsClient::Log(
+std::unique_ptr<ledger::LogStream> MockConfirmationsClient::Log(
     const char* file,
-    const int line,
-    const LogLevel log_level) const {
+    int line,
+    const ledger::LogLevel log_level) const {
   return std::make_unique<MockLogStreamImpl>(file, line, log_level);
 }
 
+std::unique_ptr<ledger::LogStream> MockConfirmationsClient::VerboseLog(
+    const char* file,
+    int line,
+    int vlog_level) const {
+  return std::make_unique<MockVerboseLogStreamImpl>(file, line, vlog_level);
+}
+
 }  // namespace confirmations