From 5b28336d5657db4710841b6290b0ce73382c3807 Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Mon, 23 Jul 2012 12:21:26 -0500 Subject: [PATCH] Move db verification into tests --- lib/linguist/classifier.rb | 9 --------- test/test_classifier.rb | 6 +++++- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/lib/linguist/classifier.rb b/lib/linguist/classifier.rb index 843ffa3c..a7f3a16c 100644 --- a/lib/linguist/classifier.rb +++ b/lib/linguist/classifier.rb @@ -57,15 +57,6 @@ module Linguist nil end - # Public: Verify internal counts are consistent. - # - # Returns Boolean. - def verify - @languages.inject(0) { |n, (_, c)| n += c } == @languages_total && - @language_tokens.inject(0) { |n, (_, c)| n += c } == @tokens_total && - @tokens.inject(0) { |n, (_, ts)| n += ts.inject(0) { |m, (_, c)| m += c } } == @tokens_total - end - # Public: Prune infrequent tokens. # # Returns receiver Classifier instance. diff --git a/test/test_classifier.rb b/test/test_classifier.rb index 0571f85e..b0923fce 100644 --- a/test/test_classifier.rb +++ b/test/test_classifier.rb @@ -64,7 +64,11 @@ class TestClassifier < Test::Unit::TestCase end def test_verify - assert Classifier.instance.verify + data = Classifier.instance.to_hash + + assert_equal data['languages_total'], data['languages'].inject(0) { |n, (_, c)| n += c } + assert_equal data['tokens_total'], data['language_tokens'].inject(0) { |n, (_, c)| n += c } + assert_equal data['tokens_total'], data['tokens'].inject(0) { |n, (_, ts)| n += ts.inject(0) { |m, (_, c)| m += c } } end def test_gc