diff options
author | David Rothstein <drothstein@gmail.com> | 2015-10-12 23:39:43 -0400 |
---|---|---|
committer | David Rothstein <drothstein@gmail.com> | 2015-10-12 23:39:43 -0400 |
commit | 3b96a7d9124037c9e6f2e43ba5dd2de89175580b (patch) | |
tree | bcbd6a7317a477ed0f1810d0871d19208cd85fd3 /modules/simpletest/simpletest.module | |
parent | 183a425c551969d4f56b04766fca82819a2a7b15 (diff) | |
download | brdo-3b96a7d9124037c9e6f2e43ba5dd2de89175580b.tar.gz brdo-3b96a7d9124037c9e6f2e43ba5dd2de89175580b.tar.bz2 |
Issue #2512210 by trgreen17, naveenvalecha, David_Rothstein, jhodgdon, liberatr: SimpleTest - WebTestBase method creates binary-text files when the intention was to create text files, and text file creation is broken
Diffstat (limited to 'modules/simpletest/simpletest.module')
-rw-r--r-- | modules/simpletest/simpletest.module | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/modules/simpletest/simpletest.module b/modules/simpletest/simpletest.module index 91f0f9065..a98e5cfbe 100644 --- a/modules/simpletest/simpletest.module +++ b/modules/simpletest/simpletest.module @@ -509,25 +509,25 @@ function simpletest_registry_files_alter(&$files, $modules) { * Generate test file. */ function simpletest_generate_file($filename, $width, $lines, $type = 'binary-text') { - $size = $width * $lines - $lines; - - // Generate random text $text = ''; - for ($i = 0; $i < $size; $i++) { - switch ($type) { - case 'text': - $text .= chr(rand(32, 126)); - break; - case 'binary': - $text .= chr(rand(0, 31)); - break; - case 'binary-text': - default: - $text .= rand(0, 1); - break; + for ($i = 0; $i < $lines; $i++) { + // Generate $width - 1 characters to leave space for the "\n" character. + for ($j = 0; $j < $width - 1; $j++) { + switch ($type) { + case 'text': + $text .= chr(rand(32, 126)); + break; + case 'binary': + $text .= chr(rand(0, 31)); + break; + case 'binary-text': + default: + $text .= rand(0, 1); + break; + } } + $text .= "\n"; } - $text = wordwrap($text, $width - 1, "\n", TRUE) . "\n"; // Add \n for symmetrical file. // Create filename. file_put_contents('public://' . $filename . '.txt', $text); |