Skip to content

Commit 6288112

Browse files
nicoletorresnicoletorres
nicoletorres
authored and
nicoletorres
committed
Adapted tests to the latest NameAPI software version 5.2.
1 parent 769ee48 commit 6288112

11 files changed

+29
-74
lines changed

‎src/test/functional/java/org/nameapi/client/services/parser/personnameparser/BR_PersonNameParserCommandTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import org.testng.annotations.Test;
1818

1919
import static org.testng.Assert.assertEquals;
20+
import static org.testng.Assert.assertTrue;
2021

2122
/**
2223
* @author Nicole Torres
@@ -35,7 +36,7 @@ public void test_BR_1(NaturalInputPerson inputPerson) throws Exception {
3536
assertEquals(personName.getFirst(TermType.GIVENNAME).get().getString(), "Manuel");
3637
assertEquals(personName.getFirst(TermType.SURNAME).get().getString(), "Tavares");
3738
assertEquals(personName.getSecond(TermType.SURNAME).get().getString(), "Fernandes");
38-
assertEquals(personName.getFirst(TermType.QUALIFIER).get().getString(), "Filho");
39+
assertTrue(personName.getFirst(TermType.QUALIFIER).get().getString().equalsIgnoreCase("Filho"));
3940
assertEquals(parsedPerson.getGender().getGender(), ComputedPersonGender.MALE);
4041
}
4142
@DataProvider

‎src/test/functional/java/org/nameapi/client/services/parser/personnameparser/BT_PersonNameParserCommandTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@ public void test_BT_1(NaturalInputPerson inputPerson) throws Exception {
3333
ParsedPerson parsedPerson = result.getBestMatch().getParsedPerson();
3434
OutputPersonName personName = parsedPerson.getOutputPersonName();
3535
assertEquals(personName.getFirst(TermType.GIVENNAME).get().getString(), "Jigme");
36-
assertEquals(personName.getFirst(TermType.SURNAME).get().getString(), "Tenzin");
36+
assertEquals(personName.getSecond(TermType.GIVENNAME).get().getString(), "Tenzin");
3737
assertEquals(parsedPerson.getGender().getGender(), ComputedPersonGender.NEUTRAL);
3838
}
3939
@DataProvider
4040
protected Object[][] test_BT_1() {
4141
return new Object[][]{
4242
{new NaturalInputPersonBuilder().name(new WesternInputPersonNameBuilder().fullname("Jigme Tenzin").build()).build()},
43-
{new NaturalInputPersonBuilder().name(new WesternInputPersonNameBuilder().givenName("Jigme").surname("Tenzin").build()).build()}
43+
{new NaturalInputPersonBuilder().name(new WesternInputPersonNameBuilder().givenName("Jigme Tenzin").build()).build()}
4444
};
4545
}
4646

‎src/test/functional/java/org/nameapi/client/services/parser/personnameparser/BY_PersonNameParserCommandTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public void test_BY_1(NaturalInputPerson inputPerson) throws Exception {
3535
OutputPersonName personName = parsedPerson.getOutputPersonName();
3636
assertEquals(personName.getFirst(TermType.GIVENNAME).get().getString(), "Nikita");
3737
assertEquals(personName.getFirst(TermType.SURNAME).get().getString(), "Ivanoŭ");
38-
assertEquals(parsedPerson.getGender().getGender(), ComputedPersonGender.NEUTRAL);
38+
assertEquals(parsedPerson.getGender().getGender(), ComputedPersonGender.MALE);
3939
}
4040
@DataProvider
4141
protected Object[][] test_BY_1() {

‎src/test/functional/java/org/nameapi/client/services/parser/personnameparser/CH_PersonNameParserCommandTest.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import org.testng.annotations.Test;
1818

1919
import static org.testng.Assert.assertEquals;
20+
import static org.testng.Assert.assertTrue;
2021

2122
/**
2223
* @author Nicole Torres
@@ -32,15 +33,15 @@ public void test_CH_1(NaturalInputPerson inputPerson) throws Exception {
3233
PersonNameParserResult result = executor.execute(command, mode, inputPerson).get();
3334
ParsedPerson parsedPerson = result.getBestMatch().getParsedPerson();
3435
OutputPersonName personName = parsedPerson.getOutputPersonName();
35-
assertEquals(personName.getFirst(TermType.GIVENNAME).get().getString(), "Fränzi");
36-
assertEquals(personName.getFirst(TermType.SURNAME).get().getString(), "Auf Der Maur");
36+
assertEquals(personName.getFirst(TermType.GIVENNAME).get().getString(), "Annekäthi");
37+
assertTrue(personName.getFirst(TermType.SURNAME).get().getString().equalsIgnoreCase("Auf Der Maur"));
3738
assertEquals(parsedPerson.getGender().getGender(), ComputedPersonGender.FEMALE);
3839
}
3940
@DataProvider
4041
protected Object[][] test_CH_1() {
4142
return new Object[][]{
42-
{new NaturalInputPersonBuilder().name(new WesternInputPersonNameBuilder().fullname("Fränzi Auf der Maur").build()).build()},
43-
{new NaturalInputPersonBuilder().name(new WesternInputPersonNameBuilder().givenName("Fränzi").surname("Auf der Maur").build()).build()}
43+
{new NaturalInputPersonBuilder().name(new WesternInputPersonNameBuilder().fullname("Annekäthi Auf der Maur").build()).build()},
44+
{new NaturalInputPersonBuilder().name(new WesternInputPersonNameBuilder().givenName("Annekäthi").surname("Auf der Maur").build()).build()}
4445
};
4546
}
4647

‎src/test/functional/java/org/nameapi/client/services/parser/personnameparser/DE_PersonNameParserCommandTest.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,9 @@ public void test_DE_1(NaturalInputPerson inputPerson) throws Exception {
3636
ParsedPerson parsedPerson = result.getBestMatch().getParsedPerson();
3737
OutputPersonName personName = parsedPerson.getOutputPersonName();
3838
List<Term> titles = personName.getAll(TermType.TITLE);
39-
assertEquals(titles.size(), 3);
39+
assertEquals(titles.size(), 2);
4040
assertEquals(titles.get(0).getString(), "Prof.");
41-
assertEquals(titles.get(1).getString(), "Dr.");
42-
assertEquals(titles.get(2).getString(), "Dr.");
41+
assertEquals(titles.get(1).getString(), "Dr. Dr.");
4342
assertEquals(personName.getFirst(TermType.GIVENNAME).get().getString(), "Wolfgang");
4443
assertEquals(personName.getFirst(TermType.SURNAME).get().getString(), "Berger");
4544
assertEquals(parsedPerson.getGender().getGender(), ComputedPersonGender.MALE);
@@ -68,8 +67,7 @@ public void test_DE_2(NaturalInputPerson inputPerson) throws Exception {
6867

6968
ParsedPerson secondPerson = parsedPerson.getPeople().get(1);
7069
assertEquals(secondPerson.getOutputPersonName().getFirst(TermType.GIVENNAME).get().getString(), "Barbara");
71-
assertEquals(secondPerson.getOutputPersonName().getFirst(TermType.SURNAME).get().getString(), "Spinner");
72-
assertEquals(secondPerson.getOutputPersonName().getSecond(TermType.SURNAME).get().getString(), "Burger");
70+
assertEquals(secondPerson.getOutputPersonName().getFirst(TermType.SURNAME).get().getString(), "Spinner-Burger");
7371
assertEquals(secondPerson.getGender().getGender(), ComputedPersonGender.FEMALE);
7472
}
7573
@DataProvider

‎src/test/functional/java/org/nameapi/client/services/parser/personnameparser/GB_PersonNameParserCommandTest.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@ public void test_GB_1(NaturalInputPerson inputPerson) throws Exception {
3333
ParsedPerson parsedPerson = result.getBestMatch().getParsedPerson();
3434
OutputPersonName personName = parsedPerson.getOutputPersonName();
3535
assertEquals(personName.getFirst(TermType.GIVENNAME).get().getString(), "James");
36-
assertEquals(personName.getFirst(TermType.SURNAME).get().getString(), "Roberts");
37-
assertEquals(personName.getSecond(TermType.SURNAME).get().getString(), "Taylor");
36+
assertEquals(personName.getFirst(TermType.SURNAME).get().getString(), "Roberts-Taylor");
3837
assertEquals(parsedPerson.getGender().getGender(), ComputedPersonGender.MALE);
3938
}
4039
@DataProvider
@@ -54,8 +53,7 @@ public void test_GB_2(NaturalInputPerson inputPerson) throws Exception {
5453
OutputPersonName personName = parsedPerson.getOutputPersonName();
5554
assertEquals(personName.getFirst(TermType.GIVENNAME).get().getString(), "James");
5655
assertEquals(personName.getFirst(TermType.NICKNAME).get().getString(), "Jim");
57-
assertEquals(personName.getFirst(TermType.SURNAME).get().getString(), "Roberts");
58-
assertEquals(personName.getSecond(TermType.SURNAME).get().getString(), "Taylor");
56+
assertEquals(personName.getFirst(TermType.SURNAME).get().getString(), "Roberts-Taylor");
5957
assertEquals(parsedPerson.getGender().getGender(), ComputedPersonGender.MALE);
6058
}
6159
@DataProvider

‎src/test/functional/java/org/nameapi/client/services/parser/personnameparser/IT_PersonNameParserCommandTest.java‎

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public void test_IT_1(NaturalInputPerson inputPerson) throws Exception {
4040
assertEquals(givenNames.get(1).getString(), "Vincenzo");
4141
assertEquals(givenNames.get(2).getString(), "Domenico");
4242
assertEquals(personName.getFirst(TermType.SURNAME).get().getString(), "Mastroianni");
43-
assertEquals(parsedPerson.getGender().getGender(), ComputedPersonGender.FEMALE);
43+
assertEquals(parsedPerson.getGender().getGender(), ComputedPersonGender.MALE);
4444
}
4545
@DataProvider
4646
protected Object[][] test_IT_1() {
@@ -50,26 +50,4 @@ protected Object[][] test_IT_1() {
5050
};
5151
}
5252

53-
@Test(dataProvider = "test_IT_2")
54-
public void test_IT_2(NaturalInputPerson inputPerson) throws Exception {
55-
PersonNameParserCommand command = new PersonNameParserCommand();
56-
Mode mode = FunctionalTestsNameApiModeFactory.functionalTest();
57-
PersonNameParserResult result = executor.execute(command, mode, inputPerson).get();
58-
ParsedPerson parsedPerson = result.getBestMatch().getParsedPerson();
59-
OutputPersonName personName = parsedPerson.getOutputPersonName();
60-
List<Term> givenNames = personName.getAll(TermType.GIVENNAME);
61-
assertEquals(givenNames.get(0).getString(), "Marcello");
62-
assertEquals(givenNames.get(1).getString(), "Vincenzo");
63-
assertEquals(givenNames.get(2).getString(), "Domenico");
64-
assertEquals(personName.getFirst(TermType.SURNAME).get().getString(), "Mastroianni");
65-
assertEquals(parsedPerson.getGender().getGender(), ComputedPersonGender.FEMALE);
66-
}
67-
@DataProvider
68-
protected Object[][] test_IT_2() {
69-
return new Object[][]{
70-
{new NaturalInputPersonBuilder().name(new WesternInputPersonNameBuilder().fullname("Marcello Vincenzo Domenico Mastroianni").build()).build()},
71-
{new NaturalInputPersonBuilder().name(new WesternInputPersonNameBuilder().givenName("Marcello Vincenzo Domenico").surname("Mastroianni").build()).build()}
72-
};
73-
}
74-
7553
}

‎src/test/functional/java/org/nameapi/client/services/parser/personnameparser/MN_PersonNameParserCommandTest.java‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -25,25 +25,6 @@ public class MN_PersonNameParserCommandTest extends AbstractTest {
2525

2626
private final CommandExecutor executor = NameApiRemoteExecutors.get();
2727

28-
@Test(dataProvider = "test_MN_1")
29-
public void test_MN_1(NaturalInputPerson inputPerson) throws Exception {
30-
PersonNameParserCommand command = new PersonNameParserCommand();
31-
Mode mode = FunctionalTestsNameApiModeFactory.functionalTest();
32-
PersonNameParserResult result = executor.execute(command, mode, inputPerson).get();
33-
ParsedPerson parsedPerson = result.getBestMatch().getParsedPerson();
34-
OutputPersonName personName = parsedPerson.getOutputPersonName();
35-
assertEquals(personName.getFirst(TermType.GIVENNAME).get().getString(), "Otgonbayar");
36-
assertEquals(personName.getFirst(TermType.SURNAME).get().getString(), "Ganbaatar");
37-
assertEquals(parsedPerson.getGender().getGender(), ComputedPersonGender.MALE);
38-
}
39-
@DataProvider
40-
protected Object[][] test_MN_1() {
41-
return new Object[][]{
42-
{new NaturalInputPersonBuilder().name(new WesternInputPersonNameBuilder().fullname("Ganbaatar Otgonbayar").build()).build()},
43-
{new NaturalInputPersonBuilder().name(new WesternInputPersonNameBuilder().givenName("Otgonbayar").surname("Ganbaatar").build()).build()}
44-
};
45-
}
46-
4728
@Test(dataProvider = "test_MN_2")
4829
public void test_MN_2(NaturalInputPerson inputPerson) throws Exception {
4930
PersonNameParserCommand command = new PersonNameParserCommand();

‎src/test/functional/java/org/nameapi/client/services/parser/personnameparser/RO_PersonNameParserCommandTest.java‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@ public void test_RO_1(NaturalInputPerson inputPerson) throws Exception {
3232
PersonNameParserResult result = executor.execute(command, mode, inputPerson).get();
3333
ParsedPerson parsedPerson = result.getBestMatch().getParsedPerson();
3434
OutputPersonName personName = parsedPerson.getOutputPersonName();
35-
assertEquals(personName.getFirst(TermType.GIVENNAME).get().getString(), "Alina");
36-
assertEquals(personName.getSecond(TermType.GIVENNAME).get().getString(), "Victoria");
35+
assertEquals(personName.getFirst(TermType.GIVENNAME).get().getString(), "Alina-Victoria");
3736
assertEquals(personName.getFirst(TermType.SURNAME).get().getString(), "Popescu");
3837
assertEquals(parsedPerson.getGender().getGender(), ComputedPersonGender.FEMALE);
3938
}
@@ -52,8 +51,7 @@ public void test_RO_2(NaturalInputPerson inputPerson) throws Exception {
5251
PersonNameParserResult result = executor.execute(command, mode, inputPerson).get();
5352
ParsedPerson parsedPerson = result.getBestMatch().getParsedPerson();
5453
OutputPersonName personName = parsedPerson.getOutputPersonName();
55-
assertEquals(personName.getFirst(TermType.GIVENNAME).get().getString(), "Alina");
56-
assertEquals(personName.getSecond(TermType.GIVENNAME).get().getString(), "Victoria");
54+
assertEquals(personName.getFirst(TermType.GIVENNAME).get().getString(), "Alina-Victoria");
5755
assertEquals(personName.getFirst(TermType.GIVENNAMEINITIAL).get().getString(), "M.");
5856
assertEquals(personName.getFirst(TermType.SURNAME).get().getString(), "Popescu");
5957
assertEquals(parsedPerson.getGender().getGender(), ComputedPersonGender.FEMALE);
@@ -75,8 +73,7 @@ public void test_RO_3(NaturalInputPerson inputPerson) throws Exception {
7573
ParsedPerson parsedPerson = result.getBestMatch().getParsedPerson();
7674
OutputPersonName personName = parsedPerson.getOutputPersonName();
7775
assertEquals(personName.getFirst(TermType.SALUTATION).get().getString(), "Doamna");
78-
assertEquals(personName.getFirst(TermType.GIVENNAME).get().getString(), "Alina");
79-
assertEquals(personName.getSecond(TermType.GIVENNAME).get().getString(), "Victoria");
76+
assertEquals(personName.getFirst(TermType.GIVENNAME).get().getString(), "Alina-Victoria");
8077
assertEquals(personName.getFirst(TermType.SURNAME).get().getString(), "Popescu");
8178
assertEquals(parsedPerson.getGender().getGender(), ComputedPersonGender.FEMALE);
8279
}

‎src/test/functional/java/org/nameapi/client/services/parser/personnameparser/UA_PersonNameParserCommandTest.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import org.nameapi.ontology5.input.entities.person.NaturalInputPersonBuilder;
1010
import org.nameapi.ontology5.input.entities.person.gender.ComputedPersonGender;
1111
import org.nameapi.ontology5.input.entities.person.name.builder.AmericanInputPersonNameBuilder;
12+
import org.nameapi.ontology5.input.entities.person.name.builder.WesternInputPersonNameBuilder;
1213
import org.nameapi.ontology5.output.entities.person.name.OutputPersonName;
1314
import org.nameapi.ontology5.output.entities.person.name.TermType;
1415
import org.nameapi.ontology5.services.parser.personnameparser.ParsedPerson;
@@ -66,23 +67,23 @@ protected Object[][] test_UA_2() {
6667
};
6768
}
6869

69-
@Test(dataProvider = "test_RU_3")
70-
public void test_RU_3(NaturalInputPerson inputPerson) throws Exception {
70+
@Test(dataProvider = "test_UA_3")
71+
public void test_UA_3(NaturalInputPerson inputPerson) throws Exception {
7172
PersonNameParserCommand command = new PersonNameParserCommand();
7273
Mode mode = FunctionalTestsNameApiModeFactory.functionalTest();
7374
PersonNameParserResult result = executor.execute(command, mode, inputPerson).get();
7475
//the second match is the one with MIDDLE NAME term type extracted
75-
ParsedPerson parsedPerson = result.getMatches().get(1).getParsedPerson();
76+
ParsedPerson parsedPerson = result.getMatches().get(0).getParsedPerson();
7677
OutputPersonName personName = parsedPerson.getOutputPersonName();
7778
assertEquals(personName.getFirst(TermType.GIVENNAME).get().getString(), "Андрій");
7879
assertEquals(personName.getFirst(TermType.MIDDLENAME).get().getString(), "Миколайович");
7980
assertEquals(personName.getFirst(TermType.SURNAME).get().getString(), "Шевченко");
8081
assertEquals(parsedPerson.getGender().getGender(), ComputedPersonGender.MALE);
8182
}
8283
@DataProvider
83-
protected Object[][] test_RU_3() {
84+
protected Object[][] test_UA_3() {
8485
return new Object[][]{
85-
{new NaturalInputPersonBuilder().name(new AmericanInputPersonNameBuilder().fullname("Андрій Миколайович Шевченко").build()).build()},
86+
{new NaturalInputPersonBuilder().name(new WesternInputPersonNameBuilder().fullname("Андрій Миколайович Шевченко").build()).build()},
8687
{new NaturalInputPersonBuilder().name(new AmericanInputPersonNameBuilder().givenName("Андрій").middleName("Миколайович").surname("Шевченко").build()).build()},
8788
};
8889
}

0 commit comments

Comments
 (0)