Fixed the NumTranslationOptionsPacked test by using the default variable from Decoder.conf
Project: http://git-wip-us.apache.org/repos/asf/incubator-joshua/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-joshua/commit/5a5c6d98 Tree: http://git-wip-us.apache.org/repos/asf/incubator-joshua/tree/5a5c6d98 Diff: http://git-wip-us.apache.org/repos/asf/incubator-joshua/diff/5a5c6d98 Branch: refs/heads/7_confsystem Commit: 5a5c6d987a8916c661803365a9acbe999e910f48 Parents: c425dcf Author: Hieber, Felix <fhie...@amazon.de> Authored: Sun Sep 18 16:41:57 2016 +0200 Committer: Hieber, Felix <fhie...@amazon.de> Committed: Mon Sep 19 08:19:40 2016 +0200 ---------------------------------------------------------------------- .../cky/NumTranslationOptionsPackedTest.conf | 2 +- .../decoder/cky/NumTranslationOptionsTest.java | 3 ++- .../kbest_extraction/KBestExtractionTest.java | 19 +++++++++---------- 3 files changed, 12 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/5a5c6d98/joshua-core/src/test/java/org/apache/joshua/decoder/cky/NumTranslationOptionsPackedTest.conf ---------------------------------------------------------------------- diff --git a/joshua-core/src/test/java/org/apache/joshua/decoder/cky/NumTranslationOptionsPackedTest.conf b/joshua-core/src/test/java/org/apache/joshua/decoder/cky/NumTranslationOptionsPackedTest.conf index dc4d6a3..47a7715 100644 --- a/joshua-core/src/test/java/org/apache/joshua/decoder/cky/NumTranslationOptionsPackedTest.conf +++ b/joshua-core/src/test/java/org/apache/joshua/decoder/cky/NumTranslationOptionsPackedTest.conf @@ -14,7 +14,7 @@ feature_functions = [ ] grammars = [ - { class = PackedGrammar, owner = pt, span_limit = 12, path = src/test/resources/decoder/num_translation_options/grammar.packed } + { class = PackedGrammar, owner = pt, span_limit = 12, rule_cache_size=${default_packed_grammar_cache_size}, path = src/test/resources/decoder/num_translation_options/grammar.packed } { class = TextGrammar, owner = glue, span_limit = -1, path = src/test/resources/decoder/num_translation_options/glue-grammar } ] http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/5a5c6d98/joshua-core/src/test/java/org/apache/joshua/decoder/cky/NumTranslationOptionsTest.java ---------------------------------------------------------------------- diff --git a/joshua-core/src/test/java/org/apache/joshua/decoder/cky/NumTranslationOptionsTest.java b/joshua-core/src/test/java/org/apache/joshua/decoder/cky/NumTranslationOptionsTest.java index 66db0ad..ce730be 100644 --- a/joshua-core/src/test/java/org/apache/joshua/decoder/cky/NumTranslationOptionsTest.java +++ b/joshua-core/src/test/java/org/apache/joshua/decoder/cky/NumTranslationOptionsTest.java @@ -60,7 +60,8 @@ public class NumTranslationOptionsTest { String inputPath = this.getClass().getResource(inFile).getFile(); String goldPath = this.getClass().getResource(goldFile).getFile(); Config config = parseResources(this.getClass(), confFile) - .withFallback(Decoder.getDefaultFlags()); + .withFallback(Decoder.getDefaultFlags()) + .resolve(); KenLmTestUtil.Guard(() -> decoder = new Decoder(config)); decodeAndAssertDecodedOutputEqualsGold(inputPath, decoder, goldPath); http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/5a5c6d98/joshua-core/src/test/java/org/apache/joshua/decoder/kbest_extraction/KBestExtractionTest.java ---------------------------------------------------------------------- diff --git a/joshua-core/src/test/java/org/apache/joshua/decoder/kbest_extraction/KBestExtractionTest.java b/joshua-core/src/test/java/org/apache/joshua/decoder/kbest_extraction/KBestExtractionTest.java index 4a76922..692b74e 100644 --- a/joshua-core/src/test/java/org/apache/joshua/decoder/kbest_extraction/KBestExtractionTest.java +++ b/joshua-core/src/test/java/org/apache/joshua/decoder/kbest_extraction/KBestExtractionTest.java @@ -18,6 +18,15 @@ */ package org.apache.joshua.decoder.kbest_extraction; +import static com.google.common.base.Charsets.UTF_8; +import static java.nio.file.Files.readAllBytes; +import static org.testng.Assert.assertEquals; + +import java.io.File; +import java.io.IOException; +import java.nio.file.Path; +import java.nio.file.Paths; + import org.apache.joshua.decoder.Decoder; import org.apache.joshua.decoder.Translation; import org.apache.joshua.decoder.segment_file.Sentence; @@ -25,20 +34,10 @@ import org.apache.joshua.util.io.KenLmTestUtil; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import org.testng.reporters.Files; import com.typesafe.config.Config; import com.typesafe.config.ConfigValueFactory; -import java.io.File; -import java.io.IOException; -import java.nio.file.Path; -import java.nio.file.Paths; - -import static com.google.common.base.Charsets.UTF_8; -import static java.nio.file.Files.readAllBytes; -import static org.testng.Assert.assertEquals; - /** * Reimplements the kbest extraction regression test. */