non security modules update

This commit is contained in:
Bachir Soussi Chiadmi
2015-04-20 16:32:07 +02:00
parent 6a8d30db08
commit 37fbabab56
466 changed files with 32690 additions and 9652 deletions

View File

@@ -1,11 +0,0 @@
/**
* @file
* Test CSS file for Libraries loading.
*
* Color the 'libraries-test-css' div red. See README.txt for more information.
*/
.libraries-test-css {
color: red;
}

View File

@@ -1,11 +0,0 @@
/**
* @file
* Test CSS file for Libraries loading.
*
* Color the 'libraries-test-css' div green. See README.txt for more information.
*/
.libraries-test-css {
color: green;
}

View File

@@ -1,11 +0,0 @@
/**
* @file
* Test CSS file for Libraries loading.
*
* Color the 'libraries-test-css' div orange. See README.txt for more information.
*/
.libraries-test-css {
color: orange;
}

View File

@@ -1,11 +0,0 @@
/**
* @file
* Test CSS file for Libraries loading.
*
* Color the 'libraries-test-css' div blue. See README.txt for more information.
*/
.libraries-test-css {
color: blue;
}

View File

@@ -72,7 +72,8 @@ class LibrariesTestCase extends DrupalWebTestCase {
}
function setUp() {
parent::setUp('libraries', 'libraries_test');
parent::setUp('libraries', 'libraries_test_module');
theme_enable(array('libraries_test_theme'));
}
/**
@@ -131,6 +132,7 @@ class LibrariesTestCase extends DrupalWebTestCase {
// FALSE for missing or incompatible dependencies.
$library['installed'] = TRUE;
libraries_detect_dependencies($library);
$this->verbose('Library:<pre>' . var_export($library, TRUE) . '</pre>');
$this->assertTrue($library['installed'], "libraries_detect_dependencies() detects compatible version string: '$version_string' is compatible with '$version'");
}
foreach ($incompatible as $version_string) {
@@ -138,6 +140,7 @@ class LibrariesTestCase extends DrupalWebTestCase {
$library['installed'] = TRUE;
unset($library['error'], $library['error message']);
libraries_detect_dependencies($library);
$this->verbose('Library:<pre>' . var_export($library, TRUE) . '</pre>');
$this->assertEqual($library['error'], 'incompatible dependency', "libraries_detect_dependencies() detects incompatible version strings: '$version_string' is incompatible with '$version'");
}
// Instead of repeating this assertion for each version string, we just
@@ -157,7 +160,7 @@ class LibrariesTestCase extends DrupalWebTestCase {
*/
function testLibrariesScanInfoFiles() {
$expected = array('example_info_file' => (object) array(
'uri' => drupal_get_path('module', 'libraries') . '/tests/example/example_info_file.libraries.info',
'uri' => drupal_get_path('module', 'libraries') . '/tests/libraries/example_info_file.libraries.info',
'filename' => 'example_info_file.libraries.info',
'name' => 'example_info_file.libraries',
));
@@ -169,17 +172,33 @@ class LibrariesTestCase extends DrupalWebTestCase {
* Tests libraries_info().
*/
function testLibrariesInfo() {
// Test that modules can provide and alter library information.
$info = libraries_info();
$this->assertTrue(isset($info['example_module']));
$this->verbose('Library:<pre>' . var_export($info['example_module'], TRUE) . '</pre>');
$this->assertEqual($info['example_module']['info type'], 'module');
$this->assertEqual($info['example_module']['module'], 'libraries_test_module');
$this->assertTrue($info['example_module']['module_altered']);
// Test that themes can provide and alter library information.
$this->assertTrue(isset($info['example_theme']));
$this->verbose('Library:<pre>' . var_export($info['example_theme'], TRUE) . '</pre>');
$this->assertEqual($info['example_theme']['info type'], 'theme');
$this->assertEqual($info['example_theme']['theme'], 'libraries_test_theme');
$this->assertTrue($info['example_theme']['theme_altered']);
// Test that library information is found correctly.
$expected = array(
'name' => 'Example files',
'library path' => drupal_get_path('module', 'libraries') . '/tests/example',
'library path' => drupal_get_path('module', 'libraries') . '/tests/libraries/example',
'version' => '1',
'files' => array(
'js' => array('example_1.js' => array()),
'css' => array('example_1.css' => array()),
'php' => array('example_1.php' => array()),
),
'module' => 'libraries_test',
'info type' => 'module',
'module' => 'libraries_test_module',
);
libraries_info_defaults($expected, 'example_files');
$library = libraries_info('example_files');
@@ -190,7 +209,8 @@ class LibrariesTestCase extends DrupalWebTestCase {
// Test a library specified with an .info file gets detected.
$expected = array(
'name' => 'Example info file',
'info file' => drupal_get_path('module', 'libraries_test') . '/example/example_info_file.libraries.info',
'info type' => 'info file',
'info file' => drupal_get_path('module', 'libraries') . '/tests/libraries/example_info_file.libraries.info',
);
libraries_info_defaults($expected, 'example_info_file');
$library = libraries_info('example_info_file');
@@ -303,6 +323,12 @@ class LibrariesTestCase extends DrupalWebTestCase {
$loaded = &drupal_static('libraries_load');
$this->verbose('<pre>' . var_export($loaded, TRUE) . '</pre>');
$this->assertEqual($loaded['example_dependency']['loaded'], 1, 'Dependency library is also loaded');
// Test that PHP files that have a local $path variable do not break library
// loading.
// @see _libraries_require_once()
$library = libraries_load('example_path_variable_override');
$this->assertEqual($library['loaded'], 2, 'PHP files cannot break library loading.');
}
/**
@@ -311,7 +337,7 @@ class LibrariesTestCase extends DrupalWebTestCase {
function testCallbacks() {
$expected = array(
'name' => 'Example callback',
'library path' => drupal_get_path('module', 'libraries') . '/tests/example',
'library path' => drupal_get_path('module', 'libraries') . '/tests/libraries/example',
'version' => '1',
'versions' => array(
'1' => array(
@@ -344,12 +370,12 @@ class LibrariesTestCase extends DrupalWebTestCase {
),
),
'callbacks' => array(
'info' => array('_libraries_test_info_callback'),
'pre-detect' => array('_libraries_test_pre_detect_callback'),
'post-detect' => array('_libraries_test_post_detect_callback'),
'pre-dependencies-load' => array('_libraries_test_pre_dependencies_load_callback'),
'pre-load' => array('_libraries_test_pre_load_callback'),
'post-load' => array('_libraries_test_post_load_callback'),
'info' => array('_libraries_test_module_info_callback'),
'pre-detect' => array('_libraries_test_module_pre_detect_callback'),
'post-detect' => array('_libraries_test_module_post_detect_callback'),
'pre-dependencies-load' => array('_libraries_test_module_pre_dependencies_load_callback'),
'pre-load' => array('_libraries_test_module_pre_load_callback'),
'post-load' => array('_libraries_test_module_post_load_callback'),
),
'info callback' => 'not applied',
'pre-detect callback' => 'not applied',
@@ -357,7 +383,8 @@ class LibrariesTestCase extends DrupalWebTestCase {
'pre-dependencies-load callback' => 'not applied',
'pre-load callback' => 'not applied',
'post-load callback' => 'not applied',
'module' => 'libraries_test',
'info type' => 'module',
'module' => 'libraries_test_module',
);
libraries_info_defaults($expected, 'example_callback');
@@ -424,37 +451,46 @@ class LibrariesTestCase extends DrupalWebTestCase {
* We check for JavaScript and CSS files directly in the DOM and add a list of
* included PHP files manually to the page output.
*
* @see _libraries_test_load()
* @see _libraries_test_module_load()
*/
function testLibrariesOutput() {
// Test loading of a simple library with a top-level files property.
$this->drupalGet('libraries_test/files');
$this->drupalGet('libraries-test-module/files');
$this->assertLibraryFiles('example_1', 'File loading');
// Test loading of integration files.
$this->drupalGet('libraries_test/integration_files');
$this->assertRaw('libraries_test.js', 'Integration file loading: libraries_test.js found');
$this->assertRaw('libraries_test.css', 'Integration file loading: libraries_test.css found');
$this->assertRaw('libraries_test.inc', 'Integration file loading: libraries_test.inc found');
$this->drupalGet('libraries-test-module/module-integration-files');
$this->assertRaw('libraries_test_module.js', 'Integration file loading: libraries_test_module.js found');
$this->assertRaw('libraries_test_module.css', 'Integration file loading: libraries_test_module.css found');
$this->assertRaw('libraries_test_module.inc', 'Integration file loading: libraries_test_module.inc found');
$this->drupalGet('libraries-test-module/theme-integration-files');
$this->assertRaw('libraries_test_theme.js', 'Integration file loading: libraries_test_theme.js found');
$this->assertRaw('libraries_test_theme.css', 'Integration file loading: libraries_test_theme.css found');
$this->assertRaw('libraries_test_theme.inc', 'Integration file loading: libraries_test_theme.inc found');
// Test loading of post-load integration files.
$this->drupalGet('libraries-test-module/module-integration-files-post-load');
// If the files were not loaded correctly, a fatal error occurs.
$this->assertResponse(200, 'Post-load integration files are loaded correctly.');
// Test version overloading.
$this->drupalGet('libraries_test/versions');
$this->drupalGet('libraries-test-module/versions');
$this->assertLibraryFiles('example_2', 'Version overloading');
// Test variant loading.
$this->drupalGet('libraries_test/variant');
$this->drupalGet('libraries-test-module/variant');
$this->assertLibraryFiles('example_3', 'Variant loading');
// Test version overloading and variant loading.
$this->drupalGet('libraries_test/versions_and_variants');
$this->drupalGet('libraries-test-module/versions-and-variants');
$this->assertLibraryFiles('example_4', 'Concurrent version and variant overloading');
// Test caching.
variable_set('libraries_test_cache', TRUE);
variable_set('libraries_test_module_cache', TRUE);
cache_clear_all('example_callback', 'cache_libraries');
// When the library information is not cached, all callback groups should be
// invoked.
$this->drupalGet('libraries_test/cache');
$this->drupalGet('libraries-test-module/cache');
$this->assertRaw('The <em>info</em> callback group was invoked.', 'Info callback invoked for uncached libraries.');
$this->assertRaw('The <em>pre-detect</em> callback group was invoked.', 'Pre-detect callback invoked for uncached libraries.');
$this->assertRaw('The <em>post-detect</em> callback group was invoked.', 'Post-detect callback invoked for uncached libraries.');
@@ -462,13 +498,13 @@ class LibrariesTestCase extends DrupalWebTestCase {
$this->assertRaw('The <em>post-load</em> callback group was invoked.', 'Post-load callback invoked for uncached libraries.');
// When the library information is cached only the 'pre-load' and
// 'post-load' callback groups should be invoked.
$this->drupalGet('libraries_test/cache');
$this->drupalGet('libraries-test-module/cache');
$this->assertNoRaw('The <em>info</em> callback group was not invoked.', 'Info callback not invoked for cached libraries.');
$this->assertNoRaw('The <em>pre-detect</em> callback group was not invoked.', 'Pre-detect callback not invoked for cached libraries.');
$this->assertNoRaw('The <em>post-detect</em> callback group was not invoked.', 'Post-detect callback not invoked for cached libraries.');
$this->assertRaw('The <em>pre-load</em> callback group was invoked.', 'Pre-load callback invoked for cached libraries.');
$this->assertRaw('The <em>post-load</em> callback group was invoked.', 'Post-load callback invoked for cached libraries.');
variable_set('libraries_test_cache', FALSE);
variable_set('libraries_test_module_cache', FALSE);
}
/**
@@ -516,7 +552,7 @@ class LibrariesTestCase extends DrupalWebTestCase {
foreach ($names as $name => $expected) {
foreach ($extensions as $extension) {
$filepath = drupal_get_path('module', 'libraries_test') . "/example/$name.$extension";
$filepath = drupal_get_path('module', 'libraries') . "/tests/libraries/example/$name.$extension";
// JavaScript and CSS files appear as full URLs and with an appended
// query string.
if (in_array($extension, array('js', 'css'))) {

View File

@@ -14,11 +14,11 @@ CSS and PHP files.
place the following text on the page:
"If this text shows up, no JavaScript test file was loaded."
This text is replaced via JavaScript by a text of the form:
"If this text shows up, [[file] was loaded successfully."
"If this text shows up, [file] was loaded successfully."
[file] is either 'example_1.js', 'example_2.js', 'example_3.js',
'example_4.js' or 'libraries_test.js'. If you have SimpleTest's verbose mode
enabled and see the above text in one of the debug pages, the noted JavaScript
file was loaded successfully.
'example_4.js' or 'libraries_test_module.js'. If you have SimpleTest's verbose
mode enabled and see the above text in one of the debug pages, the noted
JavaScript file was loaded successfully.
- CSS: The filenames of the CSS files are asserted to be in the raw HTML via
SimpleTest. Since the filename could appear, for instance, in an error
message, this is not very robust. Explicit testing of CSS, though, is not yet
@@ -29,7 +29,7 @@ CSS and PHP files.
- example_2: green
- example_3: orange
- example_4: blue
- libraries_test: purple"
- libraries_test_module: purple"
If you have SimpleTest's verbose mode enabled, and see the above text in a
certain color (i.e. not in black), a CSS file was loaded successfully. Which
file depends on the color as referenced in the text above.
@@ -37,6 +37,7 @@ CSS and PHP files.
PHP files and then checking whether this function was defined using
function_exists(). This can be checked programatically with SimpleTest.
The loading of integration files is tested with the same method. The integration
files are libraries_test.js, libraries_test.css, libraries_test.inc and are
located in the tests directory alongside libraries_test.module (i.e. they are
not in the same directory as this file).
files are libraries_test_module.js, libraries_test_module.css,
libraries_test_module.inc and are located in the test module's directory
alongside libraries_test_module.info (i.e. they are not in the same directory as
this file).

View File

@@ -0,0 +1,12 @@
/**
* @file
* Test CSS file for Libraries loading.
*
* Color the 'libraries-test-module-css' div red. See README.txt for more
* information.
*/
.libraries-test-module-css {
color: red;
}

View File

@@ -3,7 +3,7 @@
* @file
* Test JavaScript file for Libraries loading.
*
* Replace the text in the 'libraries-test-javascript' div. See README.txt for
* Replace the text in the 'libraries-test-module-js' div. See README.txt for
* more information.
*/
@@ -11,7 +11,7 @@
Drupal.behaviors.librariesTest = {
attach: function(context, settings) {
$('.libraries-test-javascript').text('If this text shows up, example_1.js was loaded successfully.')
$('.libraries-test-module-js').text('If this text shows up, example_1.js was loaded successfully.')
}
};

View File

@@ -0,0 +1,15 @@
<?php
/**
* @file
* Test PHP file for Libraries loading.
*/
// @see _libraries_require_once()
$path = 'abc';
/**
* Dummy function to see if this file was loaded.
*/
function _libraries_test_module_example_1() {
}

View File

@@ -0,0 +1,12 @@
/**
* @file
* Test CSS file for Libraries loading.
*
* Color the 'libraries-test-module-css' div green. See README.txt for more
* information.
*/
.libraries-test-module-css {
color: green;
}

View File

@@ -3,7 +3,7 @@
* @file
* Test JavaScript file for Libraries loading.
*
* Replace the text in the 'libraries-test-javascript' div. See README.txt for
* Replace the text in the 'libraries-test-module-js' div. See README.txt for
* more information.
*/
@@ -11,7 +11,7 @@
Drupal.behaviors.librariesTest = {
attach: function(context, settings) {
$('.libraries-test-javascript').text('If this text shows up, example_2.js was loaded successfully.')
$('.libraries-test-module-js').text('If this text shows up, example_2.js was loaded successfully.')
}
};

View File

@@ -0,0 +1,15 @@
<?php
/**
* @file
* Test PHP file for Libraries loading.
*/
// @see _libraries_require_once()
$path = 'abc';
/**
* Dummy function to see if this file was loaded.
*/
function _libraries_test_module_example_2() {
}

View File

@@ -0,0 +1,12 @@
/**
* @file
* Test CSS file for Libraries loading.
*
* Color the 'libraries-test-module-css' div orange. See README.txt for more
* information.
*/
.libraries-test-module-css {
color: orange;
}

View File

@@ -3,7 +3,7 @@
* @file
* Test JavaScript file for Libraries loading.
*
* Replace the text in the 'libraries-test-javascript' div. See README.txt for
* Replace the text in the 'libraries-test-module-js' div. See README.txt for
* more information.
*/
@@ -11,7 +11,7 @@
Drupal.behaviors.librariesTest = {
attach: function(context, settings) {
$('.libraries-test-javascript').text('If this text shows up, example_3.js was loaded successfully.')
$('.libraries-test-module-js').text('If this text shows up, example_3.js was loaded successfully.')
}
};

View File

@@ -8,5 +8,5 @@
/**
* Dummy function to see if this file was loaded.
*/
function _libraries_test_example_3() {
function _libraries_test_module_example_3() {
}

View File

@@ -0,0 +1,12 @@
/**
* @file
* Test CSS file for Libraries loading.
*
* Color the 'libraries-test-module-css' div blue. See README.txt for more
* information.
*/
.libraries-test-module-css {
color: blue;
}

View File

@@ -3,7 +3,7 @@
* @file
* Test JavaScript file for Libraries loading.
*
* Replace the text in the 'libraries-test-javascript' div. See README.txt for
* Replace the text in the 'libraries-test-module-js' div. See README.txt for
* more information.
*/
@@ -11,7 +11,7 @@
Drupal.behaviors.librariesTest = {
attach: function(context, settings) {
$('.libraries-test-javascript').text('If this text shows up, example_4.js was loaded successfully.')
$('.libraries-test-module-js').text('If this text shows up, example_4.js was loaded successfully.')
}
};

View File

@@ -8,5 +8,5 @@
/**
* Dummy function to see if this file was loaded.
*/
function _libraries_test_example_4() {
function _libraries_test_module_example_4() {
}

View File

@@ -1,11 +1,10 @@
; This is an example info file of a library used for testing purposes.
name = Example info file
; Information added by drupal.org packaging script on 2013-03-09
version = "7.x-2.1"
; Information added by Drupal.org packaging script on 2014-02-09
version = "7.x-2.2"
core = "7.x"
project = "libraries"
datestamp = "1362848412"
datestamp = "1391965716"

View File

@@ -1,12 +0,0 @@
/**
* @file
* Test CSS file for Libraries loading.
*
* Color the 'libraries-test-css' div purple. See README.txt for more
* information.
*/
.libraries-test-css {
color: purple;
}

View File

@@ -1,11 +0,0 @@
<?php
/**
* @file
* Test PHP file for Libraries loading.
/**
* Dummy function to see if this file was loaded.
*/
function _libraries_test_integration_file() {
}

View File

@@ -1,18 +0,0 @@
/**
* @file
* Test JavaScript file for Libraries loading.
*
* Replace the text in the 'libraries-test-javascript' div. See README.txt for
* more information.
*/
(function ($) {
Drupal.behaviors.librariesTest = {
attach: function(context, settings) {
$('.libraries-test-javascript').text('If this text shows up, libraries_test.js was loaded successfully.')
}
};
})(jQuery);

View File

@@ -0,0 +1,12 @@
/**
* @file
* Test CSS file for Libraries loading.
*
* Color the 'libraries-test-module-css' div purple. See README.txt for more
* information.
*/
.libraries-test-module-css {
color: purple;
}

View File

@@ -3,10 +3,9 @@
/**
* @file
* Test PHP file for Libraries loading.
*/
/**
* Dummy function to see if this file was loaded.
*/
function _libraries_test_example_1() {
function _libraries_test_module_integration_file() {
}

View File

@@ -1,12 +1,13 @@
name = Libraries test module
description = Tests library detection and loading.
core = 7.x
package = Testing
dependencies[] = libraries
hidden = TRUE
; Information added by drupal.org packaging script on 2013-03-09
version = "7.x-2.1"
; Information added by Drupal.org packaging script on 2014-02-09
version = "7.x-2.2"
core = "7.x"
project = "libraries"
datestamp = "1362848412"
datestamp = "1391965716"

View File

@@ -0,0 +1,18 @@
/**
* @file
* Test JavaScript file for Libraries loading.
*
* Replace the text in the 'libraries-test-module-js' div. See README.txt for
* more information.
*/
(function ($) {
Drupal.behaviors.librariesTest = {
attach: function(context, settings) {
$('.libraries-test-module-js').text('If this text shows up, libraries_test_module.js was loaded successfully.')
}
};
})(jQuery);

View File

@@ -8,32 +8,37 @@
/**
* Implements hook_libraries_info().
*/
function libraries_test_libraries_info() {
function libraries_test_module_libraries_info() {
// Test library information gathering.
$libraries['example_module'] = array(
'name' => 'Example module',
'module_altered' => FALSE,
);
// Test library detection.
$libraries['example_missing'] = array(
'name' => 'Example missing',
'library path' => drupal_get_path('module', 'libraries') . '/tests/missing',
'library path' => drupal_get_path('module', 'libraries') . '/tests/libraries/missing',
);
$libraries['example_undetected_version'] = array(
'name' => 'Example undetected version',
'library path' => drupal_get_path('module', 'libraries') . '/tests',
'version callback' => '_libraries_test_return_version',
'library path' => drupal_get_path('module', 'libraries') . '/tests/libraries/example',
'version callback' => '_libraries_test_module_return_version',
'version arguments' => array(FALSE),
);
$libraries['example_unsupported_version'] = array(
'name' => 'Example unsupported version',
'library path' => drupal_get_path('module', 'libraries') . '/tests',
'version callback' => '_libraries_test_return_version',
'library path' => drupal_get_path('module', 'libraries') . '/tests/libraries/example',
'version callback' => '_libraries_test_module_return_version',
'version arguments' => array('1'),
'versions' => array(
'2' => array(),
),
);
$libraries['example_supported_version'] = array(
'name' => 'Example supported version',
'library path' => drupal_get_path('module', 'libraries') . '/tests',
'version callback' => '_libraries_test_return_version',
'library path' => drupal_get_path('module', 'libraries') . '/tests/libraries/example',
'version callback' => '_libraries_test_module_return_version',
'version arguments' => array('1'),
'versions' => array(
'1' => array(),
@@ -43,7 +48,7 @@ function libraries_test_libraries_info() {
// Test the default version callback.
$libraries['example_default_version_callback'] = array(
'name' => 'Example default version callback',
'library path' => drupal_get_path('module', 'libraries') . '/tests/example',
'library path' => drupal_get_path('module', 'libraries') . '/tests/libraries/example',
'version arguments' => array(
'file' => 'README.txt',
// Version 1
@@ -55,16 +60,16 @@ function libraries_test_libraries_info() {
// Test a multiple-parameter version callback.
$libraries['example_multiple_parameter_version_callback'] = array(
'name' => 'Example multiple parameter version callback',
'library path' => drupal_get_path('module', 'libraries') . '/tests/example',
'library path' => drupal_get_path('module', 'libraries') . '/tests/libraries/example',
// Version 1
'version callback' => '_libraries_test_get_version',
'version callback' => '_libraries_test_module_get_version',
'version arguments' => array('README.txt', '/Version (\d+)/', 5),
);
// Test a top-level files property.
$libraries['example_files'] = array(
'name' => 'Example files',
'library path' => drupal_get_path('module', 'libraries') . '/tests/example',
'library path' => drupal_get_path('module', 'libraries') . '/tests/libraries/example',
'version' => '1',
'files' => array(
'js' => array('example_1.js'),
@@ -76,23 +81,41 @@ function libraries_test_libraries_info() {
// Test loading of integration files.
// Normally added by the corresponding module via hook_libraries_info_alter(),
// these files should be automatically loaded when the library is loaded.
$libraries['example_integration_files'] = array(
'name' => 'Example integration files',
'library path' => drupal_get_path('module', 'libraries') . '/tests/example',
$libraries['example_module_integration_files'] = array(
'name' => 'Example module integration files',
'library path' => drupal_get_path('module', 'libraries') . '/tests/libraries/example',
'version' => '1',
'integration files' => array(
'libraries_test' => array(
'js' => array('libraries_test.js'),
'css' => array('libraries_test.css'),
'php' => array('libraries_test.inc'),
'libraries_test_module' => array(
'js' => array('libraries_test_module.js'),
'css' => array('libraries_test_module.css'),
'php' => array('libraries_test_module.inc'),
),
),
);
// Test loading of integration files after library files.
// We test the correct loading order by calling a function that is defined in
// example_1.php in libraries_test_module_post_load.inc.
$libraries['example_module_integration_files_post_load'] = array(
'name' => 'Example module post-load integration files',
'library path' => drupal_get_path('module', 'libraries') . '/tests/libraries/example',
'version' => '1',
'files' => array(
'php' => array('example_1.php'),
),
'integration files' => array(
'libraries_test_module' => array(
'php' => array('libraries_test_module_post_load.inc'),
),
),
'post-load integration files' => TRUE,
);
// Test version overloading.
$libraries['example_versions'] = array(
'name' => 'Example versions',
'library path' => drupal_get_path('module', 'libraries') . '/tests/example',
'library path' => drupal_get_path('module', 'libraries') . '/tests/libraries/example',
'version' => '2',
'versions' => array(
'1' => array(
@@ -115,7 +138,7 @@ function libraries_test_libraries_info() {
// Test variant detection.
$libraries['example_variant_missing'] = array(
'name' => 'Example variant missing',
'library path' => drupal_get_path('module', 'libraries') . '/tests/example',
'library path' => drupal_get_path('module', 'libraries') . '/tests/libraries/example',
'version' => '1',
'variants' => array(
'example_variant' => array(
@@ -124,7 +147,7 @@ function libraries_test_libraries_info() {
'css' => array('example_3.css'),
'php' => array('example_3.php'),
),
'variant callback' => '_libraries_test_return_installed',
'variant callback' => '_libraries_test_module_return_installed',
'variant arguments' => array(FALSE),
),
),
@@ -132,7 +155,7 @@ function libraries_test_libraries_info() {
$libraries['example_variant'] = array(
'name' => 'Example variant',
'library path' => drupal_get_path('module', 'libraries') . '/tests/example',
'library path' => drupal_get_path('module', 'libraries') . '/tests/libraries/example',
'version' => '1',
'variants' => array(
'example_variant' => array(
@@ -141,7 +164,7 @@ function libraries_test_libraries_info() {
'css' => array('example_3.css'),
'php' => array('example_3.php'),
),
'variant callback' => '_libraries_test_return_installed',
'variant callback' => '_libraries_test_module_return_installed',
'variant arguments' => array(TRUE),
),
),
@@ -150,7 +173,7 @@ function libraries_test_libraries_info() {
// Test correct behaviour with multiple versions and multiple variants.
$libraries['example_versions_and_variants'] = array(
'name' => 'Example versions and variants',
'library path' => drupal_get_path('module', 'libraries') . '/tests/example',
'library path' => drupal_get_path('module', 'libraries') . '/tests/libraries/example',
'version' => '2',
'versions' => array(
'1' => array(
@@ -161,7 +184,7 @@ function libraries_test_libraries_info() {
'css' => array('example_1.css'),
'php' => array('example_1.php'),
),
'variant callback' => '_libraries_test_return_installed',
'variant callback' => '_libraries_test_module_return_installed',
'variant arguments' => array(TRUE),
),
'example_variant_2' => array(
@@ -170,7 +193,7 @@ function libraries_test_libraries_info() {
'css' => array('example_2.css'),
'php' => array('example_2.php'),
),
'variant callback' => '_libraries_test_return_installed',
'variant callback' => '_libraries_test_module_return_installed',
'variant arguments' => array(TRUE),
),
),
@@ -183,7 +206,7 @@ function libraries_test_libraries_info() {
'css' => array('example_3.css'),
'php' => array('example_3.php'),
),
'variant callback' => '_libraries_test_return_installed',
'variant callback' => '_libraries_test_module_return_installed',
'variant arguments' => array(TRUE),
),
'example_variant_2' => array(
@@ -192,7 +215,7 @@ function libraries_test_libraries_info() {
'css' => array('example_4.css'),
'php' => array('example_4.php'),
),
'variant callback' => '_libraries_test_return_installed',
'variant callback' => '_libraries_test_module_return_installed',
'variant arguments' => array(TRUE),
),
),
@@ -206,27 +229,27 @@ function libraries_test_libraries_info() {
// This library acts as a dependency for the libraries below.
$libraries['example_dependency'] = array(
'name' => 'Example dependency',
'library path' => drupal_get_path('module', 'libraries') . '/tests/example',
'library path' => drupal_get_path('module', 'libraries') . '/tests/libraries/example',
'version' => '1.1',
'files' => array('js' => array('example_1.js')),
);
$libraries['example_dependency_missing'] = array(
'name' => 'Example dependency missing',
'library path' => drupal_get_path('module', 'libraries') . '/tests/example',
'library path' => drupal_get_path('module', 'libraries') . '/tests/libraries/example',
'version' => '1',
'dependencies' => array('example_missing'),
'files' => array('js' => array('example_1.js')),
);
$libraries['example_dependency_incompatible'] = array(
'name' => 'Example dependency incompatible',
'library path' => drupal_get_path('module', 'libraries') . '/tests/example',
'library path' => drupal_get_path('module', 'libraries') . '/tests/libraries/example',
'version' => '1',
'dependencies' => array('example_dependency (>1.1)'),
'files' => array('js' => array('example_1.js')),
);
$libraries['example_dependency_compatible'] = array(
'name' => 'Example dependency compatible',
'library path' => drupal_get_path('module', 'libraries') . '/tests/example',
'library path' => drupal_get_path('module', 'libraries') . '/tests/libraries/example',
'version' => '1',
'dependencies' => array('example_dependency (>=1.1)'),
'files' => array('js' => array('example_1.js')),
@@ -235,7 +258,7 @@ function libraries_test_libraries_info() {
// Test the applying of callbacks.
$libraries['example_callback'] = array(
'name' => 'Example callback',
'library path' => drupal_get_path('module', 'libraries') . '/tests/example',
'library path' => drupal_get_path('module', 'libraries') . '/tests/libraries/example',
'version' => '1',
'versions' => array(
'1' => array(
@@ -271,12 +294,12 @@ function libraries_test_libraries_info() {
),
),
'callbacks' => array(
'info' => array('_libraries_test_info_callback'),
'pre-detect' => array('_libraries_test_pre_detect_callback'),
'post-detect' => array('_libraries_test_post_detect_callback'),
'pre-dependencies-load' => array('_libraries_test_pre_dependencies_load_callback'),
'pre-load' => array('_libraries_test_pre_load_callback'),
'post-load' => array('_libraries_test_post_load_callback'),
'info' => array('_libraries_test_module_info_callback'),
'pre-detect' => array('_libraries_test_module_pre_detect_callback'),
'post-detect' => array('_libraries_test_module_post_detect_callback'),
'pre-dependencies-load' => array('_libraries_test_module_pre_dependencies_load_callback'),
'pre-load' => array('_libraries_test_module_pre_load_callback'),
'post-load' => array('_libraries_test_module_post_load_callback'),
),
// These keys are for testing purposes only.
'info callback' => 'not applied',
@@ -287,24 +310,40 @@ function libraries_test_libraries_info() {
'post-load callback' => 'not applied',
);
$libraries['example_path_variable_override'] = array(
'name' => 'Example path variable override',
'library path' => drupal_get_path('module', 'libraries') . '/tests/libraries/example',
'version' => '1',
'files' => array(
'php' => array('example_1.php', 'example_2.php'),
),
);
return $libraries;
}
/**
* Implements hook_libraries_info_alter().
*/
function libraries_test_module_libraries_info_alter(&$libraries) {
$libraries['example_module']['module_altered'] = TRUE;
}
/**
* Implements hook_libraries_info_file_paths()
*/
function libraries_test_libraries_info_file_paths() {
return array(drupal_get_path('module', 'libraries_test') . '/example');
function libraries_test_module_libraries_info_file_paths() {
return array(drupal_get_path('module', 'libraries') . '/tests/libraries');
}
/**
* Gets the version of an example library.
*
* Returns exactly the version string entered as the $version parameter. This
* function cannot be collapsed with _libraries_test_return_installed(), because
* of the different arguments that are passed automatically.
* function cannot be collapsed with _libraries_test_module_return_installed(),
* because of the different arguments that are passed automatically.
*/
function _libraries_test_return_version($library, $version) {
function _libraries_test_module_return_version($library, $version) {
return $version;
}
@@ -340,7 +379,7 @@ function _libraries_test_return_version($library, $version) {
*
* @see libraries_get_version()
*/
function _libraries_test_get_version($library, $file, $pattern, $lines = 20, $cols = 200) {
function _libraries_test_module_get_version($library, $file, $pattern, $lines = 20, $cols = 200) {
$file = DRUPAL_ROOT . '/' . $library['library path'] . '/' . $file;
if (!file_exists($file)) {
@@ -361,10 +400,10 @@ function _libraries_test_get_version($library, $file, $pattern, $lines = 20, $co
* Detects the variant of an example library.
*
* Returns exactly the value of $installed, either TRUE or FALSE. This function
* cannot be collapsed with _libraries_test_return_version(), because of the
* different arguments that are passed automatically.
* cannot be collapsed with _libraries_test_module_return_version(), because of
* the different arguments that are passed automatically.
*/
function _libraries_test_return_installed($library, $name, $installed) {
function _libraries_test_module_return_installed($library, $name, $installed) {
return $installed;
}
@@ -373,10 +412,10 @@ function _libraries_test_return_installed($library, $name, $installed) {
*
* This function is used as a test callback for the 'info' callback group.
*
* @see _libraries_test_callback()
* @see _libraries_test_module_callback()
*/
function _libraries_test_info_callback(&$library, $version, $variant) {
_libraries_test_callback($library, $version, $variant, 'info');
function _libraries_test_module_info_callback(&$library, $version, $variant) {
_libraries_test_module_callback($library, $version, $variant, 'info');
}
/**
@@ -384,10 +423,10 @@ function _libraries_test_info_callback(&$library, $version, $variant) {
*
* This function is used as a test callback for the 'pre-detect' callback group.
*
* @see _libraries_test_callback()
* @see _libraries_test_module_callback()
*/
function _libraries_test_pre_detect_callback(&$library, $version, $variant) {
_libraries_test_callback($library, $version, $variant, 'pre-detect');
function _libraries_test_module_pre_detect_callback(&$library, $version, $variant) {
_libraries_test_module_callback($library, $version, $variant, 'pre-detect');
}
/**
@@ -395,10 +434,10 @@ function _libraries_test_pre_detect_callback(&$library, $version, $variant) {
*
* This function is used as a test callback for the 'post-detect callback group.
*
* @see _libraries_test_callback()
* @see _libraries_test_module_callback()
*/
function _libraries_test_post_detect_callback(&$library, $version, $variant) {
_libraries_test_callback($library, $version, $variant, 'post-detect');
function _libraries_test_module_post_detect_callback(&$library, $version, $variant) {
_libraries_test_module_callback($library, $version, $variant, 'post-detect');
}
/**
@@ -407,10 +446,10 @@ function _libraries_test_post_detect_callback(&$library, $version, $variant) {
* This function is used as a test callback for the 'pre-dependencies-load'
* callback group.
*
* @see _libraries_test_callback()
* @see _libraries_test_module_callback()
*/
function _libraries_test_pre_dependencies_load_callback(&$library, $version, $variant) {
_libraries_test_callback($library, $version, $variant, 'pre-dependencies-load');
function _libraries_test_module_pre_dependencies_load_callback(&$library, $version, $variant) {
_libraries_test_module_callback($library, $version, $variant, 'pre-dependencies-load');
}
/**
@@ -418,10 +457,10 @@ function _libraries_test_pre_dependencies_load_callback(&$library, $version, $va
*
* This function is used as a test callback for the 'pre-load' callback group.
*
* @see _libraries_test_callback()
* @see _libraries_test_module_callback()
*/
function _libraries_test_pre_load_callback(&$library, $version, $variant) {
_libraries_test_callback($library, $version, $variant, 'pre-load');
function _libraries_test_module_pre_load_callback(&$library, $version, $variant) {
_libraries_test_module_callback($library, $version, $variant, 'pre-load');
}
/**
@@ -429,10 +468,10 @@ function _libraries_test_pre_load_callback(&$library, $version, $variant) {
*
* This function is used as a test callback for the 'post-load' callback group.
*
* @see _libraries_test_callback()
* @see _libraries_test_module_callback()
*/
function _libraries_test_post_load_callback(&$library, $version, $variant) {
_libraries_test_callback($library, $version, $variant, 'post-load');
function _libraries_test_module_post_load_callback(&$library, $version, $variant) {
_libraries_test_module_callback($library, $version, $variant, 'post-load');
}
/**
@@ -456,7 +495,7 @@ function _libraries_test_post_load_callback(&$library, $version, $variant) {
* The variant the library information passed in $library belongs to, or NULL
* if the passed library information is not variant-specific.
*/
function _libraries_test_callback(&$library, $version, $variant, $group) {
function _libraries_test_module_callback(&$library, $version, $variant, $group) {
$string = 'applied';
if (isset($version) && isset($variant)) {
$string .= " (version $version, variant $variant)";
@@ -475,7 +514,7 @@ function _libraries_test_callback(&$library, $version, $variant, $group) {
// The following is used to test caching of library information.
// Only set the message for the top-level library to prevent confusing,
// duplicate messages.
if (!isset($version) && !isset($variant) && variable_get('libraries_test_cache', FALSE)) {
if (!isset($version) && !isset($variant) && variable_get('libraries_test_module_cache', FALSE)) {
drupal_set_message("The <em>$group</em> callback group was invoked.");
}
}
@@ -483,32 +522,40 @@ function _libraries_test_callback(&$library, $version, $variant, $group) {
/**
* Implements hook_menu().
*/
function libraries_test_menu() {
function libraries_test_module_menu() {
$base = array(
'page callback' => '_libraries_test_load',
'page callback' => '_libraries_test_module_load',
'access callback' => TRUE,
);
$items['libraries_test/files'] = $base + array(
$items['libraries-test-module/files'] = $base + array(
'title' => 'Test files',
'page arguments' => array('example_files'),
);
$items['libraries_test/integration_files'] = $base + array(
'title' => 'Test integration files',
'page arguments' => array('example_integration_files'),
$items['libraries-test-module/module-integration-files'] = $base + array(
'title' => 'Test module integration files',
'page arguments' => array('example_module_integration_files'),
);
$items['libraries_test/versions'] = $base + array(
$items['libraries-test-module/module-integration-files-post-load'] = $base + array(
'title' => 'Test module post-load integration files',
'page arguments' => array('example_module_integration_files_post_load'),
);
$items['libraries-test-module/theme-integration-files'] = $base + array(
'title' => 'Test theme integration files',
'page arguments' => array('example_theme_integration_files'),
);
$items['libraries-test-module/versions'] = $base + array(
'title' => 'Test version loading',
'page arguments' => array('example_versions'),
);
$items['libraries_test/variant'] = $base + array(
$items['libraries-test-module/variant'] = $base + array(
'title' => 'Test variant loading',
'page arguments' => array('example_variant', 'example_variant'),
);
$items['libraries_test/versions_and_variants'] = $base + array(
$items['libraries-test-module/versions-and-variants'] = $base + array(
'title' => 'Test concurrent version and variant loading',
'page arguments' => array('example_versions_and_variants', 'example_variant_2'),
);
$items['libraries_test/cache'] = $base + array(
$items['libraries-test-module/cache'] = $base + array(
'title' => 'Test caching of library information',
'page arguments' => array('example_callback'),
);
@@ -523,7 +570,7 @@ function libraries_test_menu() {
* JavaScript and CSS files for easier debugging. See example/README.txt for
* more information.
*/
function _libraries_test_load($library, $variant = NULL) {
function _libraries_test_module_load($library, $variant = NULL) {
libraries_load($library, $variant);
// JavaScript and CSS files can be checked directly by SimpleTest, so we only
// need to manually check for PHP files.
@@ -532,14 +579,14 @@ function _libraries_test_load($library, $variant = NULL) {
// For easer debugging of JS loading, a text is shown that the JavaScript will
// replace.
$output .= '<h2>JavaScript</h2>';
$output .= '<div class="libraries-test-javascript">';
$output .= '<div class="libraries-test-module-js">';
$output .= 'If this text shows up, no JavaScript test file was loaded.';
$output .= '</div>';
// For easier debugging of CSS loading, the loaded CSS files will color the
// following text.
$output .= '<h2>CSS</h2>';
$output .= '<div class="libraries-test-css">';
$output .= '<div class="libraries-test-module-css">';
$output .= 'If one of the CSS test files has been loaded, this text will be colored:';
$output .= '<ul>';
// Do not reference the actual CSS files (i.e. including '.css'), because that
@@ -548,17 +595,18 @@ function _libraries_test_load($library, $variant = NULL) {
$output .= '<li>example_2: green</li>';
$output .= '<li>example_3: orange</li>';
$output .= '<li>example_4: blue</li>';
$output .= '<li>libraries_test: purple</li>';
$output .= '<li>libraries_test_module: purple</li>';
$output .= '<li>libraries_test_theme: turquoise</li>';
$output .= '</ul>';
$output .= '</div>';
$output .= '<h2>PHP</h2>';
$output .= '<div class="libraries-test-php">';
$output .= '<div class="libraries-test-module-php">';
$output .= 'The following is a list of all loaded test PHP files:';
$output .= '<ul>';
$files = get_included_files();
foreach ($files as $file) {
if (strpos($file, 'libraries/test') && !strpos($file, 'libraries_test.module')) {
if (strpos($file, 'libraries/test') && !strpos($file, 'libraries_test_module.module') && !strpos($file, 'template.php')) {
$output .= '<li>' . str_replace(DRUPAL_ROOT . '/', '', $file) . '</li>';
}
}
@@ -567,3 +615,12 @@ function _libraries_test_load($library, $variant = NULL) {
return $output;
}
/**
* Implements hook_system_theme_info().
*/
function libraries_test_module_system_theme_info() {
$themes = array();
$themes['libraries_test_theme'] = drupal_get_path('module', 'libraries') . '/tests/themes/libraries_test_theme/libraries_test_theme.info';
return $themes;
}

View File

@@ -0,0 +1,15 @@
<?php
/**
* @file
* Test PHP file for Libraries loading.
/**
* Dummy function to see if this file was loaded.
*/
function _libraries_test_module_integration_file_post_load() {
}
// Call a function that is defined in the library file, to ensure that was
// loaded prior to this file.
_libraries_test_module_example_1();

View File

@@ -0,0 +1,12 @@
/**
* @file
* Test CSS file for Libraries loading.
*
* Color the 'libraries-test-module-css' div purple. See README.txt for more
* information.
*/
.libraries-test-module-css {
color: turquoise;
}

View File

@@ -3,10 +3,9 @@
/**
* @file
* Test PHP file for Libraries loading.
*/
/**
* Dummy function to see if this file was loaded.
*/
function _libraries_test_example_2() {
function _libraries_test_theme_integration_file() {
}

View File

@@ -0,0 +1,11 @@
name = Libraries test theme
description = Tests that themes can provide and alter library information.
core = 7.x
hidden = TRUE
; Information added by Drupal.org packaging script on 2014-02-09
version = "7.x-2.2"
core = "7.x"
project = "libraries"
datestamp = "1391965716"

View File

@@ -0,0 +1,18 @@
/**
* @file
* Test JavaScript file for Libraries loading.
*
* Replace the text in the 'libraries-test-module-js' div. See README.txt for
* more information.
*/
(function ($) {
Drupal.behaviors.librariesTest = {
attach: function(context, settings) {
$('.libraries-test-module-js').text('If this text shows up, libraries_test_theme.js was loaded successfully.')
}
};
})(jQuery);

View File

@@ -0,0 +1,36 @@
<?php
/**
* @file
* Libraries test theme.
*/
/**
* Implements hook_libraries_info().
*/
function libraries_test_theme_libraries_info() {
$libraries['example_theme'] = array(
'name' => 'Example theme',
'theme_altered' => FALSE,
);
$libraries['example_theme_integration_files'] = array(
'name' => 'Example theme integration file',
'library path' => drupal_get_path('module', 'libraries') . '/tests/libraries/example',
'version' => '1',
'integration files' => array(
'libraries_test_theme' => array(
'js' => array('libraries_test_theme.js'),
'css' => array('libraries_test_theme.css'),
'php' => array('libraries_test_theme.inc'),
),
),
);
return $libraries;
}
/**
* Implements hook_libraries_info_alter().
*/
function libraries_test_theme_libraries_info_alter(&$libraries) {
$libraries['example_theme']['theme_altered'] = TRUE;
}