From 6f18eec77eda0118358783d31f0937f09e32bb16 Mon Sep 17 00:00:00 2001 From: "yihua.huang" Date: Mon, 23 Sep 2013 13:07:33 +0800 Subject: [PATCH] fix a test error --- .../us/codecraft/webmagic/MockDownloader.java | 375 +++++------------- .../webmagic/model/GithubRepoTest.java | 4 +- 2 files changed, 98 insertions(+), 281 deletions(-) diff --git a/webmagic-extension/src/test/java/us/codecraft/webmagic/MockDownloader.java b/webmagic-extension/src/test/java/us/codecraft/webmagic/MockDownloader.java index 8114b040..aa62e9e0 100644 --- a/webmagic-extension/src/test/java/us/codecraft/webmagic/MockDownloader.java +++ b/webmagic-extension/src/test/java/us/codecraft/webmagic/MockDownloader.java @@ -18,7 +18,7 @@ public class MockDownloader implements Downloader{ " \n" + " \n" + " \n" + - " code4craft/webmagic\n" + + " code4craft/webmagic · GitHub\n" + " \n" + " \n" + " \n" + @@ -27,7 +27,7 @@ public class MockDownloader implements Downloader{ " \n" + " \n" + " \n" + - " \n" + + " \n" + " \n" + " \n" + " \n" + @@ -38,7 +38,7 @@ public class MockDownloader implements Downloader{ " \n" + " \n" + " \n" + - " \n" + + " \n" + " \n" + "\n" + " \n" + @@ -48,15 +48,16 @@ public class MockDownloader implements Downloader{ " \n" + "\n" + "\n" + - " \n" + - " \n" + + " \n" + + " \n" + " \n" + "\n" + + " \n" + "\n" + - " \n" + - " \n" + + " \n" + + " \n" + " \n" + - " \n" + + " \n" + "\n" + " \n" + " \n" + @@ -73,37 +74,42 @@ public class MockDownloader implements Downloader{ " \n" + "\n" + "\n" + - " \n" + + " \n" + "
\n" + " \n" + " \n" + " \n" + "\n" + "\n" + - "
\n" + + " \n" + + "
\n" + "
\n" + "\n" + - " \n" + - " \n" + - "\n" + - "\n" + - "
\n" + + " \n" + + " \n" + + " \n" + "\n" + - " \n" + - " \n" + - " \n" + - "
\n" + + "
\n" + + " Sign up\n" + + " Sign in\n" + + "
\n" + "\n" + + "
\n" + "\n" + - "
\n" + - "
\n" + + " \n" + + " \n" + "\n" + "\n" + "\n" + " \n" + @@ -140,84 +146,15 @@ public class MockDownloader implements Downloader{ " \n" + "\n" + "
\n" + - " \n" + - "
\n" + - "\n" + - " \n" + - "\n" + - "\n" + - " \n" + - "\n" + - "
\n" + - " \n" + - "\n" + - "\n" + - "\n" + - "
\n" + - "\n" + + "
\n" + "\n" + - " \n" + "
\n" + "
\n" + "\n" + - " \n" + "\n" + " \n" + "\n" + "\n" + - "\n" + - "\n" + "
\n" + " \n" + "
\n" + @@ -226,100 +163,29 @@ public class MockDownloader implements Downloader{ "\n" + "
    \n" + "\n" + - "
  • \n" + - "
    \n" + - "\n" + - "
    \n" + - " \n" + - " 23\n" + - " \n" + - " \n" + - " \n" + - " \n" + - " Unwatch\n" + - " \n" + - " \n" + - "\n" + - "
    \n" + - "
    \n" + - "
    \n" + - " Notification status\n" + - " \n" + - "
    \n" + - "\n" + - "
    \n" + - "\n" + - "
    \n" + - " \n" + - "
    \n" + - " \n" + - "

    Not watching

    \n" + - " You only receive notifications for discussions in which you participate or are @mentioned.\n" + - " \n" + - " \n" + - " Watch\n" + - " \n" + - "
    \n" + - "
    \n" + - "\n" + - "
    \n" + - " \n" + - "
    \n" + - " \n" + - "

    Watching

    \n" + - " You receive notifications for all discussions in this repository.\n" + - " \n" + - " \n" + - " Unwatch\n" + - " \n" + - "
    \n" + - "
    \n" + - "\n" + - "
    \n" + - " \n" + - "
    \n" + - " \n" + - "

    Ignoring

    \n" + - " You do not receive any notifications for discussions in this repository.\n" + - " \n" + - " \n" + - " Stop ignoring\n" + - " \n" + - "
    \n" + - "
    \n" + - "\n" + - "
    \n" + - "\n" + - "
    \n" + - "
    \n" + - "
    \n" + - "\n" + - "
    \n" + - "
    • \n" + "\n" + "
  • \n" + - " \n" + - "
    \n" + - " \n" + - " Unstar\n" + - " \n" + - " \n" + - " Star\n" + - " \n" + - " 78\n" + - "
    \n" + + " \n" + + " Star\n" + + "\n" + + "\n" + + " 86\n" + + "\n" + "\n" + "
    • \n" + "\n" + - "\n" + - "
  • \n" + - " \n" + - " Fork\n" + - " \n" + - " 65\n" + - "
    • \n" + - "\n" + - "\n" + + "
  • \n" + + " \n" + + " Fork\n" + + " \n" + + " \n" + + " 70\n" + + " \n" + + "
    • \n" + "
\n" + "\n" + "

\n" + @@ -357,7 +223,7 @@ public class MockDownloader implements Downloader{ "
  • \n" + " \n" + " Issues\n" + - " 7\n" + + " 2\n" + " \"Octocat-spinner-32\"\n" + "
    • \n" + "\n" + @@ -397,15 +263,6 @@ public class MockDownloader implements Downloader{ " \n" + "\n" + "\n" + - "
    \n" + - " \n" + "

    \n" + "
    \n" + "\n" + @@ -416,9 +273,8 @@ public class MockDownloader implements Downloader{ "\n" + "
    \n" + + " data-url=\"/users/set_protocol?protocol_selector=http&protocol_type=clone\">\n" + "

    HTTPS clone URL

    \n" + - "\n" + "
    \n" + " \n" + @@ -430,25 +286,9 @@ public class MockDownloader implements Downloader{ " \n" + "\n" + "
    \n" + - "

    SSH clone URL

    \n" + - "\n" + - "
    \n" + - " \n" + - "\n" + - " \n" + - "
    \n" + - "
    \n" + - "\n" + - " \n" + - "\n" + - "
    \n" + + " data-url=\"/users/set_protocol?protocol_selector=subversion&protocol_type=clone\">\n" + "

    Subversion checkout URL

    \n" + - "\n" + "
    \n" + " \n" + @@ -458,15 +298,17 @@ public class MockDownloader implements Downloader{ "
    \n" + "\n" + "\n" + - "\n" + "

    You can clone with\n" + - " HTTPS,\n" + - " SSH,\n" + - " Subversion,\n" + - " and other methods.\n" + + " HTTPS,\n" + + " or Subversion.\n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + "

    \n" + "\n" + - " \n" + + " \n" + " \n" + " Clone in Desktop\n" + " \n" + @@ -492,22 +334,7 @@ public class MockDownloader implements Downloader{ "
    \n" + "\n" + "\n" + - " — Edit\n" + - "
    \n" + - "\n" + - "
    \n" + - " \n" + - " \n" + - "
    \n" + - "\n" + - "
    \n" + - " \n" + - " \n" + - "
    \n" + "\n" + - " \n" + - " or cancel\n" + - "\n" + "
    \n" + "\n" + "
    \n" + @@ -519,7 +346,7 @@ public class MockDownloader implements Downloader{ " \n" + " \n" + " \n" + - " 299\n" + + " 311\n" + " \n" + " commits\n" + " \n" + @@ -538,7 +365,7 @@ public class MockDownloader implements Downloader{ " \n" + " \n" + " \n" + - " 4\n" + + " 5\n" + " \n" + " releases\n" + " \n" + @@ -561,7 +388,7 @@ public class MockDownloader implements Downloader{ " \n" + " \n" + " Java\n" + - " 100.0%\n" + + " 100%\n" + " \n" + " \n" + " \n" + @@ -574,14 +401,10 @@ public class MockDownloader implements Downloader{ " class=\"repository-lang-stats-graph js-toggle-lang-stats tooltipped downwards\"\n" + " title=\"Show language statistics\"\n" + " style=\"background-color:#b07219\">\n" + - " Java\n" + + " Java\n" + " \n" + "\n" + "\n" + - " \n" + - "
    \n" + - "\n" + "\n" + "\n" + "
    \n" + @@ -595,7 +418,8 @@ public class MockDownloader implements Downloader{ "
    \n" + " \n" + + " data-ref=\"master\"\n" + + " role=\"button\" aria-label=\"Switch branches or tags\" tabindex=\"0\">\n" + " \n" + " branch:\n" + " master\n" + @@ -611,7 +435,7 @@ public class MockDownloader implements Downloader{ "\n" + "
    \n" + "
    \n" + - " \n" + + " \n" + "
    \n" + "
    \n" + "
      \n" + @@ -648,17 +472,7 @@ public class MockDownloader implements Downloader{ "
    \n" + "
    \n" + "\n" + - "
    \n" + - " \n" + - "
    \n" + - "

    Create branch:

    \n" + - " from ‘master’\n" + - "
    \n" + - " \n" + - " \n" + - " \n" + - "
    \n" + - "\n" + + "
    Nothing to show
    \n" + "
    \n" + "\n" + "
    \n" + @@ -667,6 +481,10 @@ public class MockDownloader implements Downloader{ "\n" + "
    \n" + " \n" + + " webmagic-parent-0.3.1\n" + + "
    \n" + + "
    \n" + + " \n" + " webmagic-parent-0.2.1\n" + "
    \n" + "
    \n" + @@ -691,13 +509,13 @@ public class MockDownloader implements Downloader{ "
    \n" + "\n" + "\n" + - "
    webmagic /
    \n" + + "
    webmagic /
    \n" + "
    \n" + "\n" + "\n" + "\n" + "Show File Finder\n" + + " data-hotkey=\"t\" class=\"js-show-file-finder\" style=\"display:none\" data-pjax>Show File Finder\n" + "
    \n" + " \n" + " \n" + @@ -735,12 +553,12 @@ public class MockDownloader implements Downloader{ " \"Octocat-spinner-32\"\n" + " \n" + " \n" + " \n" + - " \n" + + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + - " \n" + + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + - " \n" + + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + - " \n" + + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + - " \n" + + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + - " \n" + + " \n" + " \n" + " \n" + "
    \n" + - " webmagic-core\n" + + " webmagic-core\n" + " \n" + - " fix null pointe exception #26\n" + + " add example\n" + "
    \n" + @@ -748,12 +566,12 @@ public class MockDownloader implements Downloader{ " \"Octocat-spinner-32\"\n" + " \n" + - " webmagic-extension\n" + + " webmagic-extension\n" + " \n" + - " fix null pointe exception #26\n" + + " add example\n" + "
    \n" + @@ -774,12 +592,12 @@ public class MockDownloader implements Downloader{ " \"Octocat-spinner-32\"\n" + " \n" + - " webmagic-samples\n" + + " webmagic-samples\n" + " \n" + - " update version for samples\n" + + " some bugfix\n" + "
    \n" + @@ -813,12 +631,12 @@ public class MockDownloader implements Downloader{ " \"Octocat-spinner-32\"\n" + " \n" + - " zh_docs\n" + + " zh_docs\n" + " \n" + - " update version\n" + + " update version\n" + "
    \n" + @@ -852,12 +670,12 @@ public class MockDownloader implements Downloader{ " \"Octocat-spinner-32\"\n" + " \n" + - " README.md\n" + + " README.md\n" + " \n" + - " update version\n" + + " update version\n" + "
    \n" + @@ -865,12 +683,12 @@ public class MockDownloader implements Downloader{ " \"Octocat-spinner-32\"\n" + " \n" + - " pom.xml\n" + + " pom.xml\n" + " \n" + - " 将单元测试fork独立的JVM来跑。避免少数情况默认maven开的JVM堆太小。\n" + + " [maven-release-plugin] prepare for next development iteration\n" + "
    \n" + @@ -932,12 +750,12 @@ public class MockDownloader implements Downloader{ "
        <dependency>\n" +
             "        <groupId>us.codecraft</groupId>\n" +
             "        <artifactId>webmagic-core</artifactId>\n" +
-            "        <version>0.3.0</version>\n" +
+            "        <version>0.3.1</version>\n" +
             "    </dependency>\n" +
             "    <dependency>\n" +
             "        <groupId>us.codecraft</groupId>\n" +
             "        <artifactId>webmagic-extension</artifactId>\n" +
-            "        <version>0.3.0</version>\n" +
+            "        <version>0.3.1</version>\n" +
             "    </dependency>\n" +
             "
    \n" + "\n" + @@ -949,7 +767,7 @@ public class MockDownloader implements Downloader{ "\n" + "

    Write a class implements PageProcessor：

    \n" + "\n" + - "
        public class OschinaBlogPageProcesser implements PageProcessor {\n" +
+            "
        public class OschinaBlogPageProcesser implements PageProcessor {\n" +
             "\n" +
             "        private Site site = Site.me().setDomain(\"my.oschina.net\")\n" +
             "           .addStartUrl(\"http://my.oschina.net/flashsword/blog\");\n" +
@@ -984,7 +802,7 @@ public class MockDownloader implements Downloader{
             "\n" +
             "
    You can also use annotation way:
    \n" +
             "\n" +
-            "
        @TargetUrl(\"http://my.oschina.net/flashsword/blog/\\\\d+\")\n" +
+            "
        @TargetUrl(\"http://my.oschina.net/flashsword/blog/\\\\d+\")\n" +
             "    public class OschinaBlog {\n" +
             "\n" +
             "        @ExtractBy(\"//title\")\n" +
@@ -1071,7 +889,7 @@ public class MockDownloader implements Downloader{
             "    \n" +
             "\n" +
             "    
      \n" +
-            "      
    • © 2013 GitHub, Inc.
      • \n" +
+            "      
    • © 2013 GitHub, Inc.
      • \n" +
             "        
    • Terms
      • \n" +
             "        
    • Privacy
      • \n" +
             "        
    • Security
      • \n" +
@@ -1111,7 +929,6 @@ public class MockDownloader implements Downloader{
             "      Something went wrong with that request. Please try again.\n" +
             "    
    \n" +
             "\n" +
-            "    \n" +
             "  \n" +
             "\n" +
             "\n";
diff --git a/webmagic-extension/src/test/java/us/codecraft/webmagic/model/GithubRepoTest.java b/webmagic-extension/src/test/java/us/codecraft/webmagic/model/GithubRepoTest.java
index 97555503..d6e1bf02 100644
--- a/webmagic-extension/src/test/java/us/codecraft/webmagic/model/GithubRepoTest.java
+++ b/webmagic-extension/src/test/java/us/codecraft/webmagic/model/GithubRepoTest.java
@@ -18,8 +18,8 @@ public class GithubRepoTest {
                 , new PageModelPipeline() {
             @Override
             public void process(GithubRepo o, Task task) {
-                Assert.assertEquals(78, o.getStar());
-                Assert.assertEquals(65, o.getFork());
+                Assert.assertEquals(86, o.getStar());
+                Assert.assertEquals(70, o.getFork());
             }
         }, GithubRepo.class).setDownloader(new MockDownloader()).test("https://github.com/code4craft/webmagic");
     }