修改 Composite 测试

JamesZBL · JamesZBL · commit 69e92e6ee47d · 2017-11-20T21:00:07.000+08:00
diff --git a/composite/src/test/java/me/zbl/composite/WriterTest.java b/composite/src/test/java/me/zbl/composite/WriterTest.java
@@ -55,12 +55,13 @@ public void tearDown() throws Exception {
   @Test
   public void sentenceByChinese() throws Exception {
     final Writer writer = new Writer();
-    // TODO: 17-11-19 testWriter()
+    testWriterCn(writer.sentenceByChinese(), "我是来自北京的小明。");
   }
 
   @Test
   public void sentenceByEnglish() throws Exception {
-    // TODO: 17-11-19  testWriter()
+    final Writer writer = new Writer();
+    testWriter(writer.sentenceByEnglish(), "I am a student from London.");
   }
 
   /**
@@ -70,12 +71,26 @@ public void sentenceByEnglish() throws Exception {
    * @param expectedString 期望值
    */
   private void testWriter(final CharacterComposite givenComposite, final String expectedString) {
-    final String[] words = expectedString.split(" ");
+    final String[] words = expectedString.trim().split(" ");
     assertNotNull(givenComposite);
     assertEquals(givenComposite.count(), words.length);
 
     givenComposite.print();
 
     assertEquals(expectedString, new String(this.stdOutBuffer.toByteArray()).trim());
   }
+
+  /**
+   * 测试输出是否和预期相等_中文
+   *
+   * @param givenComposite 输入的组件
+   * @param expectedString 期望值
+   */
+  private void testWriterCn(final CharacterComposite givenComposite, final String expectedString) {
+    assertNotNull(givenComposite);
+
+    givenComposite.print();
+
+    assertEquals(expectedString, new String(this.stdOutBuffer.toByteArray()).trim());
+  }
 }
