Add a unit test for WordIterator. Fix word_iterator.* includes at the same time.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@536 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 108 insertions, 6 deletions

diff --git a/base/build/base_unittests.vcproj b/base/build/base_unittests.vcproj
index 27a4ad8..9c56e25 100644
--- a/base/build/base_unittests.vcproj
+++ b/base/build/base_unittests.vcproj
@@ -339,6 +339,10 @@
 				RelativePath="..\wmi_util_unittest.cc"
 				>
 			</File>
+			<File
+				RelativePath="..\word_iterator_unittest.cc"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="gfx_tests"
diff --git a/base/word_iterator.cc b/base/word_iterator.cc
index a21105c..b0161f2 100644
--- a/base/word_iterator.cc
+++ b/base/word_iterator.cc
@@ -27,8 +27,9 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "base/logging.h"
 #include "base/word_iterator.h"
+
+#include "base/logging.h"
 #include "unicode/ubrk.h"
 
 const int WordIterator::npos = -1;
@@ -102,4 +103,9 @@ bool WordIterator::Advance() {
 
 bool WordIterator::IsWord() const {
   return (ubrk_getRuleStatus(iter_) != UBRK_WORD_NONE);
-}
\ No newline at end of file
+}
+
+std::wstring WordIterator::GetWord() const {
+  DCHECK(prev_ >= 0 && pos_ >= 0);
+  return string_.substr(prev_, pos_ - prev_);
+}
diff --git a/base/word_iterator.h b/base/word_iterator.h
index fc722ef..8329f64 100644
--- a/base/word_iterator.h
+++ b/base/word_iterator.h
@@ -30,6 +30,8 @@
 #ifndef BASE_WORD_ITERATOR_H__
 #define BASE_WORD_ITERATOR_H__
 
+#include <string>
+
 #include "base/basictypes.h"
 #include "unicode/umachine.h"  // Needed for U_WCHAR_IS_UTF16.
 
@@ -87,10 +89,7 @@ class WordIterator {
   // Return the word between prev() and pos().
   // Advance() must have been called successfully at least once
   // for pos() to have advanced to somewhere useful.
-  std::wstring GetWord() const {
-    DCHECK(prev_ >= 0 && pos_ >= 0);
-    return string_.substr(prev_, pos_ - prev_);
-  }
+  std::wstring GetWord() const;
 
  private:
   // ICU iterator.
diff --git a/base/word_iterator_unittest.cc b/base/word_iterator_unittest.cc
new file mode 100644
index 0000000..3b73607
--- /dev/null
+++ b/base/word_iterator_unittest.cc
@@ -0,0 +1,93 @@
+// Copyright 2008, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include "base/word_iterator.h"
+
+#include "testing/gtest/include/gtest/gtest.h"
+
+TEST(WordIteratorTest, BreakWord) {
+  std::wstring str(L" foo bar! \npouet boom");
+  WordIterator iter(str, WordIterator::BREAK_WORD);
+  ASSERT_TRUE(iter.Init());
+  EXPECT_TRUE(iter.Advance());
+  EXPECT_FALSE(iter.IsWord());
+  EXPECT_EQ(L" ", iter.GetWord());
+  EXPECT_TRUE(iter.Advance());
+  EXPECT_TRUE(iter.IsWord());
+  EXPECT_EQ(L"foo", iter.GetWord());
+  EXPECT_TRUE(iter.Advance());
+  EXPECT_FALSE(iter.IsWord());
+  EXPECT_EQ(L" ", iter.GetWord());
+  EXPECT_TRUE(iter.Advance());
+  EXPECT_TRUE(iter.IsWord());
+  EXPECT_EQ(L"bar", iter.GetWord());
+  EXPECT_TRUE(iter.Advance());
+  EXPECT_FALSE(iter.IsWord());
+  EXPECT_EQ(L"!", iter.GetWord());
+  EXPECT_TRUE(iter.Advance());
+  EXPECT_FALSE(iter.IsWord());
+  EXPECT_EQ(L" ", iter.GetWord());
+  EXPECT_TRUE(iter.Advance());
+  EXPECT_FALSE(iter.IsWord());
+  EXPECT_EQ(L"\n", iter.GetWord());
+  EXPECT_TRUE(iter.Advance());
+  EXPECT_TRUE(iter.IsWord());
+  EXPECT_EQ(L"pouet", iter.GetWord());
+  EXPECT_TRUE(iter.Advance());
+  EXPECT_FALSE(iter.IsWord());
+  EXPECT_EQ(L" ", iter.GetWord());
+  EXPECT_TRUE(iter.Advance());
+  EXPECT_TRUE(iter.IsWord());
+  EXPECT_EQ(L"boom", iter.GetWord());
+  EXPECT_FALSE(iter.Advance());
+  EXPECT_FALSE(iter.IsWord());
+}
+
+TEST(WordIteratorTest, BreakLine) {
+  std::wstring str(L" foo bar! \npouet boom");
+  WordIterator iter(str, WordIterator::BREAK_LINE);
+  ASSERT_TRUE(iter.Init());
+  EXPECT_TRUE(iter.Advance());
+  EXPECT_FALSE(iter.IsWord());
+  EXPECT_EQ(L" ", iter.GetWord());
+  EXPECT_TRUE(iter.Advance());
+  EXPECT_FALSE(iter.IsWord());
+  EXPECT_EQ(L"foo ", iter.GetWord());
+  EXPECT_TRUE(iter.Advance());
+  EXPECT_TRUE(iter.IsWord());
+  EXPECT_EQ(L"bar! \n", iter.GetWord());
+  EXPECT_TRUE(iter.Advance());
+  EXPECT_FALSE(iter.IsWord());
+  EXPECT_EQ(L"pouet ", iter.GetWord());
+  EXPECT_TRUE(iter.Advance());
+  EXPECT_FALSE(iter.IsWord());
+  EXPECT_EQ(L"boom", iter.GetWord());
+  EXPECT_FALSE(iter.Advance());
+  EXPECT_FALSE(iter.IsWord());
+}