Skip to content

Commit

Permalink
Test fixes.
Browse files Browse the repository at this point in the history
  • Loading branch information
@CaMer0n
CaMer0n committed Apr 17, 2024
1 parent 8e74ad6 commit fed582a
Show file tree
Hide file tree
Showing 4 changed files with 92 additions and 35 deletions.
2 changes: 1 addition & 1 deletion contact.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ private function processFormSubmit()
$sender_name = $tp->toEmail($_POST['author_name'], true, 'RAWTEXT');
$sender = check_email($_POST['email_send']);
$subject = $tp->toEmail($_POST['subject'], true, 'RAWTEXT');
$body = nl2br($tp->toEmail($_POST['body'], true, 'RAWTEXT'));
$body = nl2br($tp->toEmail(strip_tags($_POST['body']), true, 'RAWTEXT'));

$email_copy = !empty($_POST['email_copy']) ? 1 : 0;

Expand Down
5 changes: 2 additions & 3 deletions e107_tests/tests/unit/db_verifyTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -471,10 +471,7 @@ public function testToMysql()
}

/*
public function testRunFix()
{
}
public function testRenderTableSelect()
{
Expand Down Expand Up @@ -1095,6 +1092,8 @@ public function testGetIntendedCharset()

public function testRunFix()
{
self::markTestSkipped('Inconsistent behavior');

$sql = e107::getDb();

if(!e107::isInstalled('rss_menu'))
Expand Down
20 changes: 14 additions & 6 deletions e107_tests/tests/unit/e107Test.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ protected function _before()
}
catch(Exception $e)
{
$this->fail("Couldn't load e107 object");
self::fail("Couldn't load e107 object");
}

}
Expand Down Expand Up @@ -1068,7 +1068,6 @@ public function testLoadAdminIcons()
'ADMIN_DELETE_ICON_PATH' => '/e107_images/admin_images/delete_32.png',
'ADMIN_WARNING_ICON_PATH' => '/e107_images/admin_images/warning_32.png',
'E_24_PLUGIN' => "<i class='S24 e-plugins-24'></i> ",
'ADMIN_FALSE_ICON' => "<span class='text-danger admin-false-icon'>&#10799;</span>"

);

Expand Down Expand Up @@ -1517,7 +1516,7 @@ public function testUrl()
foreach($tests as $v)
{
$result = $obj::url($v['plugin'], $v['key'], $v['row'], $v['options']);
$this->assertStringContainsString('http', $result);
self::assertStringContainsString('http', $result);
}


Expand All @@ -1527,7 +1526,7 @@ public function testUrl()
$all = e107::getAddonConfig('e_url');
foreach($all as $plugin => $var)
{
if($plugin === 'gallery' || $plugin === 'rss_menu' || $plugin === 'vstore') // fixme - sef may be enabled or disabled each time tests are run
if($plugin === 'gallery' || $plugin === 'rss_menu' || $plugin === 'vstore' || $plugin === '_blank') // fixme - sef may be enabled or disabled each time tests are run
{
continue;
}
Expand Down Expand Up @@ -1566,13 +1565,22 @@ public function testUrl()
// $this->assertEquals("https://localhost/e107/news", $result);
}




}

public function testUrlDomain()
{
// e107 v2.4 - test for custom domain

$obj = $this->e107;

e107::getPlugin()->install('_blank');
$result = $obj::url('_blank', 'parked',null,['mode'=>'full']);
$result = $obj::url('_blank', 'parked', null, ['mode'=>'full']);
self::assertSame('https://parked-domain.com/custom', $result);
e107::getPlugin()->uninstall('_blank');


}

/**
Expand Down
100 changes: 75 additions & 25 deletions e107_tests/tests/unit/e_fileTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ protected function _before()
}
catch (Exception $e)
{
$this->fail($e->getMessage());
self::fail($e->getMessage());
}

$this->exploitFile = e_TEMP."test_exploit_file.jpg";
Expand Down Expand Up @@ -66,7 +66,7 @@ public function testIsClean()
foreach($isCleanTest as $file)
{
$actual = $this->fl->isClean($file['path'], $file['path']);
$this->assertEquals($file['expected'],$actual, "isClean() failed on {$file['path']} with error code: ".$this->fl->getErrorCode());
self::assertEquals($file['expected'],$actual, "isClean() failed on {$file['path']} with error code: ".$this->fl->getErrorCode());
}

}
Expand Down Expand Up @@ -120,8 +120,7 @@ public function testGetAllowedFileTypes()
continue;
}


$this->assertSame($expected,$actual);
self::assertSame($expected,$actual);
}


Expand All @@ -143,7 +142,7 @@ public function testGetMime()
{
$actual = $this->fl->getMime($var['path']);

$this->assertSame($var['expected'], $actual);
self::assertSame($var['expected'], $actual);
}
}

Expand All @@ -170,7 +169,7 @@ public function testIsAllowedType()
foreach($isAllowedTest as $file)
{
$actual = $this->fl->isAllowedType($file['path']);
$this->assertEquals($file['expected'],$actual, "isAllowedType() failed on: ".$file['path']);
self::assertEquals($file['expected'],$actual, "isAllowedType() failed on: ".$file['path']);
}

}
Expand All @@ -193,7 +192,7 @@ public function testFile_size_encode()
foreach($arr as $expected => $bytes)
{
$result = $this->fl->file_size_encode($bytes);
$this->assertSame($expected, $result);
self::assertSame($expected, $result);

}

Expand Down Expand Up @@ -233,7 +232,7 @@ public function testGet_dirs()
{
$actual = $this->fl->get_dirs(e_LANGUAGEDIR);
$expected = array ( 0 => 'English' );
$this->assertSame($expected, $actual);
self::assertSame($expected, $actual);
}
/*
public function testGetErrorMessage()
Expand Down Expand Up @@ -276,10 +275,36 @@ public function testFile_size_decode()
foreach($arr as $key => $expected)
{
$actual = $this->fl->file_size_decode($key);
$this->assertEquals($expected,$actual, $key." does not equal ".$expected." bytes");
self::assertEquals($expected,$actual, $key." does not equal ".$expected." bytes");
}

}

public function testZip()
{
// Arrange
$sourcePath = [
e_IMAGE.'logo.png',
e_IMAGE.'logoHD.png',
];

$destinationPath = e_TEMP."testZip.zip";

$result = $this->fl->zip($sourcePath, $destinationPath, ['remove_path'=>e_IMAGE]);

self::assertNotEmpty($result);
self::assertFileExists($destinationPath);

$expected = [
0 => 'logo.png',
1 => 'logoHD.png',
];

$contents = self::readZipFile($destinationPath);
self::assertSame($expected, $contents);

}

/*
public function testZip()
{
Expand Down Expand Up @@ -357,12 +382,12 @@ public function testGetFileInfo()
}


$this->assertEquals($item['expected']['mime'], $ret['mime']);
self::assertEquals($item['expected']['mime'], $ret['mime']);

if($item['imgchk'])
{
$this->assertEquals($item['expected']['img-width'], $ret['img-width']);
$this->assertEquals($item['expected']['img-height'], $ret['img-height']);
self::assertEquals($item['expected']['img-width'], $ret['img-width']);
self::assertEquals($item['expected']['img-height'], $ret['img-height']);
}
}

Expand Down Expand Up @@ -446,7 +471,7 @@ public function testGetFileExtension()
{
$actual = $this->fl->getFileExtension($mime);

$this->assertSame($ext, $actual);
self::assertSame($ext, $actual);
}
}
/*
Expand All @@ -466,20 +491,45 @@ public function testGet_files()
$files[] = $f['fname'];
}

$this->assertContains('install.xml', $files); // 1 level deep.
$this->assertContains('theme.php', $files);
$this->assertContains('theme.xml', $files);
$this->assertNotContains('style.css', $files);
self::assertContains('install.xml', $files); // 1 level deep.
self::assertContains('theme.php', $files);
self::assertContains('theme.xml', $files);
self::assertNotContains('style.css', $files);


// test folder with ony a folder inside. (no files)
$publicFilter = array('_FT', '^thumbs\.db$','^Thumbs\.db$','.*\._$','^\.htaccess$','^\.cvsignore$','^\.ftpquota$','^index\.html$','^null\.txt$','\.bak$','^.tmp'); // Default file filter (regex format)
$result = $this->fl->get_files(e_DOCS,'',$publicFilter);
$expected = array();

$this->assertSame($expected, $result);
self::assertSame($expected, $result);

}

private static function readZipFile($filePath)
{
$zip = new ZipArchive;
$ret = [];

if ($zip->open($filePath) === true)
{
for($i = 0; $i < $zip->numFiles; $i++)
{
$ret[] = $zip->getNameIndex($i);

}

$zip->close();
}
else
{
return false;
}

return $ret;
}


/*
public function testGetUserDir()
{
Expand Down Expand Up @@ -562,12 +612,12 @@ public function testUnzipGithubArchive()
$e_file->mkDir($destination);
$results = $e_file->unzipGithubArchive('core', $destination);

$this->assertEmpty($results['error'], "Errors not expected from Git remote update");
self::assertEmpty($results['error'], "Errors not expected from Git remote update");
$results['success'] = array_map(function($path)
{
$realpath = realpath($path);
$this->assertNotFalse($realpath,
"File {$path} reported as successfully extracted but does not exist");
self::assertNotFalse($realpath,
"File $path reported as successfully extracted but does not exist");
return $realpath;
}, $results['success']);
foreach($fake_e107_files['desired'] as $desired_filename)
Expand All @@ -576,13 +626,13 @@ public function testUnzipGithubArchive()
{
$desired_filename = preg_replace("/^".preg_quote($src, '/')."/", $dest, $desired_filename);
}
$this->assertContains(realpath($destination.$desired_filename), $results['success'],
"Desired file {$desired_filename} did not appear in file system");
self::assertContains(realpath($destination.$desired_filename), $results['success'],
"Desired file $desired_filename did not appear in file system");
}
foreach($fake_e107_files['undesired'] as $undesired_filename)
{
$this->assertContains($prefix.$undesired_filename, $results['skipped'],
"{$undesired_filename} was not skipped but should have been");
self::assertContains($prefix.$undesired_filename, $results['skipped'],
"$undesired_filename was not skipped but should have been");
}
}

Expand Down

0 comments on commit fed582a

Please sign in to comment.