From: Pavel Tisnovsky <ptisnovs@redhat.com>
To: Dr Andrew John Hughes <ahughes@redhat.com>
Cc: mauve-discuss@sourceware.org
Subject: Re: Fix for test gnu/testlet/java/lang/Integer/parseInt.java
Date: Thu, 18 Aug 2011 12:41:00 -0000 [thread overview]
Message-ID: <4E4D08C8.8010307@redhat.com> (raw)
In-Reply-To: <20110817162659.GB9583@rivendell.middle-earth.co.uk>
[-- Attachment #1: Type: text/plain, Size: 366 bytes --]
Dr Andrew John Hughes wrote:
> As the old behaviour is specific to versions of Sun/Oracle's JDK implementation,
> it should check that this implementation is being used as well, rather than just
> the version.
Hi Andrew,
I've tried to add check for JDK/JRE implementation as you suggested. Patch for
parseInt Mauve test is stored in an attachment.
Cheers,
Pavel
[-- Attachment #2: parseInt.patch --]
[-- Type: text/x-patch, Size: 1980 bytes --]
--- gnu/testlet/java/lang/Integer/parseInt.java 2008-05-12 23:35:49.000000000 +0200
+++ gnu/testlet/java/lang/Integer/parseInt.java 2011-08-17 17:17:16.000000000 +0200
@@ -27,6 +27,26 @@
public class parseInt implements Testlet
{
+ /**
+ * Returns true if tested JRE conformns to JDK 1.7 specification.
+ */
+ private static boolean conformToJDK17()
+ {
+ String[] javaVersion = System.getProperty("java.version").split("\\.");
+ String vendorID = System.getProperty("java.vendor");
+ // GNU CLASSPATH conform to JDK1.7, at least in case of Integer.parseInt() method
+ if ("Free Software Foundation, Inc.".equals(vendorID))
+ {
+ return true;
+ }
+ // test of OpenJDK
+ if ("Sun Microsystems Inc.".equals(vendorID))
+ {
+ return Integer.parseInt(javaVersion[1]) >= 7;
+ }
+ return false; // questionable
+ }
+
public void test(TestHarness harness)
{
int i;
@@ -106,15 +126,30 @@
}
// In JDK1.7, '+' is considered a valid character.
- try
- {
- i = Integer.parseInt("+10");
- harness.check(true);
- harness.check(i, 10);
- }
- catch (NumberFormatException nfe)
- {
- harness.fail("Leading '+' does not throw NumberFormatException");
+ // it means that the following step should be divided
+ // for pre JDK1.7 case and >= JDK1.7
+ if (conformToJDK17()) {
+ try
+ {
+ i = Integer.parseInt("+10");
+ harness.check(true);
+ harness.check(i, 10);
+ }
+ catch (NumberFormatException nfe)
+ {
+ harness.fail("'+10' string is not parsed correctly as expected in JDK1.7");
+ }
+ }
+ else { // pre JDK1.7 branch
+ try
+ {
+ i = Integer.parseInt("+10");
+ harness.fail("'+10' must throw NumberFormatException");
+ }
+ catch (NumberFormatException nfe)
+ {
+ harness.check(true);
+ }
}
try
next prev parent reply other threads:[~2011-08-18 12:41 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-17 16:19 Pavel Tisnovsky
2011-08-17 16:27 ` Dr Andrew John Hughes
2011-08-18 8:12 ` Pavel Tisnovsky
2011-08-18 15:50 ` Dr Andrew John Hughes
2011-08-18 12:41 ` Pavel Tisnovsky [this message]
2011-08-18 15:46 ` Dr Andrew John Hughes
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4E4D08C8.8010307@redhat.com \
--to=ptisnovs@redhat.com \
--cc=ahughes@redhat.com \
--cc=mauve-discuss@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).