Revision: 9238
http://languagetool.svn.sourceforge.net/languagetool/?rev=9238&view=rev
Author: dnaber
Date: 2013-01-27 14:54:32 +0000 (Sun, 27 Jan 2013)
Log Message:
-----------
re-activate testrules.bat/sh
Modified Paths:
--------------
trunk/languagetool/languagetool-core/src/test/java/org/languagetool/rules/patterns/PatternRuleTest.java
trunk/languagetool/languagetool-standalone/pom.xml
trunk/languagetool/languagetool-standalone/src/main/assembly/zip.xml
trunk/languagetool/languagetool-standalone/src/main/resources/testrules.bat
trunk/languagetool/languagetool-standalone/src/main/resources/testrules.sh
Modified:
trunk/languagetool/languagetool-core/src/test/java/org/languagetool/rules/patterns/PatternRuleTest.java
===================================================================
---
trunk/languagetool/languagetool-core/src/test/java/org/languagetool/rules/patterns/PatternRuleTest.java
2013-01-27 10:45:52 UTC (rev 9237)
+++
trunk/languagetool/languagetool-core/src/test/java/org/languagetool/rules/patterns/PatternRuleTest.java
2013-01-27 14:54:32 UTC (rev 9238)
@@ -78,7 +78,6 @@
System.out.println("Skipping " + lang + " because there are no
specific rules for that variant");
continue;
}
- validatePatternFile(lang);
runTestForLanguage(lang);
}
}
@@ -91,15 +90,27 @@
private String getGrammarFileName(Language lang) {
final String shortNameWithVariant = lang.getShortNameWithVariant();
final String fileName;
- if (shortNameWithVariant.contains("-") &&
!shortNameWithVariant.endsWith("-ANY") && Language.REAL_LANGUAGES.length > 1) {
+ if (shortNameWithVariant.contains("-") &&
!shortNameWithVariant.equals("xx-XX")
+ && !shortNameWithVariant.endsWith("-ANY") &&
Language.REAL_LANGUAGES.length > 1) {
fileName = lang.getShortName() + "/" + shortNameWithVariant + "/" +
JLanguageTool.PATTERN_FILE;
} else {
fileName = lang.getShortName() + "/" + JLanguageTool.PATTERN_FILE;
}
return fileName;
}
-
+
+ private void runGrammarRulesFromXmlTestIgnoringLanguages(Set<Language>
ignoredLanguages) throws IOException {
+ System.out.println("Known languages: " +
Arrays.toString(Language.LANGUAGES));
+ for (final Language lang : Language.LANGUAGES) {
+ if (ignoredLanguages != null && ignoredLanguages.contains(lang)) {
+ continue;
+ }
+ runTestForLanguage(lang);
+ }
+ }
+
private void runTestForLanguage(Language lang) throws IOException {
+ validatePatternFile(lang);
System.out.print("Running pattern rule tests for " + lang.getName() + "...
");
final JLanguageTool languageTool = new JLanguageTool(lang);
if (CHECK_WITH_SENTENCE_SPLITTING) {
@@ -116,7 +127,7 @@
testGrammarRulesFromXML(rules, languageTool, allRulesLanguageTool, lang);
System.out.println(rules.size() + " rules tested.");
}
-
+
private void validatePatternFile(Language lang) throws IOException {
final XMLValidator validator = new XMLValidator();
final String grammarFile = getGrammarFileName(lang);
@@ -124,29 +135,6 @@
final String rulesDir = JLanguageTool.getDataBroker().getRulesDir();
validator.validate(rulesDir + "/" + grammarFile, rulesDir + "/rules.xsd");
}
-
- public void runGrammarRulesFromXmlTestIgnoringLanguages(Set<Language>
ignoredLanguages) throws IOException {
- System.out.println("Known languages: " +
Arrays.toString(Language.LANGUAGES));
- for (final Language lang : Language.LANGUAGES) {
- if (ignoredLanguages != null && ignoredLanguages.contains(lang)) {
- continue;
- }
- System.out.println("Running tests for " + lang.getName() + "...");
- final JLanguageTool languageTool = new JLanguageTool(lang);
- if (CHECK_WITH_SENTENCE_SPLITTING) {
- languageTool.activateDefaultPatternRules();
- disableSpellingRules(languageTool);
- }
- final JLanguageTool allRulesLanguageTool = new JLanguageTool(lang);
- allRulesLanguageTool.activateDefaultPatternRules();
- final List<PatternRule> rules = new ArrayList<PatternRule>();
- for (String patternRuleFileName : lang.getRuleFileName()) {
- rules.addAll(languageTool.loadPatternRules(patternRuleFileName));
- }
- warnIfRegexpSyntaxNotKosher(rules, lang);
- testGrammarRulesFromXML(rules, languageTool, allRulesLanguageTool, lang);
- }
- }
private void disableSpellingRules(JLanguageTool languageTool) {
final List<Rule> allRules = languageTool.getAllRules();
Modified: trunk/languagetool/languagetool-standalone/pom.xml
===================================================================
--- trunk/languagetool/languagetool-standalone/pom.xml 2013-01-27 10:45:52 UTC
(rev 9237)
+++ trunk/languagetool/languagetool-standalone/pom.xml 2013-01-27 14:54:32 UTC
(rev 9238)
@@ -99,6 +99,8 @@
<archive>
<manifest>
<addClasspath>true</addClasspath>
+ <classpathLayoutType>custom</classpathLayoutType>
+
<customClasspathLayout>$${artifact.artifactId}$${dashClassifier?}.$${artifact.extension}</customClasspathLayout>
</manifest>
<manifestEntries>
<!-- as we later unzip the language JARs (see
zip.xml), we need to add the top directory to the classpath: -->
@@ -168,12 +170,19 @@
<artifactId>swc-parser-lazy</artifactId>
<version>1.1.0</version>
</dependency>
-
+
+ <!-- Some tests are used at runtime for rule developers, thus no
'test' scope here: -->
<dependency>
+ <!-- see
http://stackoverflow.com/questions/174560/sharing-test-code-in-maven#174670 -->
+ <groupId>org.languagetool</groupId>
+ <artifactId>languagetool-core</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.7</version>
- <scope>test</scope>
</dependency>
</dependencies>
Modified: trunk/languagetool/languagetool-standalone/src/main/assembly/zip.xml
===================================================================
--- trunk/languagetool/languagetool-standalone/src/main/assembly/zip.xml
2013-01-27 10:45:52 UTC (rev 9237)
+++ trunk/languagetool/languagetool-standalone/src/main/assembly/zip.xml
2013-01-27 14:54:32 UTC (rev 9238)
@@ -37,9 +37,8 @@
</containerDescriptorHandlers>
<dependencySets>
<dependencySet>
- <outputDirectory>/</outputDirectory>
<unpack>false</unpack>
- <scope>runtime</scope>
+
<outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<excludes>
<exclude>org.languagetool:language-*</exclude>
</excludes>
Modified:
trunk/languagetool/languagetool-standalone/src/main/resources/testrules.bat
===================================================================
--- trunk/languagetool/languagetool-standalone/src/main/resources/testrules.bat
2013-01-27 10:45:52 UTC (rev 9237)
+++ trunk/languagetool/languagetool-standalone/src/main/resources/testrules.bat
2013-01-27 14:54:32 UTC (rev 9238)
@@ -1,5 +1,8 @@
@echo off
-java -cp junit.jar;LanguageTool.jar
org.languagetool.rules.patterns.PatternRuleTest %1
-java -cp junit.jar;LanguageTool.jar
org.languagetool.tagging.disambiguation.rules.DisambiguationRuleTest %1
-java -cp junit.jar;LanguageTool.jar
org.languagetool.rules.bitext.BitextPatternRuleTest %1
-java -cp junit.jar;LanguageTool.jar org.languagetool.ValidateXMLTest %1
+
+SET
CPATH=.;junit.jar;languagetool-core.jar;lucene-gosen-ipadic.jar;ictclas4j.jar;cjftransform.jar;languagetool-core-tests.jar;jwordsplitter.jar;commons-logging.jar;segment.jar;morfologik-fsa.jar;morfologik-speller.jar;morfologik-stemming.jar
+
+java -cp %CPATH% org.languagetool.rules.patterns.PatternRuleTest %1
+java -cp %CPATH%
org.languagetool.tagging.disambiguation.rules.DisambiguationRuleTest %1
+java -cp %CPATH% org.languagetool.rules.bitext.BitextPatternRuleTest %1
+java -cp %CPATH% org.languagetool.ValidateXMLTest %1
Modified:
trunk/languagetool/languagetool-standalone/src/main/resources/testrules.sh
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS,
MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current
with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft
MVPs and experts. ON SALE this month only -- learn more at:
http://p.sf.net/sfu/learnnow-d2d
_______________________________________________
Languagetool-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/languagetool-commits
