Skip to content
Snippets Groups Projects
Commit 8e9bcf6e authored by megachriz's avatar megachriz Committed by Chris Leppanen
Browse files

Issue #2415283 by MegaChriz: Some tests are not executed by testbot

parent 69894265
No related branches found
No related tags found
No related merge requests found
...@@ -31,11 +31,13 @@ files[] = plugins/FeedsUserProcessor.inc ...@@ -31,11 +31,13 @@ files[] = plugins/FeedsUserProcessor.inc
; Tests ; Tests
files[] = tests/feeds.test files[] = tests/feeds.test
files[] = tests/common_syndication_parser.test
files[] = tests/feeds_date_time.test files[] = tests/feeds_date_time.test
files[] = tests/feeds_mapper_date.test files[] = tests/feeds_mapper_date.test
files[] = tests/feeds_mapper_date_multiple.test files[] = tests/feeds_mapper_date_multiple.test
files[] = tests/feeds_mapper_field.test files[] = tests/feeds_mapper_field.test
files[] = tests/feeds_mapper_file.test files[] = tests/feeds_mapper_file.test
files[] = tests/feeds_mapper_link.test
files[] = tests/feeds_mapper_path.test files[] = tests/feeds_mapper_path.test
files[] = tests/feeds_mapper_profile.test files[] = tests/feeds_mapper_profile.test
files[] = tests/feeds_mapper_unique.test files[] = tests/feeds_mapper_unique.test
...@@ -44,6 +46,8 @@ files[] = tests/feeds_mapper_config.test ...@@ -44,6 +46,8 @@ files[] = tests/feeds_mapper_config.test
files[] = tests/feeds_fetcher_file.test files[] = tests/feeds_fetcher_file.test
files[] = tests/feeds_mapper_format_config.test files[] = tests/feeds_mapper_format_config.test
files[] = tests/feeds_fetcher_http.test files[] = tests/feeds_fetcher_http.test
files[] = tests/feeds_parser_sitemap.test
files[] = tests/feeds_parser_syndication.test
files[] = tests/feeds_processor_entity.test files[] = tests/feeds_processor_entity.test
files[] = tests/feeds_processor_node.test files[] = tests/feeds_processor_node.test
files[] = tests/feeds_processor_term.test files[] = tests/feeds_processor_term.test
......
...@@ -29,17 +29,14 @@ class FeedsSitemapParserTestCase extends FeedsWebTestCase { ...@@ -29,17 +29,14 @@ class FeedsSitemapParserTestCase extends FeedsWebTestCase {
0 => array( 0 => array(
'source' => 'changefreq', 'source' => 'changefreq',
'target' => 'title', 'target' => 'title',
'unique' => FALSE,
), ),
1 => array( 1 => array(
'source' => 'priority', 'source' => 'priority',
'target' => 'body', 'target' => 'body',
'unique' => FALSE,
), ),
2 => array( 2 => array(
'source' => 'lastmod', 'source' => 'lastmod',
'target' => 'created', 'target' => 'created',
'unique' => FALSE,
), ),
3 => array( 3 => array(
'source' => 'url', 'source' => 'url',
...@@ -54,7 +51,6 @@ class FeedsSitemapParserTestCase extends FeedsWebTestCase { ...@@ -54,7 +51,6 @@ class FeedsSitemapParserTestCase extends FeedsWebTestCase {
) )
); );
$path = $GLOBALS['base_url'] . '/' . drupal_get_path('module', 'feeds') . '/tests/feeds/'; $path = $GLOBALS['base_url'] . '/' . drupal_get_path('module', 'feeds') . '/tests/feeds/';
$nid = $this->createFeedNode('sitemap', $path . 'sitemap-example.xml', 'Testing Sitemap Parser'); $nid = $this->createFeedNode('sitemap', $path . 'sitemap-example.xml', 'Testing Sitemap Parser');
$this->assertText('Created 5 nodes'); $this->assertText('Created 5 nodes');
...@@ -64,14 +60,14 @@ class FeedsSitemapParserTestCase extends FeedsWebTestCase { ...@@ -64,14 +60,14 @@ class FeedsSitemapParserTestCase extends FeedsWebTestCase {
$this->assertEqual($count, 5, 'Accurate number of items in database.'); $this->assertEqual($count, 5, 'Accurate number of items in database.');
// Check items against known content of feed. // Check items against known content of feed.
$items = db_query("SELECT * FROM {feeds_item} WHERE entity_type = 'node' AND feed_nid = :nid ORDER BY nid", array(':nid' => $nid)); $items = db_query("SELECT * FROM {feeds_item} WHERE entity_type = 'node' AND feed_nid = :nid ORDER BY entity_id", array(':nid' => $nid));
// Check first item. // Check first item.
date_default_timezone_set('GMT'); date_default_timezone_set('GMT');
$item = $items->fetchObject(); $item = $items->fetchObject();
$node = node_load($item->nid); $node = node_load($item->entity_id);
$this->assertEqual($node->title, 'monthly', 'Feed item 1 changefreq is correct.'); $this->assertEqual($node->title, 'monthly', 'Feed item 1 changefreq is correct.');
$this->assertEqual($node->body, '0.8', 'Feed item 1 priority is correct.'); $this->assertEqual($node->body[LANGUAGE_NONE][0]['value'], '0.8', 'Feed item 1 priority is correct.');
$this->assertEqual($node->created, strtotime('2005-01-01'), 'Feed item 1 lastmod is correct.'); $this->assertEqual($node->created, strtotime('2005-01-01'), 'Feed item 1 lastmod is correct.');
$info = feeds_item_info_load('node', $node->nid); $info = feeds_item_info_load('node', $node->nid);
$this->assertEqual($info->url, 'http://www.example.com/', 'Feed item 1 url is correct.'); $this->assertEqual($info->url, 'http://www.example.com/', 'Feed item 1 url is correct.');
...@@ -79,9 +75,9 @@ class FeedsSitemapParserTestCase extends FeedsWebTestCase { ...@@ -79,9 +75,9 @@ class FeedsSitemapParserTestCase extends FeedsWebTestCase {
// Check second item. // Check second item.
$item = $items->fetchObject(); $item = $items->fetchObject();
$node = node_load($item->nid); $node = node_load($item->entity_id);
$this->assertEqual($node->title, 'weekly', 'Feed item 2 changefreq is correct.'); $this->assertEqual($node->title, 'weekly', 'Feed item 2 changefreq is correct.');
$this->assertEqual($node->body, '', 'Feed item 2 priority is correct.'); $this->assertTrue(empty($node->body[LANGUAGE_NONE]), 'Feed item 2 priority is correct.');
// $node->created is... recently // $node->created is... recently
$info = feeds_item_info_load('node', $node->nid); $info = feeds_item_info_load('node', $node->nid);
$this->assertEqual($info->url, 'http://www.example.com/catalog?item=12&desc=vacation_hawaii', 'Feed item 2 url is correct.'); $this->assertEqual($info->url, 'http://www.example.com/catalog?item=12&desc=vacation_hawaii', 'Feed item 2 url is correct.');
...@@ -89,9 +85,9 @@ class FeedsSitemapParserTestCase extends FeedsWebTestCase { ...@@ -89,9 +85,9 @@ class FeedsSitemapParserTestCase extends FeedsWebTestCase {
// Check third item. // Check third item.
$item = $items->fetchObject(); $item = $items->fetchObject();
$node = node_load($item->nid); $node = node_load($item->entity_id);
$this->assertEqual($node->title, 'weekly', 'Feed item 3 changefreq is correct.'); $this->assertEqual($node->title, 'weekly', 'Feed item 3 changefreq is correct.');
$this->assertEqual($node->body, '', 'Feed item 3 priority is correct.'); $this->assertTrue(empty($node->body[LANGUAGE_NONE]), 'Feed item 3 priority is correct.');
$this->assertEqual($node->created, strtotime('2004-12-23'), 'Feed item 3 lastmod is correct.'); $this->assertEqual($node->created, strtotime('2004-12-23'), 'Feed item 3 lastmod is correct.');
$info = feeds_item_info_load('node', $node->nid); $info = feeds_item_info_load('node', $node->nid);
$this->assertEqual($info->url, 'http://www.example.com/catalog?item=73&desc=vacation_new_zealand', 'Feed item 3 url is correct.'); $this->assertEqual($info->url, 'http://www.example.com/catalog?item=73&desc=vacation_new_zealand', 'Feed item 3 url is correct.');
...@@ -99,9 +95,9 @@ class FeedsSitemapParserTestCase extends FeedsWebTestCase { ...@@ -99,9 +95,9 @@ class FeedsSitemapParserTestCase extends FeedsWebTestCase {
// Check fourth item. // Check fourth item.
$item = $items->fetchObject(); $item = $items->fetchObject();
$node = node_load($item->nid); $node = node_load($item->entity_id);
$this->assertEqual($node->title, '', 'Feed item 4 changefreq is correct.'); $this->assertEqual($node->title, '', 'Feed item 4 changefreq is correct.');
$this->assertEqual($node->body, '0.3', 'Feed item 4 priority is correct.'); $this->assertEqual($node->body[LANGUAGE_NONE][0]['value'], '0.3', 'Feed item 4 priority is correct.');
$this->assertEqual($node->created, strtotime('2004-12-23T18:00:15+00:00'), 'Feed item 4 lastmod is correct.'); $this->assertEqual($node->created, strtotime('2004-12-23T18:00:15+00:00'), 'Feed item 4 lastmod is correct.');
$info = feeds_item_info_load('node', $node->nid); $info = feeds_item_info_load('node', $node->nid);
$this->assertEqual($info->url, 'http://www.example.com/catalog?item=74&desc=vacation_newfoundland', 'Feed item 4 url is correct.'); $this->assertEqual($info->url, 'http://www.example.com/catalog?item=74&desc=vacation_newfoundland', 'Feed item 4 url is correct.');
...@@ -109,9 +105,9 @@ class FeedsSitemapParserTestCase extends FeedsWebTestCase { ...@@ -109,9 +105,9 @@ class FeedsSitemapParserTestCase extends FeedsWebTestCase {
// Check fifth item. // Check fifth item.
$item = $items->fetchObject(); $item = $items->fetchObject();
$node = node_load($item->nid); $node = node_load($item->entity_id);
$this->assertEqual($node->title, '', 'Feed item 5 changefreq is correct.'); $this->assertEqual($node->title, '', 'Feed item 5 changefreq is correct.');
$this->assertEqual($node->body, '', 'Feed item 5 priority is correct.'); $this->assertTrue(empty($node->body[LANGUAGE_NONE]), 'Feed item 5 priority is correct.');
$this->assertEqual($node->created, strtotime('2004-11-23'), 'Feed item 5 lastmod is correct.'); $this->assertEqual($node->created, strtotime('2004-11-23'), 'Feed item 5 lastmod is correct.');
$info = feeds_item_info_load('node', $node->nid); $info = feeds_item_info_load('node', $node->nid);
$this->assertEqual($info->url, 'http://www.example.com/catalog?item=83&desc=vacation_usa', 'Feed item 5 url is correct.'); $this->assertEqual($info->url, 'http://www.example.com/catalog?item=83&desc=vacation_usa', 'Feed item 5 url is correct.');
......
...@@ -31,6 +31,15 @@ class FeedsSyndicationParserTestCase extends FeedsWebTestCase { ...@@ -31,6 +31,15 @@ class FeedsSyndicationParserTestCase extends FeedsWebTestCase {
public function test() { public function test() {
$this->createImporterConfiguration('Syndication', 'syndication'); $this->createImporterConfiguration('Syndication', 'syndication');
// Only download simplepie if the plugin doesn't already exist somewhere.
// People running tests locally might have it.
if (!feeds_simplepie_exists()) {
$this->downloadExtractSimplePie('1.3');
$this->assertTrue(feeds_simplepie_exists());
// Reset all the caches!
$this->resetAll();
}
foreach (array('FeedsSyndicationParser', 'FeedsSimplePieParser') as $parser) { foreach (array('FeedsSyndicationParser', 'FeedsSimplePieParser') as $parser) {
$this->setPlugin('syndication', $parser); $this->setPlugin('syndication', $parser);
foreach ($this->feedUrls() as $url => $assertions) { foreach ($this->feedUrls() as $url => $assertions) {
......
...@@ -3,5 +3,9 @@ description = "Support module for Feeds related testing." ...@@ -3,5 +3,9 @@ description = "Support module for Feeds related testing."
package = Testing package = Testing
version = VERSION version = VERSION
core = 7.x core = 7.x
test_dependencies[] = date
test_dependencies[] = entity test_dependencies[] = entity
test_dependencies[] = feeds_xpathparser
test_dependencies[] = libraries
test_dependencies[] = link
hidden = TRUE hidden = TRUE
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment