Skip to content

Commit 44c848d

Browse files
fabiankesslerfabiankessler
committed
Upgrading to Ontology version 5.3.1.
1 parent bb71758 commit 44c848d

File tree

3 files changed

+24
-25
lines changed

3 files changed

+24
-25
lines changed

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4242
<java.version>1.7</java.version>
4343
<anythingworks.version>0.5</anythingworks.version>
44-
<ontology.version>5.3</ontology.version>
44+
<ontology.version>5.3.1</ontology.version>
4545
<swagger-annotations-version>1.5.4</swagger-annotations-version>
4646
</properties>
4747

‎src/test/functional/java/org/nameapi/client/services/genderizer/persongenderizer/PersonGenderizerCommandTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public void testCall2() throws Exception {
5555
.streetInfo(
5656
new StructuredStreetInfoBuilder()
5757
.streetName("Hill road")
58-
.streetNumber("512")
58+
.houseNumber("512")
5959
.build()
6060
)
6161
.build()

‎src/test/functional/java/org/nameapi/client/services/riskdetector/person/PersonRiskDetectorCommandTest.java‎

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
package functional.java.org.nameapi.client.services.riskdetector.person;
1+
package org.nameapi.client.services.riskdetector.person;
22

33
import com.optimaize.command4j.CommandExecutor;
44
import com.optimaize.command4j.Mode;
55
import org.nameapi.client.lib.NameApiRemoteExecutors;
66
import org.nameapi.client.services.AbstractTest;
77
import org.nameapi.client.services.FunctionalTestsNameApiModeFactory;
8-
import org.nameapi.client.services.riskdetector.person.PersonRiskDetectorCommand;
98
import org.nameapi.ontology5.input.entities.address.StructuredAddressBuilder;
109
import org.nameapi.ontology5.input.entities.address.StructuredPlaceInfoBuilder;
1110
import org.nameapi.ontology5.input.entities.address.StructuredStreetInfoBuilder;
@@ -45,7 +44,7 @@ protected Object[][] fullname_risk() {
4544
{"Barak Obama", DataItem.NAME, FakeRiskType.FAMOUS},
4645
{"Mickey Mouse", DataItem.NAME, FakeRiskType.FICTIONAL},
4746
{"Asdf asdf", DataItem.NAME, FakeRiskType.INVALID},
48-
{"Sandy Beach", DataItem.NAME, FakeRiskType.HUMEROUS},
47+
{"Sandy Beach", DataItem.NAME, FakeRiskType.HUMOROUS},
4948
// {"Віталій Кличко", DataItem.NAME, FakeRiskType.FAMOUS},
5049
{"Asdfdsadsdasdasvvvvfvasdf", DataItem.NAME, FakeRiskType.RANDOM_TYPING},
5150

@@ -76,16 +75,16 @@ protected Object[][] namesAsGnSn_risk() {
7675
{"Barak", "Obama", DataItem.NAME, FakeRiskType.FAMOUS},
7776
{"Mickey", "Mouse", DataItem.NAME, FakeRiskType.FICTIONAL},
7877
{"Asdf", "asdf", DataItem.NAME, FakeRiskType.RANDOM_TYPING},
79-
{"Sandy", "Beach", DataItem.NAME, FakeRiskType.HUMEROUS},
78+
{"Sandy", "Beach", DataItem.NAME, FakeRiskType.HUMOROUS},
8079
// {"Віталій", "Кличко", DataItem.NAME, FakeRiskType.FAMOUS},
8180
{"Asdfdsadsd", "asdasvvvvfvasdf", DataItem.NAME, FakeRiskType.RANDOM_TYPING},
8281

8382
{"Stupid", "Cow", DataItem.NAME, FakeRiskType.INVALID},
8483

85-
{"xxxPeter", "Meyerxxx", DataItem.NAME, DisguisedRiskType.OTHER},
84+
{"xxxPeter", "Meyerxxx", DataItem.NAME, DisguiseRiskType.OTHER},
8685
// get 2 risks with equal score=1: invalid(too many extra char.) and disguised(spaced typing)
8786
{"P e t e r", "M e y e r", DataItem.NAME, FakeRiskType.INVALID},
88-
{"Petttter", "Meyyyyer", DataItem.NAME, DisguisedRiskType.OTHER},
87+
{"Petttter", "Meyyyyer", DataItem.NAME, DisguiseRiskType.OTHER},
8988
{"Firstname", "Lastname", DataItem.NAME, FakeRiskType.INVALID},
9089
};
9190
}
@@ -133,14 +132,14 @@ public void placeNames_risk(String placeName, DataItem dataItem, RiskType riskTy
133132
protected Object[][] placeNames_risk() {
134133
return new Object[][] {
135134
{"dsadasdsadqwdqw", DataItem.ADDRESS, FakeRiskType.RANDOM_TYPING},
136-
{"xxxmunichxxx", DataItem.ADDRESS, DisguisedRiskType.PADDING},
137-
{"Z u r i c h", DataItem.ADDRESS, DisguisedRiskType.SPACEDTYPING},
138-
{"Zurrrrich", DataItem.ADDRESS, DisguisedRiskType.STUTTERTYPING},
135+
{"xxxmunichxxx", DataItem.ADDRESS, DisguiseRiskType.PADDING},
136+
{"Z u r i c h", DataItem.ADDRESS, DisguiseRiskType.SPACED_TYPING},
137+
{"Zurrrrich", DataItem.ADDRESS, DisguiseRiskType.STUTTER_TYPING},
139138
{"урюпинск", DataItem.ADDRESS, FakeRiskType.PLACEHOLDER},
140139
{"Урюпинск", DataItem.ADDRESS, FakeRiskType.PLACEHOLDER},
141140
{"Мухосранск", DataItem.ADDRESS, FakeRiskType.PLACEHOLDER},
142141
{"бобруйск", DataItem.ADDRESS, FakeRiskType.PLACEHOLDER},
143-
{"black stump", DataItem.ADDRESS, FakeRiskType.HUMEROUS},
142+
{"black stump", DataItem.ADDRESS, FakeRiskType.HUMOROUS},
144143
{"Mortshire", DataItem.ADDRESS, FakeRiskType.FICTIONAL},
145144
{"Jerkwater", DataItem.ADDRESS, FakeRiskType.INVALID},
146145
{"Hollywood", DataItem.ADDRESS, FakeRiskType.FAMOUS},
@@ -195,9 +194,9 @@ public void streetNames_risk(String streetName, DataItem dataItem, RiskType risk
195194
protected Object[][] streetNames_risk() {
196195
return new Object[][] {
197196
{"dsadasdsadqwdqw", DataItem.ADDRESS, FakeRiskType.RANDOM_TYPING},
198-
{"xxxfriedrichstrassexxx", DataItem.ADDRESS, DisguisedRiskType.PADDING},
199-
{"F r i e d r i c h s t r a s s e", DataItem.ADDRESS, DisguisedRiskType.SPACEDTYPING},
200-
{"Friedrrrrrichstrasse", DataItem.ADDRESS, DisguisedRiskType.STUTTERTYPING},
197+
{"xxxfriedrichstrassexxx", DataItem.ADDRESS, DisguiseRiskType.PADDING},
198+
{"F r i e d r i c h s t r a s s e", DataItem.ADDRESS, DisguiseRiskType.SPACED_TYPING},
199+
{"Friedrrrrrichstrasse", DataItem.ADDRESS, DisguiseRiskType.STUTTER_TYPING},
201200
};
202201
}
203202

@@ -242,14 +241,14 @@ public void emailAddresses_risk(String emailAddr, DataItem dataItem, RiskType ri
242241
@DataProvider
243242
protected Object[][] emailAddresses_risk() {
244243
return new Object[][] {
245-
{"[email protected]", DataItem.EMAIL_ADDRESS, FakeRiskType.RANDOM_TYPING},
246-
{"[email protected]", DataItem.EMAIL_ADDRESS, FakeRiskType.OTHER},
247-
{"[email protected]", DataItem.EMAIL_ADDRESS, FakeRiskType.OTHER},
248-
{"[email protected]", DataItem.EMAIL_ADDRESS, FakeRiskType.OTHER},
249-
{"[email protected]", DataItem.EMAIL_ADDRESS, FakeRiskType.OTHER},
250-
{"[email protected]", DataItem.EMAIL_ADDRESS, FakeRiskType.OTHER},
244+
{"[email protected]", DataItem.EMAIL, FakeRiskType.RANDOM_TYPING},
245+
{"[email protected]", DataItem.EMAIL, FakeRiskType.OTHER},
246+
{"[email protected]", DataItem.EMAIL, FakeRiskType.OTHER},
247+
{"[email protected]", DataItem.EMAIL, FakeRiskType.OTHER},
248+
{"[email protected]", DataItem.EMAIL, FakeRiskType.OTHER},
249+
{"[email protected]", DataItem.EMAIL, FakeRiskType.OTHER},
251250
// disposable
252-
{"[email protected]", DataItem.EMAIL_ADDRESS, FakeRiskType.OTHER}
251+
{"[email protected]", DataItem.EMAIL, FakeRiskType.OTHER}
253252
};
254253
}
255254

@@ -329,9 +328,9 @@ public void birthDates_risk(AgeInfo birthDate, DataItem dataItem, RiskType riskT
329328
@DataProvider
330329
protected Object[][] birthDates_risk() {
331330
return new Object[][] {
332-
{AgeInfoFactory.forDate(1861, 3, 3), DataItem.BIRTHDATE, FakeRiskType.OTHER},
333-
{AgeInfoFactory.forDate(2010, 3, 15), DataItem.BIRTHDATE, FakeRiskType.OTHER},
334-
{AgeInfoFactory.forDate(1933, 3, 3), DataItem.BIRTHDATE, FakeRiskType.OTHER},
331+
{AgeInfoFactory.forDate(1861, 3, 3), DataItem.AGE, FakeRiskType.OTHER},
332+
{AgeInfoFactory.forDate(2010, 3, 15), DataItem.AGE, FakeRiskType.OTHER},
333+
{AgeInfoFactory.forDate(1933, 3, 3), DataItem.AGE, FakeRiskType.OTHER},
335334
};
336335
}
337336

0 commit comments

Comments
 (0)