[SCM] jsoup HTML parser branch, master, updated. debian/1.6.2-1-9-ge68369a

[Emmanuel Bourg]

The following commit has been merged in the master branch:
commit bcfcab61acf1ea8b3d882c595dcd5261ffb4b916
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon May 13 10:32:06 2013 +0200

    Refreshed the patch

diff --git a/debian/patches/dfsg-free-test-data.patch b/debian/patches/dfsg-free-test-data.patch
index b5a645f..266ceec 100644
--- a/debian/patches/dfsg-free-test-data.patch
+++ b/debian/patches/dfsg-free-test-data.patch
@@ -8,11 +8,17 @@ Subject: dfsg-free-test-data
  2 files changed, 1192 insertions(+), 85 deletions(-)
  create mode 100644 src/test/resources/htmltests/wikipedia-article-1.html
 
-diff --git a/src/test/java/org/jsoup/integration/ParseTest.java b/src/test/java/org/jsoup/integration/ParseTest.java
-index dc03973..d49e3e5 100644
 --- a/src/test/java/org/jsoup/integration/ParseTest.java
 +++ b/src/test/java/org/jsoup/integration/ParseTest.java
-@@ -19,50 +19,41 @@ import java.net.URISyntaxException;
+@@ -6,6 +6,7 @@
+ import org.jsoup.select.Elements;
+ import static org.junit.Assert.*;
+ import org.junit.Test;
++import org.junit.Ignore;
+ 
+ import java.io.File;
+ import java.io.IOException;
+@@ -19,50 +20,41 @@
  public class ParseTest {
  
      @Test
@@ -86,49 +92,23 @@ index dc03973..d49e3e5 100644
      }
  
      @Test
-@@ -74,41 +65,6 @@ public class ParseTest {
+@@ -74,6 +66,7 @@
      }
  
      @Test
--    public void testYahooJp() throws IOException {
--        File in = getFile("/htmltests/yahoo-jp.html");
--        Document doc = Jsoup.parse(in, "UTF-8", "http://www.yahoo.co.jp/index.html"); // http charset is utf-8.
--        assertEquals("Yahoo! JAPAN", doc.title());
--        Element a = doc.select("a[href=t/2322m2]").first();
--        assertEquals("http://www.yahoo.co.jp/_ylh=X3oDMTB0NWxnaGxsBF9TAzIwNzcyOTYyNjUEdGlkAzEyBHRtcGwDZ2Ex/t/2322m2",
--            a.attr("abs:href")); // session put into <base>
--        assertEquals("全国、人気の駅ランキング", a.text());
--    }
--
--    @Test
--    public void testBaidu() throws IOException {
--        // tests <meta http-equiv="Content-Type" content="text/html;charset=gb2312">
--        File in = getFile("/htmltests/baidu-cn-home.html");
--        Document doc = Jsoup.parse(in, null,
--            "http://www.baidu.com/"); // http charset is gb2312, but NOT specifying it, to test http-equiv parse
--        Element submit = doc.select("#su").first();
--        assertEquals("百度一下", submit.attr("value"));
--
--        // test from attribute match
--        submit = doc.select("input[value=百度一下]").first();
--        assertEquals("su", submit.id());
--        Element newsLink = doc.select("a:contains(新)").first();
--        assertEquals("http://news.baidu.com", newsLink.absUrl("href"));
--
--        // check auto-detect from meta
--        assertEquals("GB2312", doc.outputSettings().charset().displayName());
--        assertEquals("<title>百度一下，你就知道      </title>", doc.select("title").outerHtml());
--
--        doc.outputSettings().charset("ascii");
--        assertEquals("<title>百度一下，你就知道      </title>",
--            doc.select("title").outerHtml());
--    }
--
--    @Test
-     public void testBaiduVariant() throws IOException {
-         // tests <meta charset> when preceded by another <meta>
-         File in = getFile("/htmltests/baidu-variant.html");
-@@ -140,24 +96,6 @@ public class ParseTest {
++    @Ignore
+     public void testYahooJp() throws IOException {
+         File in = getFile("/htmltests/yahoo-jp.html");
+         Document doc = Jsoup.parse(in, "UTF-8", "http://www.yahoo.co.jp/index.html"); // http charset is utf-8.
+@@ -85,6 +78,7 @@
+     }
+ 
+     @Test
++    @Ignore
+     public void testBaidu() throws IOException {
+         // tests <meta http-equiv="Content-Type" content="text/html;charset=gb2312">
+         File in = getFile("/htmltests/baidu-cn-home.html");
+@@ -140,24 +134,6 @@
          assertEquals("新", doc.text());
      }
  
@@ -153,9 +133,6 @@ index dc03973..d49e3e5 100644
      File getFile(String resourceName) {
          try {
              File file = new File(ParseTest.class.getResource(resourceName).toURI());
-diff --git a/src/test/resources/htmltests/wikipedia-article-1.html b/src/test/resources/htmltests/wikipedia-article-1.html
-new file mode 100644
-index 0000000..14e7758
 --- /dev/null
 +++ b/src/test/resources/htmltests/wikipedia-article-1.html
 @@ -0,0 +1,1169 @@

-- 
jsoup HTML parser