Skip to content

Commit 1f0590a

Browse files
fabiankesslerfabiankessler
committed
Merge remote-tracking branch 'origin/master'
2 parents 21b8799 + 446d9a6 commit 1f0590a

File tree

62 files changed

+2568
-114
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+2568
-114
lines changed

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

Lines changed: 69 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,38 @@
1919
import static org.testng.Assert.assertEquals;
2020

2121
/**
22-
* @author Nicole Torres
22+
* @author Nicole Torres / emilia
2323
*/
2424
public class AE_PersonNameParserCommandTest extends AbstractTest {
2525

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

28+
29+
2830
@Test(dataProvider = "test_AE_1")
2931
public void test_AE_1(NaturalInputPerson inputPerson) throws Exception {
32+
PersonNameParserCommand command = new PersonNameParserCommand();
33+
Mode mode = FunctionalTestsNameApiModeFactory.functionalTest();
34+
PersonNameParserResult result = executor.execute(command, mode, inputPerson).get();
35+
ParsedPerson parsedPerson = result.getBestMatch().getParsedPerson();
36+
OutputPersonName personName = parsedPerson.getOutputPersonName();
37+
assertEquals("حسّان", personName.getFirst(TermType.GIVENNAME).get().getString());
38+
assertEquals("عبد العزيز", personName.getSecond(TermType.GIVENNAME).get().getString());
39+
assertEquals("المصري", personName.getFirst(TermType.SURNAME).get().getString());
40+
assertEquals(parsedPerson.getGender().getGender(), ComputedPersonGender.MALE);
41+
}
42+
43+
44+
@DataProvider
45+
protected Object[][] test_AE_1() {
46+
return new Object[][]{
47+
{new NaturalInputPersonBuilder().name(new WesternInputPersonNameBuilder().fullname("حسّان عبد العزيز المصري").build()).build()},
48+
{new NaturalInputPersonBuilder().name(new WesternInputPersonNameBuilder().givenName("حسّان عبد العزيز").surname("المصري").build()).build()}
49+
};
50+
}
51+
52+
@Test(dataProvider = "test_AE_2")
53+
public void test_AE_2(NaturalInputPerson inputPerson) throws Exception {
3054
PersonNameParserCommand command = new PersonNameParserCommand();
3155
Mode mode = FunctionalTestsNameApiModeFactory.functionalTest();
3256
PersonNameParserResult result = executor.execute(command, mode, inputPerson).get();
@@ -37,12 +61,55 @@ public void test_AE_1(NaturalInputPerson inputPerson) throws Exception {
3761
assertEquals("Al-Masri", personName.getFirst(TermType.SURNAME).get().getString());
3862
assertEquals(parsedPerson.getGender().getGender(), ComputedPersonGender.MALE);
3963
}
64+
65+
4066
@DataProvider
41-
protected Object[][] test_AE_1() {
67+
protected Object[][] test_AE_2() {
4268
return new Object[][]{
4369
{new NaturalInputPersonBuilder().name(new WesternInputPersonNameBuilder().fullname("Hassan Abdul-Aziz Al-Masri").build()).build()},
4470
{new NaturalInputPersonBuilder().name(new WesternInputPersonNameBuilder().givenName("Hassan Abdul-Aziz").surname("Al-Masri").build()).build()}
4571
};
4672
}
4773

74+
@Test(dataProvider = "test_AE_3")
75+
public void test_AE_3(NaturalInputPerson inputPerson) throws Exception {
76+
PersonNameParserCommand command = new PersonNameParserCommand();
77+
Mode mode = FunctionalTestsNameApiModeFactory.functionalTest();
78+
PersonNameParserResult result = executor.execute(command, mode, inputPerson).get();
79+
ParsedPerson parsedPerson = result.getBestMatch().getParsedPerson();
80+
OutputPersonName personName = parsedPerson.getOutputPersonName();
81+
assertEquals("Hiba", personName.getFirst(TermType.GIVENNAME).get().getString());
82+
assertEquals("Al-Baghdadi", personName.getFirst(TermType.SURNAME).get().getString());
83+
assertEquals(parsedPerson.getGender().getGender(), ComputedPersonGender.FEMALE);
84+
}
85+
86+
87+
@DataProvider
88+
protected Object[][] test_AE_3() {
89+
return new Object[][]{
90+
{new NaturalInputPersonBuilder().name(new WesternInputPersonNameBuilder().fullname("Hiba Al-Baghdadi").build()).build()},
91+
{new NaturalInputPersonBuilder().name(new WesternInputPersonNameBuilder().givenName("Hiba").surname("Al-Baghdadi").build()).build()}
92+
};
93+
}
94+
95+
@Test(dataProvider = "test_AE_4")
96+
public void test_AE_4(NaturalInputPerson inputPerson) throws Exception {
97+
PersonNameParserCommand command = new PersonNameParserCommand();
98+
Mode mode = FunctionalTestsNameApiModeFactory.functionalTest();
99+
PersonNameParserResult result = executor.execute(command, mode, inputPerson).get();
100+
ParsedPerson parsedPerson = result.getBestMatch().getParsedPerson();
101+
OutputPersonName personName = parsedPerson.getOutputPersonName();
102+
assertEquals("هبة", personName.getFirst(TermType.GIVENNAME).get().getString());
103+
assertEquals("لبغدادي", personName.getFirst(TermType.SURNAME).get().getString());
104+
assertEquals(parsedPerson.getGender().getGender(), ComputedPersonGender.FEMALE);
105+
}
106+
107+
108+
@DataProvider
109+
protected Object[][] test_AE_4() {
110+
return new Object[][]{
111+
{new NaturalInputPersonBuilder().name(new WesternInputPersonNameBuilder().fullname("هبة لبغدادي").build()).build()},
112+
{new NaturalInputPersonBuilder().name(new WesternInputPersonNameBuilder().givenName("هبة").surname("لبغدادي").build()).build()}
113+
};
114+
}
48115
}

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

Lines changed: 59 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,34 @@
1919
import static org.testng.Assert.assertEquals;
2020

2121
/**
22-
* @author Nicole Torres
22+
* @author Nicole Torres / emilia
2323
*/
2424
public class AF_PersonNameParserCommandTest extends AbstractTest {
2525

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

28+
2829
@Test(dataProvider = "test_AF_1")
2930
public void test_AF_1(NaturalInputPerson inputPerson) throws Exception {
31+
PersonNameParserCommand command = new PersonNameParserCommand();
32+
Mode mode = FunctionalTestsNameApiModeFactory.functionalTest();
33+
PersonNameParserResult result = executor.execute(command, mode, inputPerson).get();
34+
ParsedPerson parsedPerson = result.getBestMatch().getParsedPerson();
35+
OutputPersonName personName = parsedPerson.getOutputPersonName();
36+
assertEquals(personName.getFirst(TermType.GIVENNAME).get().getString(), "Habiba");
37+
assertEquals(personName.getFirst(TermType.SURNAME).get().getString(), "Mohmand");
38+
assertEquals(parsedPerson.getGender().getGender(), ComputedPersonGender.FEMALE);
39+
}
40+
@DataProvider
41+
protected Object[][] test_AF_1() {
42+
return new Object[][]{
43+
{new NaturalInputPersonBuilder().name(new WesternInputPersonNameBuilder().fullname("Habiba Mohmand").build()).build()},
44+
{new NaturalInputPersonBuilder().name(new WesternInputPersonNameBuilder().givenName("Habiba").surname("Mohmand").build()).build()}
45+
};
46+
}
47+
48+
@Test(dataProvider = "test_AF_2")
49+
public void test_AF_2(NaturalInputPerson inputPerson) throws Exception {
3050
PersonNameParserCommand command = new PersonNameParserCommand();
3151
Mode mode = FunctionalTestsNameApiModeFactory.functionalTest();
3252
PersonNameParserResult result = executor.execute(command, mode, inputPerson).get();
@@ -38,11 +58,48 @@ public void test_AF_1(NaturalInputPerson inputPerson) throws Exception {
3858
assertEquals(parsedPerson.getGender().getGender(), ComputedPersonGender.MALE);
3959
}
4060
@DataProvider
41-
protected Object[][] test_AF_1() {
61+
protected Object[][] test_AF_2() {
4262
return new Object[][]{
4363
{new NaturalInputPersonBuilder().name(new WesternInputPersonNameBuilder().fullname("محمد اسحاق نادرى").build()).build()},
4464
{new NaturalInputPersonBuilder().name(new WesternInputPersonNameBuilder().givenName("محمد اسحاق").surname("نادرى").build()).build()}
4565
};
4666
}
4767

68+
@Test(dataProvider = "test_AF_3")
69+
public void test_AF_3(NaturalInputPerson inputPerson) throws Exception {
70+
PersonNameParserCommand command = new PersonNameParserCommand();
71+
Mode mode = FunctionalTestsNameApiModeFactory.functionalTest();
72+
PersonNameParserResult result = executor.execute(command, mode, inputPerson).get();
73+
ParsedPerson parsedPerson = result.getBestMatch().getParsedPerson();
74+
OutputPersonName personName = parsedPerson.getOutputPersonName();
75+
assertEquals(personName.getFirst(TermType.GIVENNAME).get().getString(), "Khadija");
76+
assertEquals(personName.getFirst(TermType.SURNAME).get().getString(), "Nazari");
77+
assertEquals(parsedPerson.getGender().getGender(), ComputedPersonGender.FEMALE);
78+
}
79+
@DataProvider
80+
protected Object[][] test_AF_3() {
81+
return new Object[][]{
82+
{new NaturalInputPersonBuilder().name(new WesternInputPersonNameBuilder().fullname("Khadija Nazari").build()).build()},
83+
{new NaturalInputPersonBuilder().name(new WesternInputPersonNameBuilder().givenName("Khadija").surname("Nazari").build()).build()}
84+
};
85+
}
86+
87+
@Test(dataProvider = "test_AF_4")
88+
public void test_AF_4(NaturalInputPerson inputPerson) throws Exception {
89+
PersonNameParserCommand command = new PersonNameParserCommand();
90+
Mode mode = FunctionalTestsNameApiModeFactory.functionalTest();
91+
PersonNameParserResult result = executor.execute(command, mode, inputPerson).get();
92+
ParsedPerson parsedPerson = result.getBestMatch().getParsedPerson();
93+
OutputPersonName personName = parsedPerson.getOutputPersonName();
94+
assertEquals(personName.getFirst(TermType.GIVENNAME).get().getString(), "خديجة");
95+
assertEquals(personName.getFirst(TermType.SURNAME).get().getString(), "نظري");
96+
assertEquals(parsedPerson.getGender().getGender(), ComputedPersonGender.FEMALE);
97+
}
98+
@DataProvider
99+
protected Object[][] test_AF_4() {
100+
return new Object[][]{
101+
{new NaturalInputPersonBuilder().name(new WesternInputPersonNameBuilder().fullname("خديجة نظري").build()).build()},
102+
{new NaturalInputPersonBuilder().name(new WesternInputPersonNameBuilder().givenName("خديجة").surname("نظري").build()).build()}
103+
};
104+
}
48105
}

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

Lines changed: 50 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
import org.nameapi.client.services.FunctionalTestsNameApiModeFactory;
88
import org.nameapi.ontology5.input.entities.person.NaturalInputPerson;
99
import org.nameapi.ontology5.input.entities.person.NaturalInputPersonBuilder;
10+
import org.nameapi.ontology5.input.entities.person.gender.ComputedPersonGender;
1011
import org.nameapi.ontology5.input.entities.person.name.builder.WesternInputPersonNameBuilder;
12+
import org.nameapi.ontology5.output.entities.person.PersonType;
1113
import org.nameapi.ontology5.output.entities.person.name.OutputPersonName;
1214
import org.nameapi.ontology5.output.entities.person.name.TermType;
1315
import org.nameapi.ontology5.services.parser.personnameparser.ParsedPerson;
@@ -18,7 +20,7 @@
1820
import static org.testng.Assert.assertEquals;
1921

2022
/**
21-
* @author Nicole Torres
23+
* @author Nicole Torres / emilia
2224
*/
2325
public class AL_PersonNameParserCommandTest extends AbstractTest {
2426

@@ -33,6 +35,7 @@ public void test_AL_1(NaturalInputPerson inputPerson) throws Exception {
3335
OutputPersonName personName = parsedPerson.getOutputPersonName();
3436
assertEquals(personName.getFirst(TermType.GIVENNAME).get().getString(), "Altin");
3537
assertEquals(personName.getFirst(TermType.SURNAME).get().getString(), "Hoxha");
38+
assertEquals(parsedPerson.getGender().getGender(), ComputedPersonGender.MALE);
3639
}
3740
@DataProvider
3841
protected Object[][] test_AL_1() {
@@ -42,4 +45,50 @@ protected Object[][] test_AL_1() {
4245
};
4346
}
4447

48+
@Test(dataProvider = "test_AL_2")
49+
public void test_AL_2(NaturalInputPerson inputPerson) throws Exception {
50+
PersonNameParserCommand command = new PersonNameParserCommand();
51+
Mode mode = FunctionalTestsNameApiModeFactory.functionalTest();
52+
PersonNameParserResult result = executor.execute(command, mode, inputPerson).get();
53+
ParsedPerson parsedPerson = result.getBestMatch().getParsedPerson();
54+
assertEquals(parsedPerson.getPersonType(), PersonType.MULTIPLE);
55+
56+
/* when there are MULTIPLE people the service returns a list of ParsedPerson */
57+
ParsedPerson firstPerson = parsedPerson.getPeople().get(0);
58+
assertEquals(firstPerson.getOutputPersonName().getFirst(TermType.GIVENNAME).get().getString(), "Altin");
59+
assertEquals(firstPerson.getOutputPersonName().getFirst(TermType.SURNAME).get().getString(), "Hoxha");
60+
assertEquals(firstPerson.getGender().getGender(), ComputedPersonGender.MALE);
61+
62+
ParsedPerson secondPerson = parsedPerson.getPeople().get(1);
63+
assertEquals(secondPerson.getOutputPersonName().getFirst(TermType.GIVENNAME).get().getString(), "Sidorela");
64+
assertEquals(secondPerson.getOutputPersonName().getFirst(TermType.SURNAME).get().getString(), "Hoxha");
65+
assertEquals(secondPerson.getGender().getGender(), ComputedPersonGender.FEMALE);
66+
}
67+
@DataProvider
68+
protected Object[][] test_AL_2() {
69+
return new Object[][]{
70+
{new NaturalInputPersonBuilder().name(new WesternInputPersonNameBuilder().fullname("Altin dhe Sidorela Hoxha").build()).build()},
71+
{new NaturalInputPersonBuilder().name(new WesternInputPersonNameBuilder().givenName("Altin dhe Sidorela").surname("Hoxha").build()).build()}
72+
};
73+
}
74+
75+
@Test(dataProvider = "test_AL_3")
76+
public void test_AL_3(NaturalInputPerson inputPerson) throws Exception {
77+
PersonNameParserCommand command = new PersonNameParserCommand();
78+
Mode mode = FunctionalTestsNameApiModeFactory.functionalTest();
79+
PersonNameParserResult result = executor.execute(command, mode, inputPerson).get();
80+
ParsedPerson parsedPerson = result.getBestMatch().getParsedPerson();
81+
OutputPersonName personName = parsedPerson.getOutputPersonName();
82+
assertEquals(personName.getFirst(TermType.GIVENNAME).get().getString(), "Amelija");
83+
assertEquals(personName.getFirst(TermType.SURNAME).get().getString(), "Bektashi");
84+
assertEquals(parsedPerson.getGender().getGender(), ComputedPersonGender.FEMALE);
85+
}
86+
@DataProvider
87+
protected Object[][] test_AL_3() {
88+
return new Object[][]{
89+
{new NaturalInputPersonBuilder().name(new WesternInputPersonNameBuilder().fullname("Amelija Bektashi").build()).build()},
90+
{new NaturalInputPersonBuilder().name(new WesternInputPersonNameBuilder().givenName("Amelija").surname("Bektashi").build()).build()}
91+
};
92+
}
93+
4594
}

0 commit comments

Comments
 (0)