Projects >> heritrix3 >>9e4c7f002418e6205c0a8ddc827dbc6450d377a6

Chunk
Conflicting content 
        verifySourceStats();
        verifyWarcStats();
    }
<<<<<<< HEAD
    
    protected void verifyWarcStats() {
        StatisticsTracker stats = heritrix.getEngine().getJob("selftest-job").getCrawlController().getStatisticsTracker();
        assertNotNull(stats);
        assertEquals(14, (long) stats.getCrawledBytes().get(CrawledBytesHistotable.WARC_NOVEL_URLS));
        assertEquals(12718, (long) stats.getCrawledBytes().get(CrawledBytesHistotable.WARC_NOVEL_CONTENT_BYTES));

        assertEquals(3, (long) stats.getServerCache().getHostFor("127.0.0.1").getSubstats().get(CrawledBytesHistotable.WARC_NOVEL_URLS));
        assertEquals(2942, (long) stats.getServerCache().getHostFor("127.0.0.1").getSubstats().get(CrawledBytesHistotable.WARC_NOVEL_CONTENT_BYTES));
        assertEquals(10, (long) stats.getServerCache().getHostFor("localhost").getSubstats().get(CrawledBytesHistotable.WARC_NOVEL_URLS));
        assertEquals(9727, (long) stats.getServerCache().getHostFor("localhost").getSubstats().get(CrawledBytesHistotable.WARC_NOVEL_CONTENT_BYTES));
        assertEquals(1, (long) stats.getServerCache().getHostFor("dns:").getSubstats().get(CrawledBytesHistotable.WARC_NOVEL_URLS));
        assertEquals(49, (long) stats.getServerCache().getHostFor("dns:").getSubstats().get(CrawledBytesHistotable.WARC_NOVEL_CONTENT_BYTES));
    }
=======
>>>>>>> b82896927aa5283382d331355bde422d0b9bc4c0

    protected void verifySourceStats() throws Exception {
        StatisticsTracker stats = heritrix.getEngine().getJob("selftest-job").getCrawlController().getStatisticsTracker();
Solution content 
        verifySourceStats();
        verifyWarcStats();
    }

    protected void verifyWarcStats() {
        StatisticsTracker stats = heritrix.getEngine().getJob("selftest-job").getCrawlController().getStatisticsTracker();
        assertNotNull(stats);
        assertEquals(14, (long) stats.getCrawledBytes().get(CrawledBytesHistotable.WARC_NOVEL_URLS));
        assertEquals(12718, (long) stats.getCrawledBytes().get(CrawledBytesHistotable.WARC_NOVEL_CONTENT_BYTES));

        assertEquals(3, (long) stats.getServerCache().getHostFor("127.0.0.1").getSubstats().get(CrawledBytesHistotable.WARC_NOVEL_URLS));
        assertEquals(2942, (long) stats.getServerCache().getHostFor("127.0.0.1").getSubstats().get(CrawledBytesHistotable.WARC_NOVEL_CONTENT_BYTES));
        assertEquals(10, (long) stats.getServerCache().getHostFor("localhost").getSubstats().get(CrawledBytesHistotable.WARC_NOVEL_URLS));
        assertEquals(9727, (long) stats.getServerCache().getHostFor("localhost").getSubstats().get(CrawledBytesHistotable.WARC_NOVEL_CONTENT_BYTES));
        assertEquals(1, (long) stats.getServerCache().getHostFor("dns:").getSubstats().get(CrawledBytesHistotable.WARC_NOVEL_URLS));
        assertEquals(49, (long) stats.getServerCache().getHostFor("dns:").getSubstats().get(CrawledBytesHistotable.WARC_NOVEL_CONTENT_BYTES));
    }

    protected void verifySourceStats() throws Exception {
        StatisticsTracker stats = heritrix.getEngine().getJob("selftest-job").getCrawlController().getStatisticsTracker();
File
StatisticsSelfTest.java
Developer's decision
Version 1
Kind of conflict
Method declaration
Chunk
Conflicting content 
        assertEquals(4, sourceStats.keySet().size());
        assertEquals(2942l, (long) sourceStats.get("novel"));
        assertEquals(3l, (long) sourceStats.get("novelCount"));
<<<<<<< HEAD
        assertEquals(2942l, (long) sourceStats.get("warcNovelContentBytes"));
        assertEquals(3l, (long) sourceStats.get("warcNovelUrls"));
        
=======

>>>>>>> b82896927aa5283382d331355bde422d0b9bc4c0
        sourceStats = stats.getSourceStats("http://localhost:7777/b.html");
        assertNotNull(sourceStats);
        assertEquals(4, sourceStats.keySet().size());
Solution content 
        assertEquals(4, sourceStats.keySet().size());
        assertEquals(2942l, (long) sourceStats.get("novel"));
        assertEquals(3l, (long) sourceStats.get("novelCount"));
        assertEquals(2942l, (long) sourceStats.get("warcNovelContentBytes"));
        assertEquals(3l, (long) sourceStats.get("warcNovelUrls"));

        sourceStats = stats.getSourceStats("http://localhost:7777/b.html");
        assertNotNull(sourceStats);
        assertEquals(4, sourceStats.keySet().size());
File
StatisticsSelfTest.java
Developer's decision
Version 1
Kind of conflict
Method invocation