cvs diff: Diffing modules/update
Index: modules/update/update.info
===================================================================
RCS file: /Users/wright/drupal/local_repo/drupal/modules/update/update.info,v
retrieving revision 1.5
diff -u -p -r1.5 update.info
--- modules/update/update.info 11 Oct 2008 02:33:12 -0000 1.5
+++ modules/update/update.info 26 Sep 2009 02:28:24 -0000
@@ -4,9 +4,10 @@ description = Checks the status of avail
version = VERSION
package = Core
core = 7.x
-files[] = update.module
files[] = update.compare.inc
files[] = update.fetch.inc
+files[] = update.install
+files[] = update.module
files[] = update.report.inc
files[] = update.settings.inc
-files[] = update.install
+files[] = update.test
Index: modules/update/update.test
===================================================================
RCS file: modules/update/update.test
diff -N modules/update/update.test
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ modules/update/update.test 26 Sep 2009 02:28:24 -0000
@@ -0,0 +1,88 @@
+ 'Update functionality',
+ 'description' => 'Tests the update module through a series of functional tests using mock XML data.',
+ 'group' => 'Update',
+ );
+ }
+
+ function setUp() {
+ parent::setUp('update_test', 'update');
+ $admin_user = $this->drupalCreateUser(array('administer site configuration'));
+ $this->drupalLogin($admin_user);
+ variable_set('update_fetch_url', url('update-test', array('absolute' => TRUE)));
+ }
+
+ /**
+ * Tests the update module when no updates are available.
+ */
+ function testNoUpdatesAvailable() {
+ $this->refreshUpdateData('no-updates.xml');
+ $this->drupalGet('admin/reports/updates');
+ $this->standardTests();
+ $this->assertText(t('Up to date'));
+ $this->assertNoText(t('Update available'));
+ $this->assertNoText(t('Security update required!'));
+ }
+
+ /**
+ * Tests the update module when one normal update ("7.1") is available.
+ */
+ function testNormalUpdateAvailable() {
+ $this->refreshUpdateData('normal-update.xml');
+ $this->drupalGet('admin/reports/updates');
+ $this->standardTests();
+ $this->assertNoText(t('Up to date'));
+ $this->assertText(t('Update available'));
+ $this->assertNoText(t('Security update required!'));
+ $this->assertRaw(l('7.1', 'http://example.com/drupal-7-1-release'), t('Link to release appears.'));
+ $this->assertRaw(l(t('Download'), 'http://example.com/drupal-7-1.tar.gz'), t('Link to download appears.'));
+ $this->assertRaw(l(t('Release notes'), 'http://example.com/drupal-7-1-release'), t('Link to release notes appears.'));
+ }
+
+ /**
+ * Tests the update module when a security update ("7.2") is available.
+ */
+ function testSecurityUpdateAvailable() {
+ $this->refreshUpdateData('security-update.xml');
+ $this->drupalGet('admin/reports/updates');
+ $this->standardTests();
+ $this->assertNoText(t('Up to date'));
+ $this->assertNoText(t('Update available'));
+ $this->assertText(t('Security update required!'));
+ $this->assertRaw(l('7.2', 'http://example.com/drupal-7-2-release'), t('Link to release appears.'));
+ $this->assertRaw(l(t('Download'), 'http://example.com/drupal-7-2.tar.gz'), t('Link to download appears.'));
+ $this->assertRaw(l(t('Release notes'), 'http://example.com/drupal-7-2-release'), t('Link to release notes appears.'));
+ }
+
+ /**
+ * Helper function: force te update cache to refresh based on the contents of
+ * the specified XML file.
+ *
+ * @param $xml
+ * The file name of the XML file to use for mock update data.
+ */
+ protected function refreshUpdateData($xml) {
+ variable_set('update_test_xml', $xml);
+ $this->drupalGet('admin/reports/updates/check');
+ }
+
+ /**
+ * Helper function: run a series of assertions that are applicable for all
+ * update statuses.
+ */
+ protected function standardTests() {
+ $this->assertRaw(l(t('Check manually'), 'admin/reports/updates/check'), t('Link to check available updates manually appears.'));
+ $this->assertRaw(l(t('Drupal'), 'http://example.com/project/drupal'), t('Link to the Drupal project appears.'));
+ }
+}
cvs diff: Diffing modules/update/tests
Index: modules/update/tests/no-updates.xml
===================================================================
RCS file: modules/update/tests/no-updates.xml
diff -N modules/update/tests/no-updates.xml
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ modules/update/tests/no-updates.xml 26 Sep 2009 02:28:24 -0000
@@ -0,0 +1,34 @@
+
+
+Drupal
+drupal
+Drupal
+7.x
+7
+7
+7
+published
+http://example.com/project/drupal
+
+ ProjectsDrupal project
+
+
+
+ Drupal 7.0
+ 7.0
+ DRUPAL-7-0
+ 7
+ 0
+ published
+ http://example.com/drupal-7-0-release
+ http://example.com/drupal-7-0.tar.gz
+ 1250424521
+ b966255555d9c9b86d480ca08cfaa98e
+ 1073741824
+
+ Release typeNew features
+ Release typeBug fixes
+
+
+
+
Index: modules/update/tests/normal-update.xml
===================================================================
RCS file: modules/update/tests/normal-update.xml
diff -N modules/update/tests/normal-update.xml
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ modules/update/tests/normal-update.xml 26 Sep 2009 02:28:24 -0000
@@ -0,0 +1,51 @@
+
+
+Drupal
+drupal
+Drupal
+7.x
+7
+7
+7
+published
+http://example.com/project/drupal
+
+ ProjectsDrupal project
+
+
+
+ Drupal 7.1
+ 7.1
+ DRUPAL-7-1
+ 7
+ 1
+ published
+ http://example.com/drupal-7-1-release
+ http://example.com/drupal-7-1.tar.gz
+ 1250424581
+ b966255555d9c9b86d480ca08cfaa98e
+ 2147483648
+
+ Release typeNew features
+ Release typeBug fixes
+
+
+
+ Drupal 7.0
+ 7.0
+ DRUPAL-7-0
+ 7
+ 0
+ published
+ http://example.com/drupal-7-0-release
+ http://example.com/drupal-7-0.tar.gz
+ 1250424521
+ b966255555d9c9b86d480ca08cfaa98e
+ 1073741824
+
+ Release typeNew features
+ Release typeBug fixes
+
+
+
+
Index: modules/update/tests/security-update.xml
===================================================================
RCS file: modules/update/tests/security-update.xml
diff -N modules/update/tests/security-update.xml
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ modules/update/tests/security-update.xml 26 Sep 2009 02:28:24 -0000
@@ -0,0 +1,69 @@
+
+
+Drupal
+drupal
+Drupal
+7.x
+7
+7
+7
+published
+http://example.com/project/drupal
+
+ ProjectsDrupal project
+
+
+
+ Drupal 7.2
+ 7.2
+ DRUPAL-7-2
+ 7
+ 2
+ published
+ http://example.com/drupal-7-2-release
+ http://example.com/drupal-7-2.tar.gz
+ 1250424641
+ b966255555d9c9b86d480ca08cfaa98e
+ 4294967296
+
+ Release typeNew features
+ Release typeBug fixes
+ Release typeSecurity update
+
+
+
+ Drupal 7.1
+ 7.1
+ DRUPAL-7-1
+ 7
+ 1
+ published
+ http://example.com/drupal-7-1-release
+ http://example.com/drupal-7-1.tar.gz
+ 1250424581
+ b966255555d9c9b86d480ca08cfaa98e
+ 2147483648
+
+ Release typeNew features
+ Release typeBug fixes
+
+
+
+ Drupal 7.0
+ 7.0
+ DRUPAL-7-0
+ 7
+ 0
+ published
+ http://example.com/drupal-7-0-release
+ http://example.com/drupal-7-0.tar.gz
+ 1250424521
+ b966255555d9c9b86d480ca08cfaa98e
+ 1073741824
+
+ Release typeNew features
+ Release typeBug fixes
+
+
+
+
Index: modules/update/tests/update_test.info
===================================================================
RCS file: modules/update/tests/update_test.info
diff -N modules/update/tests/update_test.info
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ modules/update/tests/update_test.info 26 Sep 2009 02:28:24 -0000
@@ -0,0 +1,8 @@
+; $Id$
+name = Update test
+description = Support module for update module testing.
+package = Testing
+version = VERSION
+core = 7.x
+files[] = update_test.module
+hidden = TRUE
Index: modules/update/tests/update_test.module
===================================================================
RCS file: modules/update/tests/update_test.module
diff -N modules/update/tests/update_test.module
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ modules/update/tests/update_test.module 26 Sep 2009 02:28:54 -0000
@@ -0,0 +1,36 @@
+ t('Update test'),
+ 'page callback' => 'update_test_mock_page',
+ 'access callback' => TRUE,
+ 'type' => MENU_CALLBACK,
+ );
+
+ return $items;
+}
+
+/**
+ * Implement hook_system_info_alter().
+ */
+function update_test_system_info_alter(&$info, $file) {
+ // Make all modules and themes' versions 7.0 for testing.
+ $info['version'] = '7.0';
+}
+
+/**
+ * Page callback, prints mock XML for the update module.
+ */
+function update_test_mock_page() {
+ $xml = variable_get('update_test_xml', FALSE);
+ // Note: this will cause an exception to occur if no variable was set and
+ // $file is FALSE.
+ readfile(drupal_get_path('module', 'update_test') . "/$xml");
+}