Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 3C3DC200C61 for ; Mon, 10 Apr 2017 16:38:25 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 3AFFC160BA5; Mon, 10 Apr 2017 14:38:25 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 88C00160B85 for ; Mon, 10 Apr 2017 16:38:24 +0200 (CEST) Received: (qmail 80800 invoked by uid 500); 10 Apr 2017 14:38:23 -0000 Mailing-List: contact commits-help@lucenenet.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: lucene-net-dev@lucenenet.apache.org Delivered-To: mailing list commits@lucenenet.apache.org Received: (qmail 80753 invoked by uid 99); 10 Apr 2017 14:38:22 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Apr 2017 14:38:22 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A0853E038D; Mon, 10 Apr 2017 14:38:22 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: nightowl888@apache.org To: commits@lucenenet.apache.org Date: Mon, 10 Apr 2017 14:38:23 -0000 Message-Id: <7d6991f3db19406db4a61e89cb2b567d@git.apache.org> In-Reply-To: <5fe755487126441b96b875589e49e2ae@git.apache.org> References: <5fe755487126441b96b875589e49e2ae@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/5] lucenenet git commit: Lucene.Net.Tests.QueryParser.Messages.TestNLS.TestNLSLoading_xx_XX: Always ignore the test if CultureNotFoundException is thrown, rather than just on .NET Core archived-at: Mon, 10 Apr 2017 14:38:25 -0000 Lucene.Net.Tests.QueryParser.Messages.TestNLS.TestNLSLoading_xx_XX: Always ignore the test if CultureNotFoundException is thrown, rather than just on .NET Core Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/67f31ac4 Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/67f31ac4 Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/67f31ac4 Branch: refs/heads/api-work Commit: 67f31ac4aefda7c2ea39ff0d29998c15d5b5375a Parents: 035f680 Author: Shad Storhaug Authored: Mon Apr 10 16:55:41 2017 +0700 Committer: Shad Storhaug Committed: Mon Apr 10 16:55:41 2017 +0700 ---------------------------------------------------------------------- .../Flexible/Messages/TestNLS.cs | 50 +++++++++++--------- 1 file changed, 28 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucenenet/blob/67f31ac4/src/Lucene.Net.Tests.QueryParser/Flexible/Messages/TestNLS.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.QueryParser/Flexible/Messages/TestNLS.cs b/src/Lucene.Net.Tests.QueryParser/Flexible/Messages/TestNLS.cs index a781d05..2e31669 100644 --- a/src/Lucene.Net.Tests.QueryParser/Flexible/Messages/TestNLS.cs +++ b/src/Lucene.Net.Tests.QueryParser/Flexible/Messages/TestNLS.cs @@ -84,29 +84,35 @@ namespace Lucene.Net.QueryParsers.Flexible.Messages [Test] public void TestNLSLoading_xx_XX() { - // LUCENENET NOTE: .NET Core throws a CultureNotFoundException in this case. - // There doesn't seem to be a reasonable way to test this as a result. -#if !NETSTANDARD - CultureInfo locale = new CultureInfo("xx-XX"); - String message = NLS.GetLocalizedMessage( - MessagesTestBundle.Q0004E_INVALID_SYNTAX_ESCAPE_UNICODE_TRUNCATION, - locale); - /* - * if the default locale is ja, you get ja as a fallback: - * see ResourceBundle.html#getBundle(java.lang.String, java.util.Locale, java.lang.ClassLoader) - */ - if (!CultureInfo.CurrentUICulture.TwoLetterISOLanguageName.Equals("ja", StringComparison.OrdinalIgnoreCase)) - assertEquals("Truncated unicode escape sequence.", message); + try + { + CultureInfo locale = new CultureInfo("xx-XX"); + String message = NLS.GetLocalizedMessage( + MessagesTestBundle.Q0004E_INVALID_SYNTAX_ESCAPE_UNICODE_TRUNCATION, + locale); + /* + * if the default locale is ja, you get ja as a fallback: + * see ResourceBundle.html#getBundle(java.lang.String, java.util.Locale, java.lang.ClassLoader) + */ + if (!CultureInfo.CurrentUICulture.TwoLetterISOLanguageName.Equals("ja", StringComparison.OrdinalIgnoreCase)) + assertEquals("Truncated unicode escape sequence.", message); - message = NLS.GetLocalizedMessage(MessagesTestBundle.Q0001E_INVALID_SYNTAX, - locale, "XXX"); - /* - * if the default locale is ja, you get ja as a fallback: - * see ResourceBundle.html#getBundle(java.lang.String, java.util.Locale, java.lang.ClassLoader) - */ - if (!CultureInfo.CurrentUICulture.TwoLetterISOLanguageName.Equals("ja", StringComparison.OrdinalIgnoreCase)) - assertEquals("Syntax Error: XXX", message); -#endif + message = NLS.GetLocalizedMessage(MessagesTestBundle.Q0001E_INVALID_SYNTAX, + locale, "XXX"); + /* + * if the default locale is ja, you get ja as a fallback: + * see ResourceBundle.html#getBundle(java.lang.String, java.util.Locale, java.lang.ClassLoader) + */ + if (!CultureInfo.CurrentUICulture.TwoLetterISOLanguageName.Equals("ja", StringComparison.OrdinalIgnoreCase)) + assertEquals("Syntax Error: XXX", message); + } + catch (CultureNotFoundException) + { + // ignore + + // LUCENENET NOTE: .NET Core throws a CultureNotFoundException in this case. + // There doesn't seem to be a reasonable way to test this as a result. + } } [Test]