You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by br...@apache.org on 2015/04/19 11:48:37 UTC
[1/5] [text] Use Commons CSV to parse input data for ParserTest
Repository: commons-text
Updated Branches:
refs/heads/master c4e8a3e0e -> 65852f808
Use Commons CSV to parse input data for ParserTest
Project: http://git-wip-us.apache.org/repos/asf/commons-text/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-text/commit/49ae4553
Tree: http://git-wip-us.apache.org/repos/asf/commons-text/tree/49ae4553
Diff: http://git-wip-us.apache.org/repos/asf/commons-text/diff/49ae4553
Branch: refs/heads/master
Commit: 49ae4553c1599ab82d77cf29684878e4b11b610f
Parents: c4e8a3e
Author: Benedikt Ritter <br...@apache.org>
Authored: Sun Apr 19 11:38:48 2015 +0200
Committer: Benedikt Ritter <br...@apache.org>
Committed: Sun Apr 19 11:38:48 2015 +0200
----------------------------------------------------------------------
pom.xml | 7 ++
.../apache/commons/text/names/ParserTest.java | 100 +++++++++----------
.../org/apache/commons/text/names/testNames.txt | 63 ++++++------
3 files changed, 87 insertions(+), 83 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-text/blob/49ae4553/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index cdfa9c2..f26a8a5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,6 +84,13 @@
<version>1.3</version>
<scope>test</scope>
</dependency>
+ <!-- Used to parse inputs for o.a.c.t.names.ParserTest-->
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-csv</artifactId>
+ <version>1.1</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<distributionManagement>
http://git-wip-us.apache.org/repos/asf/commons-text/blob/49ae4553/src/test/java/org/apache/commons/text/names/ParserTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/text/names/ParserTest.java b/src/test/java/org/apache/commons/text/names/ParserTest.java
index 3e4c9d8..6a3371f 100644
--- a/src/test/java/org/apache/commons/text/names/ParserTest.java
+++ b/src/test/java/org/apache/commons/text/names/ParserTest.java
@@ -22,10 +22,17 @@ import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
import java.io.IOException;
+import java.nio.charset.Charset;
import java.util.logging.Logger;
+import org.apache.commons.csv.CSVFormat;
+import org.apache.commons.csv.CSVParser;
+import org.apache.commons.csv.CSVRecord;
import org.apache.commons.lang3.StringUtils;
+import org.junit.After;
+import org.junit.Before;
import org.junit.BeforeClass;
+import org.junit.Ignore;
import org.junit.Test;
/**
@@ -33,70 +40,59 @@ import org.junit.Test;
*/
public class ParserTest {
- private static final Logger LOGGER = Logger.getLogger(ParserTest.class.getName());
+ private CSVParser parser;
- private static File testNames = null;
+ @Before
+ public void setUp() throws Exception {
+ parser = CSVParser.parse(
+ ParserTest.class.getResource("testNames.txt"),
+ Charset.forName("UTF-8"),
+ CSVFormat.DEFAULT.withDelimiter('|').withHeader());
+ }
- @BeforeClass
- public static void setUp() {
- testNames = new File(ParserTest.class.getResource("/org/apache/commons/text/names/testNames.txt").getFile());
+ @After
+ public void tearDown() throws Exception {
+ if (parser != null) {
+ parser.close();
+ }
}
@Test
- public void testAll() throws IOException {
- BufferedReader buffer = null;
- FileReader reader = null;
-
- try {
- reader = new FileReader(testNames);
- buffer = new BufferedReader(reader);
-
- String line = null;
- while ((line = buffer.readLine()) != null) {
- if (StringUtils.isBlank(line)) {
- LOGGER.warning("Empty line in testNames.txt");
- continue;
- }
-
- String[] tokens = line.split("\\|");
- if (tokens.length != 7) {
- LOGGER.warning(String.format("Invalid line in testNames.txt: %s", line));
- continue;
- }
-
- validateLine(tokens);
- }
- } finally {
- if (reader != null)
- reader.close();
- if (buffer != null)
- buffer.close();
+ public void testInputs() {
+ for (CSVRecord record : parser) {
+ validateRecord(record);
}
}
+
/**
* Validates a line in the testNames.txt file.
*
- * @param tokens the tokens with leading spaces
+ * @param record the tokens with leading spaces
*/
- private void validateLine(String[] tokens) {
- String name = tokens[0].trim();
-
- String leadingInit = tokens[1].trim();
- String first = tokens[2].trim();
- String nickname = tokens[3].trim();
- String middle = tokens[4].trim();
- String last = tokens[5].trim();
- String suffix = tokens[6].trim();
-
- HumanNameParser parser = new HumanNameParser(name);
-
- assertEquals(leadingInit, parser.getLeadingInit());
- assertEquals(first, parser.getFirst());
- assertEquals(nickname, parser.getNickname());
- assertEquals(middle, parser.getMiddle());
- assertEquals(last, parser.getLast());
- assertEquals(suffix, parser.getSuffix());
+ private void validateRecord(CSVRecord record) {
+ HumanNameParser parser = new HumanNameParser(record.get(Colums.Name));
+
+ assertEquals("Wrong LeadingInit in record " + record.getRecordNumber(),
+ record.get(Colums.LeadingInit), parser.getLeadingInit());
+
+ assertEquals("Wrong FirstName in record " + record.getRecordNumber(),
+ record.get(Colums.FirstName), parser.getFirst());
+
+ assertEquals("Wrong NickName in record " + record.getRecordNumber(),
+ record.get(Colums.NickName), parser.getNickname());
+
+ assertEquals("Wrong MiddleName in record " + record.getRecordNumber(),
+ record.get(Colums.MiddleName), parser.getMiddle());
+
+ assertEquals("Wrong LastName in record " + record.getRecordNumber(),
+ record.get(Colums.LastName), parser.getLast());
+
+ assertEquals("Wrong Suffix in record " + record.getRecordNumber(),
+ record.get(Colums.Suffix), parser.getSuffix());
}
+ private enum Colums {
+ Name,LeadingInit,FirstName,NickName,MiddleName,LastName,Suffix
+ }
}
http://git-wip-us.apache.org/repos/asf/commons-text/blob/49ae4553/src/test/resources/org/apache/commons/text/names/testNames.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/org/apache/commons/text/names/testNames.txt b/src/test/resources/org/apache/commons/text/names/testNames.txt
index 83ddc31..8e32bf1 100644
--- a/src/test/resources/org/apache/commons/text/names/testNames.txt
+++ b/src/test/resources/org/apache/commons/text/names/testNames.txt
@@ -1,31 +1,32 @@
-Björn O'Malley| | Björn| | | O'Malley|
-Bin Lin| | Bin| | | Lin|
-Linda Jones| | Linda| | | Jones|
-Jason H. Priem| | Jason| | H.| Priem|
-Björn O'Malley-Muñoz| | Björn| | | O'Malley-Muñoz|
-Björn C. O'Malley| | Björn| | C.| O'Malley|
-Björn "Bill" O'Malley| | Björn| Bill| | O'Malley|
-Björn ("Bill") O'Malley| | Björn| Bill| | O'Malley|
-Björn ("Wild Bill") O'Malley| | Björn| Wild Bill| | O'Malley|
-Björn (Bill) O'Malley| | Björn| Bill| | O'Malley|
-Björn 'Bill' O'Malley| | Björn| Bill| | O'Malley|
-Björn C O'Malley| | Björn| | C| O'Malley|
-Björn C. R. O'Malley| | Björn| | C. R.| O'Malley|
-Björn Charles O'Malley| | Björn| | Charles| O'Malley|
-Björn Charles R. O'Malley| | Björn| | Charles R.| O'Malley|
-Björn van O'Malley| | Björn| | | van O'Malley|
-Björn Charles van der O'Malley| | Björn| | Charles| van der O'Malley|
-Björn Charles O'Malley y Muñoz| | Björn| | Charles| O'Malley y Muñoz|
-Björn O'Malley, Jr.| | Björn| | | O'Malley| Jr.
-Björn O'Malley Jr| | Björn| | | O'Malley| Jr
-B O'Malley| | B| | | O'Malley|
-William Carlos Williams| | William| | Carlos| Williams|
-C. Björn Roger O'Malley| C.| Björn| | Roger| O'Malley|
-B. C. O'Malley| | B.| | C.| O'Malley|
-B C O'Malley| | B| | C| O'Malley|
-B.J. Thomas| | B.J.| | | Thomas|
-O'Malley, Björn| | Björn| | | O'Malley|
-O'Malley, Björn Jr| | Björn| | | O'Malley| Jr
-O'Malley, C. Björn| C.| Björn| | | O'Malley|
-O'Malley, C. Björn III| C.| Björn| | | O'Malley| III
-O'Malley y Muñoz, C. Björn Roger III| C.| Björn| | Roger| O'Malley y Muñoz| III
\ No newline at end of file
+Name|LeadingInit|FirstName|NickName|MiddleName|LastName|Suffix
+Björn O'Malley||Björn|||O'Malley|
+Bin Lin||Bin|||Lin|
+Linda Jones||Linda|||Jones|
+Jason H. Priem||Jason||H.|Priem|
+Björn O'Malley-Muñoz||Björn|||O'Malley-Muñoz|
+Björn C. O'Malley||Björn||C.|O'Malley|
+Björn "Bill" O'Malley||Björn|Bill||O'Malley|
+Björn ("Bill") O'Malley||Björn|Bill||O'Malley|
+Björn ("Wild Bill") O'Malley||Björn|Wild Bill||O'Malley|
+Björn (Bill) O'Malley||Björn|Bill||O'Malley|
+Björn 'Bill' O'Malley||Björn|Bill||O'Malley|
+Björn C O'Malley||Björn||C|O'Malley|
+Björn C. R. O'Malley||Björn||C. R.|O'Malley|
+Björn Charles O'Malley||Björn||Charles|O'Malley|
+Björn Charles R. O'Malley||Björn||Charles R.|O'Malley|
+Björn van O'Malley||Björn|||van O'Malley|
+Björn Charles van der O'Malley||Björn||Charles|van der O'Malley|
+Björn Charles O'Malley y Muñoz||Björn||Charles|O'Malley y Muñoz|
+Björn O'Malley, Jr.||Björn|||O'Malley|Jr.
+Björn O'Malley Jr||Björn|||O'Malley|Jr
+B O'Malley||B|||O'Malley|
+William Carlos Williams||William||Carlos|Williams|
+C. Björn Roger O'Malley|C.|Björn||Roger|O'Malley|
+B. C. O'Malley||B.||C.|O'Malley|
+B C O'Malley||B||C|O'Malley|
+B.J. Thomas||B.J.|||Thomas|
+O'Malley, Björn||Björn|||O'Malley|
+O'Malley, Björn Jr||Björn|||O'Malley|Jr
+O'Malley, C. Björn|C.|Björn|||O'Malley|
+O'Malley, C. Björn III|C.|Björn|||O'Malley|III
+O'Malley y Muñoz, C. Björn Roger III|C.|Björn||Roger|O'Malley y Muñoz|III
\ No newline at end of file
[5/5] [text] Merge branch 'refactor-nameparsertest'
Posted by br...@apache.org.
Merge branch 'refactor-nameparsertest'
Use Commons CSV to parse the testNames.txt file instead of implementing
a parsing algorithm in the test.
The input file has been adjusted for easier use in the test: A header
record has been added for easier retrieval of the fields during validation.
Furthermore the unnecessary spaces in testNames.txt have been removed.
This way we don't need to call trim on every field, making the test code
better readable.
Project: http://git-wip-us.apache.org/repos/asf/commons-text/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-text/commit/65852f80
Tree: http://git-wip-us.apache.org/repos/asf/commons-text/tree/65852f80
Diff: http://git-wip-us.apache.org/repos/asf/commons-text/diff/65852f80
Branch: refs/heads/master
Commit: 65852f808ce5b7d0652b479cc237e7531a7eb395
Parents: c4e8a3e 1ccc7b3
Author: Benedikt Ritter <br...@apache.org>
Authored: Sun Apr 19 11:45:00 2015 +0200
Committer: Benedikt Ritter <br...@apache.org>
Committed: Sun Apr 19 11:45:00 2015 +0200
----------------------------------------------------------------------
pom.xml | 7 ++
.../commons/text/names/HumanNameParserTest.java | 92 +++++++++++++++++
.../apache/commons/text/names/ParserTest.java | 102 -------------------
.../org/apache/commons/text/names/testNames.txt | 63 ++++++------
4 files changed, 131 insertions(+), 133 deletions(-)
----------------------------------------------------------------------
[4/5] [text] Extract local variable
Posted by br...@apache.org.
Extract local variable
Project: http://git-wip-us.apache.org/repos/asf/commons-text/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-text/commit/1ccc7b3d
Tree: http://git-wip-us.apache.org/repos/asf/commons-text/tree/1ccc7b3d
Diff: http://git-wip-us.apache.org/repos/asf/commons-text/diff/1ccc7b3d
Branch: refs/heads/master
Commit: 1ccc7b3d1348cf3b981f0a8a4ee885a0a6e8c3f2
Parents: 734b777
Author: Benedikt Ritter <br...@apache.org>
Authored: Sun Apr 19 11:44:39 2015 +0200
Committer: Benedikt Ritter <br...@apache.org>
Committed: Sun Apr 19 11:44:39 2015 +0200
----------------------------------------------------------------------
.../commons/text/names/HumanNameParserTest.java | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-text/blob/1ccc7b3d/src/test/java/org/apache/commons/text/names/HumanNameParserTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/text/names/HumanNameParserTest.java b/src/test/java/org/apache/commons/text/names/HumanNameParserTest.java
index 86cd304..90e1dfa 100644
--- a/src/test/java/org/apache/commons/text/names/HumanNameParserTest.java
+++ b/src/test/java/org/apache/commons/text/names/HumanNameParserTest.java
@@ -61,27 +61,28 @@ public class HumanNameParserTest {
/**
* Validates a line in the testNames.txt file.
*
- * @param record the tokens with leading spaces
+ * @param record a CSVRecord representing one record in the input file.
*/
private void validateRecord(CSVRecord record) {
HumanNameParser parser = new HumanNameParser(record.get(Colums.Name));
- assertThat("Wrong LeadingInit in record " + record.getRecordNumber(),
+ long recordNum = record.getRecordNumber();
+ assertThat("Wrong LeadingInit in record " + recordNum,
parser.getLeadingInit(), equalTo(record.get(Colums.LeadingInit)));
- assertThat("Wrong FirstName in record " + record.getRecordNumber(),
+ assertThat("Wrong FirstName in record " + recordNum,
parser.getFirst(), equalTo(record.get(Colums.FirstName)));
- assertThat("Wrong NickName in record " + record.getRecordNumber(),
+ assertThat("Wrong NickName in record " + recordNum,
parser.getNickname(), equalTo(record.get(Colums.NickName)));
- assertThat("Wrong MiddleName in record " + record.getRecordNumber(),
+ assertThat("Wrong MiddleName in record " + recordNum,
parser.getMiddle(), equalTo(record.get(Colums.MiddleName)));
- assertThat("Wrong LastName in record " + record.getRecordNumber(),
+ assertThat("Wrong LastName in record " + recordNum,
parser.getLast(), equalTo(record.get(Colums.LastName)));
- assertThat("Wrong Suffix in record " + record.getRecordNumber(),
+ assertThat("Wrong Suffix in record " + recordNum,
parser.getSuffix(), equalTo(record.get(Colums.Suffix)));
}
[2/5] [text] Rename ParserTest to match the name of the class under
test
Posted by br...@apache.org.
Rename ParserTest to match the name of the class under test
Project: http://git-wip-us.apache.org/repos/asf/commons-text/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-text/commit/b6dbc7ae
Tree: http://git-wip-us.apache.org/repos/asf/commons-text/tree/b6dbc7ae
Diff: http://git-wip-us.apache.org/repos/asf/commons-text/diff/b6dbc7ae
Branch: refs/heads/master
Commit: b6dbc7ae77721054f1f7fe87c9913fe34a36278a
Parents: 49ae455
Author: Benedikt Ritter <br...@apache.org>
Authored: Sun Apr 19 11:39:39 2015 +0200
Committer: Benedikt Ritter <br...@apache.org>
Committed: Sun Apr 19 11:39:39 2015 +0200
----------------------------------------------------------------------
.../commons/text/names/HumanNameParserTest.java | 90 ++++++++++++++++++
.../apache/commons/text/names/ParserTest.java | 98 --------------------
2 files changed, 90 insertions(+), 98 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-text/blob/b6dbc7ae/src/test/java/org/apache/commons/text/names/HumanNameParserTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/text/names/HumanNameParserTest.java b/src/test/java/org/apache/commons/text/names/HumanNameParserTest.java
new file mode 100644
index 0000000..59f98a1
--- /dev/null
+++ b/src/test/java/org/apache/commons/text/names/HumanNameParserTest.java
@@ -0,0 +1,90 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.commons.text.names;
+
+import static org.junit.Assert.assertEquals;
+
+import java.nio.charset.Charset;
+
+import org.apache.commons.csv.CSVFormat;
+import org.apache.commons.csv.CSVParser;
+import org.apache.commons.csv.CSVRecord;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Tests the {@code HumanNameParser} class.
+ */
+public class HumanNameParserTest {
+
+ private CSVParser parser;
+
+ @Before
+ public void setUp() throws Exception {
+ parser = CSVParser.parse(
+ HumanNameParserTest.class.getResource("testNames.txt"),
+ Charset.forName("UTF-8"),
+ CSVFormat.DEFAULT.withDelimiter('|').withHeader());
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ if (parser != null) {
+ parser.close();
+ }
+ }
+
+ @Test
+ public void testInputs() {
+ for (CSVRecord record : parser) {
+ validateRecord(record);
+ }
+ }
+
+
+ /**
+ * Validates a line in the testNames.txt file.
+ *
+ * @param record the tokens with leading spaces
+ */
+ private void validateRecord(CSVRecord record) {
+ HumanNameParser parser = new HumanNameParser(record.get(Colums.Name));
+
+ assertEquals("Wrong LeadingInit in record " + record.getRecordNumber(),
+ record.get(Colums.LeadingInit), parser.getLeadingInit());
+
+ assertEquals("Wrong FirstName in record " + record.getRecordNumber(),
+ record.get(Colums.FirstName), parser.getFirst());
+
+ assertEquals("Wrong NickName in record " + record.getRecordNumber(),
+ record.get(Colums.NickName), parser.getNickname());
+
+ assertEquals("Wrong MiddleName in record " + record.getRecordNumber(),
+ record.get(Colums.MiddleName), parser.getMiddle());
+
+ assertEquals("Wrong LastName in record " + record.getRecordNumber(),
+ record.get(Colums.LastName), parser.getLast());
+
+ assertEquals("Wrong Suffix in record " + record.getRecordNumber(),
+ record.get(Colums.Suffix), parser.getSuffix());
+ }
+
+ private enum Colums {
+ Name,LeadingInit,FirstName,NickName,MiddleName,LastName,Suffix
+ }
+}
http://git-wip-us.apache.org/repos/asf/commons-text/blob/b6dbc7ae/src/test/java/org/apache/commons/text/names/ParserTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/text/names/ParserTest.java b/src/test/java/org/apache/commons/text/names/ParserTest.java
deleted file mode 100644
index 6a3371f..0000000
--- a/src/test/java/org/apache/commons/text/names/ParserTest.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.commons.text.names;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.nio.charset.Charset;
-import java.util.logging.Logger;
-
-import org.apache.commons.csv.CSVFormat;
-import org.apache.commons.csv.CSVParser;
-import org.apache.commons.csv.CSVRecord;
-import org.apache.commons.lang3.StringUtils;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-
-/**
- * Tests the {@code HumanNameParser} class.
- */
-public class ParserTest {
-
- private CSVParser parser;
-
- @Before
- public void setUp() throws Exception {
- parser = CSVParser.parse(
- ParserTest.class.getResource("testNames.txt"),
- Charset.forName("UTF-8"),
- CSVFormat.DEFAULT.withDelimiter('|').withHeader());
- }
-
- @After
- public void tearDown() throws Exception {
- if (parser != null) {
- parser.close();
- }
- }
-
- @Test
- public void testInputs() {
- for (CSVRecord record : parser) {
- validateRecord(record);
- }
- }
-
-
- /**
- * Validates a line in the testNames.txt file.
- *
- * @param record the tokens with leading spaces
- */
- private void validateRecord(CSVRecord record) {
- HumanNameParser parser = new HumanNameParser(record.get(Colums.Name));
-
- assertEquals("Wrong LeadingInit in record " + record.getRecordNumber(),
- record.get(Colums.LeadingInit), parser.getLeadingInit());
-
- assertEquals("Wrong FirstName in record " + record.getRecordNumber(),
- record.get(Colums.FirstName), parser.getFirst());
-
- assertEquals("Wrong NickName in record " + record.getRecordNumber(),
- record.get(Colums.NickName), parser.getNickname());
-
- assertEquals("Wrong MiddleName in record " + record.getRecordNumber(),
- record.get(Colums.MiddleName), parser.getMiddle());
-
- assertEquals("Wrong LastName in record " + record.getRecordNumber(),
- record.get(Colums.LastName), parser.getLast());
-
- assertEquals("Wrong Suffix in record " + record.getRecordNumber(),
- record.get(Colums.Suffix), parser.getSuffix());
- }
-
- private enum Colums {
- Name,LeadingInit,FirstName,NickName,MiddleName,LastName,Suffix
- }
-}
[3/5] [text] Use hamcrest matchers for checking results
Posted by br...@apache.org.
Use hamcrest matchers for checking results
Project: http://git-wip-us.apache.org/repos/asf/commons-text/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-text/commit/734b777c
Tree: http://git-wip-us.apache.org/repos/asf/commons-text/tree/734b777c
Diff: http://git-wip-us.apache.org/repos/asf/commons-text/diff/734b777c
Branch: refs/heads/master
Commit: 734b777c09b6a637dbfa2eb341eeaa573dbe39bb
Parents: b6dbc7a
Author: Benedikt Ritter <br...@apache.org>
Authored: Sun Apr 19 11:43:13 2015 +0200
Committer: Benedikt Ritter <br...@apache.org>
Committed: Sun Apr 19 11:43:13 2015 +0200
----------------------------------------------------------------------
.../commons/text/names/HumanNameParserTest.java | 27 ++++++++++----------
1 file changed, 14 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-text/blob/734b777c/src/test/java/org/apache/commons/text/names/HumanNameParserTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/text/names/HumanNameParserTest.java b/src/test/java/org/apache/commons/text/names/HumanNameParserTest.java
index 59f98a1..86cd304 100644
--- a/src/test/java/org/apache/commons/text/names/HumanNameParserTest.java
+++ b/src/test/java/org/apache/commons/text/names/HumanNameParserTest.java
@@ -16,7 +16,8 @@
*/
package org.apache.commons.text.names;
-import static org.junit.Assert.assertEquals;
+import static org.hamcrest.Matchers.equalTo;
+import static org.junit.Assert.assertThat;
import java.nio.charset.Charset;
@@ -65,23 +66,23 @@ public class HumanNameParserTest {
private void validateRecord(CSVRecord record) {
HumanNameParser parser = new HumanNameParser(record.get(Colums.Name));
- assertEquals("Wrong LeadingInit in record " + record.getRecordNumber(),
- record.get(Colums.LeadingInit), parser.getLeadingInit());
+ assertThat("Wrong LeadingInit in record " + record.getRecordNumber(),
+ parser.getLeadingInit(), equalTo(record.get(Colums.LeadingInit)));
- assertEquals("Wrong FirstName in record " + record.getRecordNumber(),
- record.get(Colums.FirstName), parser.getFirst());
+ assertThat("Wrong FirstName in record " + record.getRecordNumber(),
+ parser.getFirst(), equalTo(record.get(Colums.FirstName)));
- assertEquals("Wrong NickName in record " + record.getRecordNumber(),
- record.get(Colums.NickName), parser.getNickname());
+ assertThat("Wrong NickName in record " + record.getRecordNumber(),
+ parser.getNickname(), equalTo(record.get(Colums.NickName)));
- assertEquals("Wrong MiddleName in record " + record.getRecordNumber(),
- record.get(Colums.MiddleName), parser.getMiddle());
+ assertThat("Wrong MiddleName in record " + record.getRecordNumber(),
+ parser.getMiddle(), equalTo(record.get(Colums.MiddleName)));
- assertEquals("Wrong LastName in record " + record.getRecordNumber(),
- record.get(Colums.LastName), parser.getLast());
+ assertThat("Wrong LastName in record " + record.getRecordNumber(),
+ parser.getLast(), equalTo(record.get(Colums.LastName)));
- assertEquals("Wrong Suffix in record " + record.getRecordNumber(),
- record.get(Colums.Suffix), parser.getSuffix());
+ assertThat("Wrong Suffix in record " + record.getRecordNumber(),
+ parser.getSuffix(), equalTo(record.get(Colums.Suffix)));
}
private enum Colums {