r50040 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r50039‎ | r50040 | r50041 >
Date:12:46, 29 April 2009
Author:daniel
Status:deferred
Tags:
Comment:
update test cases to fit new analyzer class layout
Modified paths:
  • /trunk/WikiWord/WikiWordBuilder/src/test/java/de/brightbyte/wikiword/analyzer/WikiTextAnalyzerBenchmark.java (modified) (history)
  • /trunk/WikiWord/WikiWordBuilder/src/test/java/de/brightbyte/wikiword/analyzer/WikiTextAnalyzerTest.java (modified) (history)
  • /trunk/WikiWord/WikiWordBuilder/src/test/java/de/brightbyte/wikiword/analyzer/WikiTextAnalyzerTestBase.java (modified) (history)
  • /trunk/WikiWord/WikiWordBuilder/src/test/java/de/brightbyte/wikiword/builder/PropertyDump.java (modified) (history)
  • /trunk/WikiWord/WikiWordBuilder/src/test/java/de/brightbyte/wikiword/wikis/WikiTextAnalyzer_dewiki_Test.java (modified) (history)
  • /trunk/WikiWord/WikiWordBuilder/src/test/java/de/brightbyte/wikiword/wikis/WikiTextAnalyzer_enwiki_Test.java (modified) (history)
  • /trunk/WikiWord/WikiWordBuilder/src/test/java/de/brightbyte/wikiword/wikis/WikiTextAnalyzer_ndswiki_Test.java (modified) (history)
  • /trunk/WikiWord/WikiWordBuilder/src/test/java/de/brightbyte/wikiword/wikis/WikiTextAnalyzer_nlwiki_Test.java (modified) (history)
  • /trunk/WikiWord/WikiWordBuilder/src/test/java/de/brightbyte/wikiword/wikis/WikiTextAnalyzer_simplewiki_Test.java (modified) (history)
  • /trunk/WikiWord/WikiWordBuilder/src/test/java/de/brightbyte/wikiword/wikis/WikiTextAnalyzer_yywiki_Test.java (modified) (history)

Diff [purge]

Index: trunk/WikiWord/WikiWordBuilder/src/test/java/de/brightbyte/wikiword/analyzer/WikiTextAnalyzerTest.java
@@ -15,7 +15,13 @@
1616 import de.brightbyte.wikiword.Corpus;
1717 import de.brightbyte.wikiword.Namespace;
1818 import de.brightbyte.wikiword.ResourceType;
19 -import de.brightbyte.wikiword.analyzer.TemplateExtractor.TemplateData;
 19+import de.brightbyte.wikiword.analyzer.mangler.Armorer;
 20+import de.brightbyte.wikiword.analyzer.mangler.TextArmor;
 21+import de.brightbyte.wikiword.analyzer.sensor.HasCategoryLikeSensor;
 22+import de.brightbyte.wikiword.analyzer.sensor.HasSectionSensor;
 23+import de.brightbyte.wikiword.analyzer.sensor.HasTemplateSensor;
 24+import de.brightbyte.wikiword.analyzer.sensor.TitleSensor;
 25+import de.brightbyte.wikiword.analyzer.template.TemplateExtractor.TemplateData;
2026
2127 /**
2228 * Unit tests for WikiTextAnalyzer
@@ -41,19 +47,19 @@
4248
4349 public void testUnarmor() {
4450 TextArmor armor = new TextArmor();
45 - armor.put(AbstractAnalyzer.ARMOR_MARKER_CHAR+"[1]", "one");
46 - armor.put(AbstractAnalyzer.ARMOR_MARKER_CHAR+"[2]", "two");
47 - armor.put(AbstractAnalyzer.ARMOR_MARKER_CHAR+"[3]", "three");
 51+ armor.put(Armorer.ARMOR_MARKER_CHAR+"[1]", "one");
 52+ armor.put(Armorer.ARMOR_MARKER_CHAR+"[2]", "two");
 53+ armor.put(Armorer.ARMOR_MARKER_CHAR+"[3]", "three");
4854
49 - CharSequence s = armor.unarmor("and "+AbstractAnalyzer.ARMOR_MARKER_CHAR+"[1] and "+AbstractAnalyzer.ARMOR_MARKER_CHAR+"[2] and "+AbstractAnalyzer.ARMOR_MARKER_CHAR+"[3] and "+AbstractAnalyzer.ARMOR_MARKER_CHAR+"[4]!");
50 - assertEquals("simple unarmor", "and one and two and three and "+AbstractAnalyzer.ARMOR_MARKER_CHAR+"[4]!", s.toString());
 55+ CharSequence s = armor.unarmor("and "+Armorer.ARMOR_MARKER_CHAR+"[1] and "+Armorer.ARMOR_MARKER_CHAR+"[2] and "+Armorer.ARMOR_MARKER_CHAR+"[3] and "+Armorer.ARMOR_MARKER_CHAR+"[4]!");
 56+ assertEquals("simple unarmor", "and one and two and three and "+Armorer.ARMOR_MARKER_CHAR+"[4]!", s.toString());
5157
5258 armor = new TextArmor();
53 - armor.put(""+AbstractAnalyzer.ARMOR_MARKER_CHAR+"[1]", "foo");
54 - armor.put(""+AbstractAnalyzer.ARMOR_MARKER_CHAR+"[2]", "bar");
55 - armor.put(""+AbstractAnalyzer.ARMOR_MARKER_CHAR+"[3]", ""+AbstractAnalyzer.ARMOR_MARKER_CHAR+"[1]"+AbstractAnalyzer.ARMOR_MARKER_CHAR+"[2]");
 59+ armor.put(""+Armorer.ARMOR_MARKER_CHAR+"[1]", "foo");
 60+ armor.put(""+Armorer.ARMOR_MARKER_CHAR+"[2]", "bar");
 61+ armor.put(""+Armorer.ARMOR_MARKER_CHAR+"[3]", ""+Armorer.ARMOR_MARKER_CHAR+"[1]"+Armorer.ARMOR_MARKER_CHAR+"[2]");
5662
57 - s = armor.unarmor("it's "+AbstractAnalyzer.ARMOR_MARKER_CHAR+"[1], "+AbstractAnalyzer.ARMOR_MARKER_CHAR+"[2], and "+AbstractAnalyzer.ARMOR_MARKER_CHAR+"[3]!");
 63+ s = armor.unarmor("it's "+Armorer.ARMOR_MARKER_CHAR+"[1], "+Armorer.ARMOR_MARKER_CHAR+"[2], and "+Armorer.ARMOR_MARKER_CHAR+"[3]!");
5864 assertEquals("nested unarmor", "it's foo, bar, and foobar!", s.toString());
5965 }
6066
@@ -647,16 +653,16 @@
648654 language.initialize();
649655
650656 WikiConfiguration config = new WikiConfiguration();
651 - config.resourceTypeSensors.add( new WikiTextAnalyzer.TitleSensor(ResourceType.DISAMBIG, ".*_\\(Disambiguation\\)", 0) );
652 - config.resourceTypeSensors.add( new WikiTextAnalyzer.HasTemplateSensor(ResourceType.DISAMBIG, "Disambiguation", null) );
653 - config.resourceTypeSensors.add( new WikiTextAnalyzer.HasTemplateSensor(ResourceType.BAD, "Delete", null) );
 657+ config.resourceTypeSensors.add( new TitleSensor(ResourceType.DISAMBIG, ".*_\\(Disambiguation\\)", 0) );
 658+ config.resourceTypeSensors.add( new HasTemplateSensor(ResourceType.DISAMBIG, "Disambiguation", null) );
 659+ config.resourceTypeSensors.add( new HasTemplateSensor(ResourceType.BAD, "Delete", null) );
654660
655 - config.conceptTypeSensors.add( new WikiTextAnalyzer.HasCategoryLikeSensor(ConceptType.PERSON, "^Died_|^Born_", 0) );
656 - config.conceptTypeSensors.add( new WikiTextAnalyzer.HasCategoryLikeSensor(ConceptType.NAME, "(^N|_n)ames?$", 0) );
657 - config.conceptTypeSensors.add( new WikiTextAnalyzer.HasCategoryLikeSensor(ConceptType.PLACE, "^Town_in_|^Country_in_|^Region_in_", 0) );
658 - config.conceptTypeSensors.add( new WikiTextAnalyzer.HasTemplateSensor(ConceptType.LIFEFORM, "Taxobox", null) );
659 - config.conceptTypeSensors.add( new WikiTextAnalyzer.TitleSensor(ConceptType.TIME, "-?\\d+", 0) );
660 - config.conceptTypeSensors.add( new WikiTextAnalyzer.HasSectionSensor(ConceptType.PERSON, "Life") );
 661+ config.conceptTypeSensors.add( new HasCategoryLikeSensor(ConceptType.PERSON, "^Died_|^Born_", 0) );
 662+ config.conceptTypeSensors.add( new HasCategoryLikeSensor(ConceptType.NAME, "(^N|_n)ames?$", 0) );
 663+ config.conceptTypeSensors.add( new HasCategoryLikeSensor(ConceptType.PLACE, "^Town_in_|^Country_in_|^Region_in_", 0) );
 664+ config.conceptTypeSensors.add( new HasTemplateSensor(ConceptType.LIFEFORM, "Taxobox", null) );
 665+ config.conceptTypeSensors.add( new TitleSensor(ConceptType.TIME, "-?\\d+", 0) );
 666+ config.conceptTypeSensors.add( new HasSectionSensor(ConceptType.PERSON, "Life") );
661667
662668 config.disambigStripSectionPattern = WikiConfiguration.sectionPattern("see also|external links", Pattern.CASE_INSENSITIVE);
663669
Index: trunk/WikiWord/WikiWordBuilder/src/test/java/de/brightbyte/wikiword/analyzer/WikiTextAnalyzerBenchmark.java
@@ -33,7 +33,7 @@
3434
3535 long t = System.currentTimeMillis();
3636 for (int i = 0; i<count; i++) {
37 - WikiTextAnalyzer.WikiPage page = analyzer.makePage(0, file, text, false);
 37+ WikiPage page = analyzer.makePage(0, file, text, false);
3838 page.getResourceType();
3939 page.getConceptType();
4040 page.getCleanedText(true);
Index: trunk/WikiWord/WikiWordBuilder/src/test/java/de/brightbyte/wikiword/analyzer/WikiTextAnalyzerTestBase.java
@@ -55,12 +55,12 @@
5656 }
5757
5858 protected void assertTestCase(String title, String property, Object value) throws Throwable {
59 - WikiTextAnalyzer.WikiPage page = makeTestPage(title);
 59+ WikiPage page = makeTestPage(title);
6060 assertTestCase(page, property, value);
6161 }
6262
6363 protected void assertTestCase(String title, Map<String, Object> values) throws Throwable {
64 - WikiTextAnalyzer.WikiPage page = makeTestPage(title);
 64+ WikiPage page = makeTestPage(title);
6565 assertTestCase(page, values);
6666 }
6767
@@ -87,22 +87,22 @@
8888 return text.toString();
8989 }
9090
91 - protected WikiTextAnalyzer.WikiPage makeTestPage(String title) throws IOException {
 91+ protected WikiPage makeTestPage(String title) throws IOException {
9292 String text = loadTestPage(title, getClass(), corpus);
9393 return makeTestPage(0, title, text);
9494 }
9595
96 - protected WikiTextAnalyzer.WikiPage makeTestPage(int namespace, String title, String text) {
97 - WikiTextAnalyzer.WikiPage page = analyzer.makePage(namespace, title, text, false);
 96+ protected WikiPage makeTestPage(int namespace, String title, String text) {
 97+ WikiPage page = analyzer.makePage(namespace, title, text, false);
9898 return page;
9999 }
100100
101101 protected void assertTestCase(int namespace, String title, String text, Map<String, Object> values) throws Throwable {
102 - WikiTextAnalyzer.WikiPage page = makeTestPage(namespace, title, text);
 102+ WikiPage page = makeTestPage(namespace, title, text);
103103 assertTestCase(page, values);
104104 }
105105
106 - protected void assertTestCase(WikiTextAnalyzer.WikiPage page, String property, Object expected) throws Throwable {
 106+ protected void assertTestCase(WikiPage page, String property, Object expected) throws Throwable {
107107 BeanInfo info = Introspector.getBeanInfo(page.getClass());
108108 PropertyDescriptor p = null;
109109 for (PropertyDescriptor prop: info.getPropertyDescriptors()) {
@@ -116,7 +116,7 @@
117117 assertTestCase(page, p, expected);
118118 }
119119
120 - protected void assertTestCase(WikiTextAnalyzer.WikiPage page, PropertyDescriptor p, Object expected) throws Throwable {
 120+ protected void assertTestCase(WikiPage page, PropertyDescriptor p, Object expected) throws Throwable {
121121 Object actual = getPropertyValue(page, p);
122122
123123 if (expected instanceof String && !(actual instanceof String) && actual instanceof CharSequence) actual = actual.toString();
@@ -127,7 +127,7 @@
128128 else assertEquals(p.getName(), expected, actual);
129129 }
130130
131 - protected void assertTestCase(WikiTextAnalyzer.WikiPage page, Map<String, Object> values) throws Throwable {
 131+ protected void assertTestCase(WikiPage page, Map<String, Object> values) throws Throwable {
132132 BeanInfo info = Introspector.getBeanInfo(page.getClass());
133133 Map<String, PropertyDescriptor> props = new HashMap<String, PropertyDescriptor>();
134134 for (PropertyDescriptor p: info.getPropertyDescriptors()) {
Index: trunk/WikiWord/WikiWordBuilder/src/test/java/de/brightbyte/wikiword/builder/PropertyDump.java
@@ -12,9 +12,8 @@
1313 import de.brightbyte.wikiword.Namespace;
1414 import de.brightbyte.wikiword.NamespaceSet;
1515 import de.brightbyte.wikiword.TweakSet;
 16+import de.brightbyte.wikiword.analyzer.WikiPage;
1617 import de.brightbyte.wikiword.analyzer.WikiTextAnalyzer;
17 -import de.brightbyte.wikiword.analyzer.WikiTextAnalyzer.WikiLink;
18 -import de.brightbyte.wikiword.analyzer.WikiTextAnalyzer.WikiPage;
1918
2019
2120 public class PropertyDump {
@@ -45,7 +44,7 @@
4645 NamespaceSet namespaces = Namespace.getNamespaces(null);
4746 analyzer.initialize(namespaces, true);
4847
49 - WikiLink t = analyzer.makeLink(p, p, null, null);
 48+ WikiTextAnalyzer.WikiLink t = analyzer.makeLink(p, p, null, null);
5049
5150 WikiPage page = analyzer.makePage(t.getNamespace(), t.getTarget().toString(), text, true);
5251
Index: trunk/WikiWord/WikiWordBuilder/src/test/java/de/brightbyte/wikiword/wikis/WikiTextAnalyzer_ndswiki_Test.java
@@ -2,7 +2,7 @@
33
44 import de.brightbyte.wikiword.ConceptType;
55 import de.brightbyte.wikiword.ResourceType;
6 -import de.brightbyte.wikiword.analyzer.WikiTextAnalyzer;
 6+import de.brightbyte.wikiword.analyzer.WikiPage;
77 import de.brightbyte.wikiword.analyzer.WikiTextAnalyzerTestBase;
88
99
@@ -13,12 +13,12 @@
1414 }
1515
1616 public void testCase_Aachen() throws Throwable {
17 - WikiTextAnalyzer.WikiPage page = makeTestPage("Aachen");
 17+ WikiPage page = makeTestPage("Aachen");
1818 assertTestCase(page, "resourceType", ResourceType.REDIRECT);
1919 }
2020
2121 public void testCase_Belgien() throws Throwable {
22 - WikiTextAnalyzer.WikiPage page = makeTestPage("Belgien");
 22+ WikiPage page = makeTestPage("Belgien");
2323 assertTestCase(page, "resourceType", ResourceType.ARTICLE);
2424 assertTestCase(page, "conceptType", ConceptType.PLACE);
2525
Index: trunk/WikiWord/WikiWordBuilder/src/test/java/de/brightbyte/wikiword/wikis/WikiTextAnalyzer_dewiki_Test.java
@@ -1,18 +1,17 @@
22 package de.brightbyte.wikiword.wikis;
33
44 import java.util.ArrayList;
5 -import java.util.HashMap;
65 import java.util.HashSet;
76 import java.util.List;
8 -import java.util.Map;
97 import java.util.Set;
108
119 import de.brightbyte.data.MultiMap;
1210 import de.brightbyte.wikiword.ConceptType;
1311 import de.brightbyte.wikiword.ResourceType;
 12+import de.brightbyte.wikiword.analyzer.WikiPage;
1413 import de.brightbyte.wikiword.analyzer.WikiTextAnalyzer;
1514 import de.brightbyte.wikiword.analyzer.WikiTextAnalyzerTestBase;
16 -import de.brightbyte.wikiword.analyzer.TemplateExtractor.TemplateData;
 15+import de.brightbyte.wikiword.analyzer.template.TemplateExtractor.TemplateData;
1716
1817
1918 public class WikiTextAnalyzer_dewiki_Test extends WikiTextAnalyzerTestBase {
@@ -22,7 +21,7 @@
2322 }
2423
2524 public void testCase_Mont_Blanc() throws Throwable {
26 - WikiTextAnalyzer.WikiPage page = makeTestPage("Mont_Blanc");
 25+ WikiPage page = makeTestPage("Mont_Blanc");
2726
2827 assertTestCase(page, "resourceType", ResourceType.REDIRECT);
2928
@@ -33,7 +32,7 @@
3433 public void testCase_Kilauea() throws Throwable {
3534 String definition = "K\u012blauea ist ein aktiver Schildvulkan auf den Hawai\u02bbi-Inseln und einer der f\u00fcnf Vulkane, die zusammen die Hauptinsel Hawai\u02bbi bilden.";
3635
37 - WikiTextAnalyzer.WikiPage page = makeTestPage("Kilauea");
 36+ WikiPage page = makeTestPage("Kilauea");
3837 assertTestCase(page, "firstSentence", definition);
3938
4039 Set<String> categories = new HashSet<String>();
@@ -69,7 +68,7 @@
7069 public void testCase_Herrenhausen_Stoecken() throws Throwable {
7170 String definition = "Herrenhausen-Stöcken ist der 12. Stadtbezirk in Hannover.";
7271
73 - WikiTextAnalyzer.WikiPage page = makeTestPage("Herrenhausen-Stoecken");
 72+ WikiPage page = makeTestPage("Herrenhausen-Stoecken");
7473 assertTestCase(page, "firstSentence", definition);
7574
7675 assertTestCase(page, "resourceType", ResourceType.ARTICLE);
@@ -81,7 +80,7 @@
8281 public void testCase_Hofstetten_Gruenau() throws Throwable {
8382 String definition = "Hofstetten-Grünau ist eine Marktgemeinde mit 2.622 Einwohnern im Bezirk Sankt Pölten-Land in Niederösterreich.";
8483
85 - WikiTextAnalyzer.WikiPage page = makeTestPage("Hofstetten-Gruenau");
 84+ WikiPage page = makeTestPage("Hofstetten-Gruenau");
8685 assertTestCase(page, "firstSentence", definition);
8786
8887 assertTestCase(page, "resourceType", ResourceType.ARTICLE);
Index: trunk/WikiWord/WikiWordBuilder/src/test/java/de/brightbyte/wikiword/wikis/WikiTextAnalyzer_simplewiki_Test.java
@@ -2,7 +2,7 @@
33
44 import de.brightbyte.wikiword.ConceptType;
55 import de.brightbyte.wikiword.ResourceType;
6 -import de.brightbyte.wikiword.analyzer.WikiTextAnalyzer;
 6+import de.brightbyte.wikiword.analyzer.WikiPage;
77 import de.brightbyte.wikiword.analyzer.WikiTextAnalyzerTestBase;
88
99 public class WikiTextAnalyzer_simplewiki_Test extends WikiTextAnalyzerTestBase {
@@ -12,12 +12,12 @@
1313 }
1414
1515 public void testCase_Bending() throws Throwable {
16 - WikiTextAnalyzer.WikiPage page = makeTestPage("Bending_(disambiguation)");
 16+ WikiPage page = makeTestPage("Bending_(disambiguation)");
1717 assertTestCase(page, "resourceType", ResourceType.DISAMBIG);
1818 }
1919
2020 public void testCase_Dinosaur() throws Throwable {
21 - WikiTextAnalyzer.WikiPage page = makeTestPage("Dinosaur");
 21+ WikiPage page = makeTestPage("Dinosaur");
2222 assertTestCase(page, "resourceType", ResourceType.ARTICLE);
2323 assertTestCase(page, "conceptType", ConceptType.LIFEFORM);
2424
@@ -26,7 +26,7 @@
2727 }
2828
2929 public void testCase_Peanuts() throws Throwable {
30 - WikiTextAnalyzer.WikiPage page = makeTestPage("Peanuts");
 30+ WikiPage page = makeTestPage("Peanuts");
3131 assertTestCase(page, "resourceType", ResourceType.ARTICLE);
3232 assertTestCase(page, "conceptType", ConceptType.OTHER);
3333
@@ -35,7 +35,7 @@
3636 }
3737
3838 public void testCase_Kielce() throws Throwable {
39 - WikiTextAnalyzer.WikiPage page = makeTestPage("Kielce");
 39+ WikiPage page = makeTestPage("Kielce");
4040 assertTestCase(page, "resourceType", ResourceType.ARTICLE);
4141 assertTestCase(page, "conceptType", ConceptType.PLACE);
4242
@@ -44,7 +44,7 @@
4545 }
4646
4747 public void testCase_Stuttgart() throws Throwable {
48 - WikiTextAnalyzer.WikiPage page = makeTestPage("Stuttgart");
 48+ WikiPage page = makeTestPage("Stuttgart");
4949 assertTestCase(page, "resourceType", ResourceType.ARTICLE);
5050 assertTestCase(page, "conceptType", ConceptType.PLACE);
5151
@@ -53,7 +53,7 @@
5454 }
5555
5656 public void testCase_Aarhus() throws Throwable {
57 - WikiTextAnalyzer.WikiPage page = makeTestPage("Aarhus");
 57+ WikiPage page = makeTestPage("Aarhus");
5858 assertTestCase(page, "resourceType", ResourceType.ARTICLE);
5959 assertTestCase(page, "conceptType", ConceptType.PLACE);
6060
Index: trunk/WikiWord/WikiWordBuilder/src/test/java/de/brightbyte/wikiword/wikis/WikiTextAnalyzer_yywiki_Test.java
@@ -8,6 +8,7 @@
99 import de.brightbyte.wikiword.ConceptType;
1010 import de.brightbyte.wikiword.Namespace;
1111 import de.brightbyte.wikiword.ResourceType;
 12+import de.brightbyte.wikiword.analyzer.WikiPage;
1213 import de.brightbyte.wikiword.analyzer.WikiTextAnalyzer;
1314 import de.brightbyte.wikiword.analyzer.WikiTextAnalyzerTestBase;
1415 import de.brightbyte.wikiword.analyzer.WikiTextAnalyzer.LinkMagic;
@@ -22,7 +23,7 @@
2324 public void testCase_Yoo() throws Throwable {
2425 String definition = "Yoo is yoo.";
2526
26 - WikiTextAnalyzer.WikiPage page = makeTestPage("Yoo");
 27+ WikiPage page = makeTestPage("Yoo");
2728 assertTestCase(page, "firstSentence", definition);
2829 assertTestCase(page, "resourceType", ResourceType.ARTICLE);
2930 assertTestCase(page, "conceptType", ConceptType.OTHER);
Index: trunk/WikiWord/WikiWordBuilder/src/test/java/de/brightbyte/wikiword/wikis/WikiTextAnalyzer_enwiki_Test.java
@@ -5,7 +5,7 @@
66
77 import de.brightbyte.wikiword.ConceptType;
88 import de.brightbyte.wikiword.ResourceType;
9 -import de.brightbyte.wikiword.analyzer.WikiTextAnalyzer;
 9+import de.brightbyte.wikiword.analyzer.WikiPage;
1010 import de.brightbyte.wikiword.analyzer.WikiTextAnalyzerTestBase;
1111
1212
@@ -16,7 +16,7 @@
1717 }
1818
1919 public void testCase_Hill() throws Throwable {
20 - WikiTextAnalyzer.WikiPage page = makeTestPage("Hill");
 20+ WikiPage page = makeTestPage("Hill");
2121 assertTestCase(page, "resourceType", ResourceType.ARTICLE);
2222 assertTestCase(page, "conceptType", ConceptType.OTHER);
2323 assertTestCase(page, "firstSentence", "A hill is a landform that extends above the surrounding terrain, in a limited area.");
Index: trunk/WikiWord/WikiWordBuilder/src/test/java/de/brightbyte/wikiword/wikis/WikiTextAnalyzer_nlwiki_Test.java
@@ -5,7 +5,7 @@
66
77 import de.brightbyte.wikiword.ConceptType;
88 import de.brightbyte.wikiword.ResourceType;
9 -import de.brightbyte.wikiword.analyzer.WikiTextAnalyzer;
 9+import de.brightbyte.wikiword.analyzer.WikiPage;
1010 import de.brightbyte.wikiword.analyzer.WikiTextAnalyzerTestBase;
1111
1212
@@ -18,7 +18,7 @@
1919 public void testCase_Verenigde_Staten() throws Throwable {
2020 String definition = "De Verenigde Staten van Amerika, afgekort VS, zijn een federatie van 50 Noord-Amerikaanse staten en het district van Columbia.";
2121
22 - WikiTextAnalyzer.WikiPage page = makeTestPage("Verenigde_Staten");
 22+ WikiPage page = makeTestPage("Verenigde_Staten");
2323 assertTestCase(page, "firstSentence", definition);
2424 assertTestCase(page, "resourceType", ResourceType.ARTICLE);
2525 assertTestCase(page, "conceptType", ConceptType.PLACE);
@@ -33,7 +33,7 @@
3434 public void testCase_Mikolajki() throws Throwable {
3535 String definition = "Miko\u0142ajki is een stad in het Poolse woiwodschap Ermland-Mazuri\u00eb, gelegen in de powiat Mr\u0105gowski.";
3636
37 - WikiTextAnalyzer.WikiPage page = makeTestPage("Mikolajki");
 37+ WikiPage page = makeTestPage("Mikolajki");
3838 assertTestCase(page, "firstSentence", definition);
3939 assertTestCase(page, "resourceType", ResourceType.ARTICLE);
4040 assertTestCase(page, "conceptType", ConceptType.PLACE);

Status & tagging log