Core batch shortcode tests added.

e107_tests/tests/unit/e_parseTest.php

@@ -934,7 +934,7 @@ while($row = $sql->fetch())
 			$tests = array(
 				0   => array(
 					'input'     => array('user_image'=>'-upload-avatartest.png'),
-					'parms'     => array('w'=>50, 'h'=>50),
+					'parms'     => array('w'=>50, 'h'=>50, 'crop'=>false),
 					'expected'  => array(
 									"thumb.php?src=%7Be_AVATAR%7Dupload%2Favatartest.png&w=50&h=50",
 									"class='img-rounded rounded user-avatar'"
@@ -942,7 +942,7 @@ while($row = $sql->fetch())
 				),
 				1   => array(
 					'input'     => array('user_image'=>'avatartest.png'),
-					'parms'     => array('w'=>50, 'h'=>50),
+					'parms'     => array('w'=>50, 'h'=>50, 'crop'=>false),
 					'expected'  => array(
 									"thumb.php?src=%7Be_AVATAR%7Ddefault%2Favatartest.png&w=50&h=50",
 									"class='img-rounded rounded user-avatar'"
@@ -950,7 +950,7 @@ while($row = $sql->fetch())
 				),
 				2   => array(
 					'input'     => array('user_image'=>''),
-					'parms'     => array('w'=>50, 'h'=>50),
+					'parms'     => array('w'=>50, 'h'=>50, 'crop'=>false),
 					'expected'  => array(
 									"thumb.php?src=%7Be_IMAGE%7Dgeneric%2Fblank_avatar.jpg&w=50&h=50",
 									"class='img-rounded rounded user-avatar'"
@@ -958,7 +958,7 @@ while($row = $sql->fetch())
 				),
 				3   => array(
 					'input'     => array('user_image'=>'https://mydomain.com/remoteavatar.jpg'),
-					'parms'     => array('w'=>50, 'h'=>50),
+					'parms'     => array('w'=>50, 'h'=>50, 'crop'=>false,),
 					'expected'  => array(
 									"src='https://mydomain.com/remoteavatar.jpg'",
 									"class='img-rounded rounded user-avatar'",
@@ -967,7 +967,7 @@ while($row = $sql->fetch())
 				),
 				4   => array(
 					'input'     => array('user_image'=>'', 'user_id'=>1),
-					'parms'     => array('w'=>50, 'h'=>50, 'link'=>true),
+					'parms'     => array('w'=>50, 'h'=>50, 'crop'=>false, 'link'=>true),
 					'expected'  => array(
 									"thumb.php?src=%7Be_IMAGE%7Dgeneric%2Fblank_avatar.jpg&w=50&h=50",
 									"class='img-rounded rounded user-avatar'",
@@ -985,7 +985,7 @@ while($row = $sql->fetch())
 				),
 				6   => array(
 					'input'     => array('user_image'=>'avatartest.png'),
-					'parms'     => array('w'=>30, 'h'=>30, 'shape'=>'circle', 'alt'=>'mytitle'),
+					'parms'     => array('w'=>30, 'h'=>30, 'crop'=>false, 'shape'=>'circle', 'alt'=>'mytitle'),
 					'expected'  => array(
 									"thumb.php?src=%7Be_AVATAR%7Ddefault%2Favatartest.png&w=30&h=30",
 									"class='img-circle rounded-circle user-avatar'",
@@ -1005,12 +1005,12 @@ while($row = $sql->fetch())
 
 			);
 
-			foreach($tests as $var)
+			foreach($tests as $index => $var)
 			{
 				$result = $this->tp->toAvatar($var['input'], $var['parms']);
 				foreach($var['expected'] as $str)
 				{
-					$this->assertStringContainsString($str, $result);
+					$this->assertStringContainsString($str, $result, "Failed on index #".$index);
 				}
 				//var_dump($result);
 

e107_tests/tests/unit/e_parse_shortcodeTest.php

@@ -19,7 +19,8 @@ class e_parse_shortcodeTest extends \Codeception\Test\Unit
 		{
 			$this->scParser = $this->make('e_parse_shortcode');
 		}
-		catch (Exception $e) {
+		catch (Exception $e)
+		{
 			$this->fail("Couldn't create e_parse_shortcode object");
 		}
 
@@ -149,6 +150,489 @@ class e_parse_shortcodeTest extends \Codeception\Test\Unit
 
 
     }
+
+
+    public function testAdminShortcodes()
+    {
+        require_once(e_CORE."shortcodes/batch/admin_shortcodes.php");
+        require_once(e_CORE."templates/admin_icons_template.php");
+        require_once(e_LANGUAGEDIR.'English/admin/lan_header.php');
+        require_once(e_LANGUAGEDIR.'English/admin/lan_footer.php');
+
+        try
+		{
+			$sc = $this->make('admin_shortcodes');
+		}
+		catch (Exception $e)
+		{
+			$this->fail($e->getMessage());
+		}
+
+        $this->processShortcodeMethods($sc);
+
+    }
+
+    public function testBBcodeShortcodes()
+    {
+        require_once(e_CORE."shortcodes/batch/bbcode_shortcodes.php");
+
+        try
+		{
+			$sc = $this->make('bbcode_shortcodes');
+		}
+		catch (Exception $e)
+		{
+			$this->fail($e->getMessage());
+		}
+
+        $this->processShortcodeMethods($sc);
+
+    }
+
+    public function testCommentShortcodes()
+    {
+        require_once(e_CORE."shortcodes/batch/comment_shortcodes.php");
+
+        try
+		{
+			/** @var comment_shortcodes $sc */
+			$sc = $this->make('comment_shortcodes');
+		}
+		catch (Exception $e)
+		{
+			$this->fail($e->getMessage());
+		}
+
+	   $values = array(
+	        'comment_id'           => '84',
+	        'comment_pid'          => '82',
+	        'comment_item_id'      => '53',
+	        'comment_subject'      => 'Re: New Item',
+	        'comment_author_id'    => '1',
+	        'comment_author_name'  => 'admin',
+	        'comment_author_email' => 'someone@gmail.com',
+	        'comment_datestamp'    => '1609767045',
+	        'comment_comment'      => 'Nested Comment here',
+	        'comment_blocked'      => '0',
+	        'comment_ip'           => '0000:0000:0000:0000:0000:ffff:7f00:0001',
+	        'comment_type'         => '0',
+	        'comment_lock'         => '0',
+	        'comment_share'        => '0',
+	        'table'                 => 'news',
+			'action'	            => '',
+			'subject' 	            => 'subject name',
+			'comval'	            => 'a comment',
+			'itemid'	            => 5,
+			'pid'		            => 3,
+	        'eaction'	            => '',
+	        'rate'		            => 2,
+	        'user_id'               => 1,
+	        'user_join'             => 1518441749
+	   );
+
+		$sc->setVars($values);
+
+        $this->processShortcodeMethods($sc);
+
+    }
+
+
+
+    public function testContactShortcodes()
+    {
+        require_once(e_CORE."shortcodes/batch/contact_shortcodes.php");
+
+        try
+		{
+			$sc = $this->make('contact_shortcodes');
+		}
+		catch (Exception $e)
+		{
+			$this->fail($e->getMessage());
+		}
+
+        $this->processShortcodeMethods($sc);
+
+    }
+
+
+    public function testErrorShortcodes()
+    {
+        require_once(e_CORE."shortcodes/batch/error_shortcodes.php");
+
+        try
+		{
+			$sc = $this->make('error_shortcodes');
+		}
+		catch (Exception $e)
+		{
+			$this->fail($e->getMessage());
+		}
+
+        $this->processShortcodeMethods($sc);
+
+    }
+
+
+    public function testLoginShortcodes()
+    {
+        require_once(e_CORE."shortcodes/batch/error_shortcodes.php");
+
+        try
+		{
+			$sc = $this->make('error_shortcodes');
+		}
+		catch (Exception $e)
+		{
+			$this->fail($e->getMessage());
+		}
+
+        $this->processShortcodeMethods($sc);
+
+    }
+
+    public function testNavigationShortcodes()
+    {
+        require_once(e_CORE."shortcodes/batch/navigation_shortcodes.php");
+
+        try
+		{
+			/** @var navigation_shortcodes $sc */
+			$sc = $this->make('navigation_shortcodes');
+		}
+		catch (Exception $e)
+		{
+			$this->fail($e->getMessage());
+		}
+		
+		$vars = array(
+			'link_id'          => '6',
+			'link_name'        => 'News',
+			'link_url'         => 'news.php',
+			'link_description' => '',
+			'link_button'      => '',
+			'link_category'    => '1',
+			'link_order'       => '5',
+			'link_parent'      => '0',
+			'link_open'        => '0',
+			'link_class'       => '0',
+			'link_function'    => 'news::last_ten',
+			'link_sefurl'      => 'index',
+			'link_owner'       => 'news'
+		);
+
+		$sc->setVars($vars);
+		
+        $this->processShortcodeMethods($sc);
+
+    }
+
+
+    public function testNewsArchiveShortcodes()
+    {
+        require_once(e_CORE."shortcodes/batch/news_archive_shortcodes.php");
+
+        try
+		{
+			$sc = $this->make('news_archive_shortcodes');
+		}
+		catch (Exception $e)
+		{
+			$this->fail($e->getMessage());
+		}
+
+		$vars = array(
+			'news_id'       => 1,
+			'news_title'    => "my title",
+			'news_datestamp'    => time(),
+			'category_name'     => "my category",
+			'user_id'           => 1,
+			'user_name'         => 'admin'
+		);
+
+		$sc->setVars($vars);
+
+        $this->processShortcodeMethods($sc);
+
+    }
+
+
+    public function testNewsShortcodes()
+    {
+        require_once(e_CORE."shortcodes/batch/news_shortcodes.php");
+
+        try
+		{
+			/** @var news_shortcodes $sc */
+			$sc = $this->make('news_shortcodes');
+		}
+		catch (Exception $e)
+		{
+			$this->fail($e->getMessage());
+		}
+
+		$vars = array(
+			'news_id'               => '1',
+			'news_title'            => 'Welcome',
+			'news_sef'              => 'welcome-to-e107-me-again-x',
+			'news_body'             => '[html]<p>Lorem ipsum dolor sit amet, no meis semper dicunt est, petentium eloquentiam quo ne. At vero facer eam. Ex nam altera oportere, nisl natum prima id pro. Rebum augue dissentiet eum te, vel veniam eirmod option ea, at eos velit repudiare. Ius sumo dicit adolescens id, an cum efficiantur concludaturque.<br><br>Summo sensibus cum ne, et duo torquatos conceptam. No aeque elitr constituam qui. Nostro corpora nec no, diam verterem tincidunt has et. Altera accumsan urbanitas pro eu, ei assum voluptaria sed. Eam tibique nominavi consequuntur an.<br><br>Ei perfecto delicata usu, quo eius noster blandit te. Eu doctus volumus pri. Meis argumentum an nam, eos odio prima autem an. Te complectitur intellegebat pro, ius id alterum maiestatis. Ea facer accusata sed, ex illum antiopam quo.<br><br>Altera putent pri ad, in phaedrum dissentiunt per. Te eum everti dolores. Ut mea vero autem viderer, mel brute harum senserit id. Minim senserit eloquentiam duo in, sit ei justo graece petentium. Sea id homero oporteat invenire.<br><br>Pri semper dolorum ad. Cu eius repudiare eos. Eum in eleifend necessitatibus. Ne has mutat intellegebat.ok asdasdasd asdasd okay. okayasdasd okokokok wowow sdf okoko lk</p>[/html]',
+			'news_extended'         => '[html]<p><strong>Lorem ipsum</strong> is a pseudo-Latin text used in web design, typography, layout, and printing in place of English to emphasise design elements over content. It&#039;s also called placeholder (or filler) text. It&#039;s a convenient tool for mock-ups. It helps to outline the visual elements of a document or presentation, eg typography, font, or layout. Lorem ipsum is mostly a part of a Latin text by the classical author and philosopher Cicero. Its words and letters have been changed by addition or removal, so to deliberately render its content nonsensical; it&#039;s not genuine, correct, or comprehensible Latin anymore.</p>
+			<p>While <strong>lorem ipsum</strong>&#039;s still resembles classical Latin, it actually has no meaning whatsoever. As Cicero&#039;s text doesn&#039;t contain the letters K, W, or Z, alien to latin, these, and others are often inserted randomly to mimic the&nbsp; typographic appearence of European languages, as are digraphs not to be found in the original.</p>[/html]',
+			'news_meta_keywords'    => 'welcome,new website',
+			'news_meta_description' => 'Description for Facebook and search engines.',
+			'news_meta_robots'      => '',
+			'news_datestamp'        => '1454367600',
+			'news_author'           => '1',
+			'news_category'         => '1',
+			'news_allow_comments'   => '0',
+			'news_start'            => '0',
+			'news_end'              => '0',
+			'news_class'            => '0',
+			'news_render_type'      => '0',
+			'news_comment_total'    => '0',
+			'news_summary'          => 'Example news item summary there',
+			'news_thumbnail'        => '{e_THEME}agency2/install/news/deer.jpg,,,,',
+			'news_sticky'           => '0',
+			'news_template'         => 'default'
+		);
+
+	//	$sc->setVars($vars);
+		$sc->__construct();
+		$sc->setScVar('news_item', $vars);
+		$sc->setScVar('param', array('current_action'=>'list'));
+
+        $this->processShortcodeMethods($sc);
+
+    }
+
+	  public function testPageShortcodes()
+    {
+        require_once(e_CORE."shortcodes/batch/page_shortcodes.php");
+
+        try
+		{
+			/** @var cpage_shortcodes $sc */
+			$sc = $this->make('cpage_shortcodes');
+		}
+		catch (Exception $e)
+		{
+			$this->fail($e->getMessage());
+		}
+		
+		$vars =  array('page_id' => '1',
+			'page_title' => 'Article 1',
+			'page_subtitle' => 'My subtitle goes here.',
+			'page_sef' => 'article-1',
+			'page_chapter' => '2',
+			'page_metakeys' => 'keywords',
+			'page_metadscr' => 'Meta Description',
+			'page_metarobots' => 'noindex',
+			'page_text' => '[html]<p>Lorem ipsum dolor sit amet, <sup>1</sup> consectetur adipiscing elit. Donec libero ipsum; imperdiet at risus non, dictum sagittis odio! Nulla facilisi. Pellentesque adipiscing facilisis pharetra. Morbi imperdiet augue in ligula luctus, et iaculis est porttitor. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. In ultricies vitae nisi ut porttitor. Curabitur lectus tellus, feugiat a elit vel, gravida iaculis dui. Nulla vulputate turpis dui, ac faucibus enim dignissim non. Ut non tellus suscipit, scelerisque orci sed, scelerisque sapien. Aenean convallis sodales nulla in porttitor. In pretium ante sapien, a tempor eros blandit nec <sup>2</sup>.<br><br>Nulla non est nibh? Fusce lacinia quam adipiscing magna posuere dapibus. Sed mollis condimentum rhoncus. Morbi sollicitudin tellus a ligula luctus, ac varius arcu ullamcorper. Mauris in aliquet tellus, nec porttitor dui. Quisque interdum euismod mi sed bibendum. Vivamus non odio quis quam lacinia rhoncus in nec nibh. Integer vitae turpis condimentum, laoreet diam nec viverra fusce.</p>[/html]',
+			'page_author' => '1',
+			'page_datestamp' => '1371420000',
+			'page_rating_flag' => '1',
+			'page_comment_flag' => '1',
+			'page_password' => '',
+			'page_class' => '0',
+			'page_ip_restrict' => '',
+			'page_template' => 'default',
+			'page_order' => '20',
+			'page_fields' => NULL,'menu_name' => '',
+			'menu_title' => 'Heading 1',
+			'menu_text' => '[html]<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus auctor egestas condimentum. Suspendisse placerat nunc orci, a ultrices tortor eleifend in. Vestibulum tincidunt fringilla malesuada? Phasellus dolor risus, aliquam eu odio quis, mattis cursus magna. Integer ut blandit purus; vitae posuere ante. Vivamus sapien nisl, pulvinar vel turpis a, malesuada vehicula lorem! Curabitur magna justo; laoreet at congue sit amet, tincidunt sit amet erat. Integer vehicula eros quis odio tincidunt, nec dapibus sem molestie. Cras sed viverra eros. Nulla ut lectus tellus.</p>[/html]',
+			'menu_image' => '{e_THEME}steminst_eu/_content/2019-07/chromosome_dna_pattern_genetic_3_d_psychedelic_1920x1200.jpg',
+			'menu_icon' => '',
+			'menu_template' => 'button',
+			'menu_class' => '0',
+			'menu_button_url' => '',
+			'menu_button_text' => '')
+			;
+
+
+		$sc->setVars($vars);
+
+		$exclude = array('sc_cpagemessage'); // system messages
+
+        $this->processShortcodeMethods($sc, $exclude);
+
+    }
+
+
+    public function testSignupShortcodes()
+    {
+        require_once(e_CORE."shortcodes/batch/signup_shortcodes.php");
+
+        try
+		{
+			$sc = $this->make('signup_shortcodes');
+		}
+		catch (Exception $e)
+		{
+			$this->fail($e->getMessage());
+		}
+
+		$exclude = array('sc_signup_coppa_text'); // uses random email obfiscation.
+        $this->processShortcodeMethods($sc, $exclude);
+
+    }
+
+
+	public function testSitedownShortcodes()
+    {
+        require_once(e_CORE."shortcodes/batch/sitedown_shortcodes.php");
+
+        try
+		{
+			$sc = $this->make('sitedown_shortcodes');
+		}
+		catch (Exception $e)
+		{
+			$this->fail($e->getMessage());
+		}
+
+        $this->processShortcodeMethods($sc);
+
+    }
+
+    public function testUserShortcodes()
+    {
+        require_once(e_CORE."shortcodes/batch/user_shortcodes.php");
+
+        try
+		{
+			/** @var user_shortcodes $sc */
+			$sc = $this->make('user_shortcodes');
+		}
+		catch (Exception $e)
+		{
+			$this->fail($e->getMessage());
+		}
+		
+		$vars = array(
+			'user_id'           => '1',
+			'user_name'         => 'admin',
+			'user_loginname'    => 'admin',
+			'user_customtitle'  => 'Administrator',
+			'user_password'     => '$2y$10$EfCajR8.i3G1Qu82VKwSzu4dOroWabexa9B10LFYuEqepSD4gzzWa',
+			'user_sess'         => '',
+			'user_email'        => 'myemail@gmail.com',
+			'user_signature'    => '',
+			'user_image'        => 'myimage.jpeg',
+			'user_hideemail'    => '0',
+			'user_join'         => '1518441749',
+			'user_lastvisit'    => '1609890429',
+			'user_currentvisit' => '1609953446',
+			'user_lastpost'     => '1609793616',
+			'user_chats'        => '1',
+			'user_comments'     => '52',
+			'user_ip'           => '123.45.678.91',
+			'user_ban'          => '0',
+			'user_prefs'        => '',
+			'user_visits'       => '766',
+			'user_admin'        => '1',
+			'user_login'        => 'Real Name',
+			'user_class'        => '12,14,15,16,6',
+			'user_perms'        => '0',
+			'user_realm'        => '',
+			'user_pwchange'     => '1518441749',
+			'user_xup'          => ''
+
+			);
+
+		$sc->setVars($vars);
+
+		$exclude = array('sc_user_email'); // uses random obfiscation.
+        $this->processShortcodeMethods($sc, $exclude);
+
+    }
+
+
+	public function testUserSettingsShortcodes()
+    {
+        require_once(e_CORE."shortcodes/batch/usersettings_shortcodes.php");
+
+        try
+		{
+			/** @var user_shortcodes $sc */
+			$sc = $this->make('usersettings_shortcodes');
+		}
+		catch (Exception $e)
+		{
+			$this->fail($e->getMessage());
+		}
+
+		$vars = array(
+			'user_id'           => '1',
+			'user_name'         => 'admin',
+			'user_loginname'    => 'admin',
+			'user_customtitle'  => 'Administrator',
+			'user_password'     => '$2y$10$EfCajR8.i3G1Qu82VKwSzu4dOroWabexa9B10LFYuEqepSD4gzzWa',
+			'user_sess'         => '',
+			'user_email'        => 'myemail@gmail.com',
+			'user_signature'    => '',
+			'user_image'        => 'myimage.jpeg',
+			'user_hideemail'    => '0',
+			'user_join'         => '1518441749',
+			'user_lastvisit'    => '1609890429',
+			'user_currentvisit' => '1609953446',
+			'user_lastpost'     => '1609793616',
+			'user_chats'        => '1',
+			'user_comments'     => '52',
+			'user_ip'           => '123.45.678.91',
+			'user_ban'          => '0',
+			'user_prefs'        => '',
+			'user_visits'       => '766',
+			'user_admin'        => '1',
+			'user_login'        => 'Real Name',
+			'user_class'        => '12,14,15,16,6',
+			'user_perms'        => '0',
+			'user_realm'        => '',
+			'user_pwchange'     => '1518441749',
+			'user_xup'          => '',
+			'userclass_list'    => USERCLASS_LIST
+
+			);
+
+		$sc->__construct();
+		$sc->setVars($vars);
+
+		$exclude = array('sc_userextended_all'); // uses e107::setRegistry() to avoid duplicate rendering.
+        $this->processShortcodeMethods($sc, $exclude);
+
+    }
+
+
+
+
+
+
+// ------------------------------------------------
+
+
+    private function processShortcodeMethods($sc, $exclude=array())
+    {
+    	$list = get_class_methods($sc);
+
+        foreach($list as $meth)
+        {
+            if(strpos($meth, 'sc_') !== 0 || in_array($meth, $exclude))
+            {
+                continue;
+            }
+
+            $scName = '{'.strtoupper(str_replace('sc_', '', $meth)).'}';
+
+            $result = e107::getParser()->parseTemplate($scName, true, $sc);
+            $expected = $sc->$meth();
+
+            $this->assertEquals($expected,$result, $scName.' != '.$meth.'()');
+        }
+
+
+
+    }
+
+
 /*
 	public function testInitShortcodeClass()
 	{

e107_tests/tests/unit/pluginsTest.php

@@ -133,19 +133,18 @@
 
 			$tp = e107::getParser();
 
-			$result = $tp->parseTemplate("{BANNER=e107promo}",true);
+			$result = $tp->parseTemplate("{BANNER=e107promo}", true);
 			$this->assertStringContainsString('<img class="e-banner img-responsive img-fluid"', $result);
 
-			$result = $tp->parseTemplate("{BANNER=e107promo}",false,
-				e107::getScBatch('banner', true));
+			$result = $tp->parseTemplate("{BANNER=e107promo}", false, e107::getScBatch('banner', true));
 			$this->assertStringContainsString('<img class="e-banner img-responsive img-fluid"', $result);
 
-			$result = $tp->parseTemplate("{BANNER=e107promo}",false);
+			$result = $tp->parseTemplate("{BANNER=e107promo}", false);
 			$this->assertEquals("", $result);
 
 			$this->pluginUninstall('banner');
 
-			$result = $tp->parseTemplate("{BANNER=e107promo}",true);
+			$result = $tp->parseTemplate("{BANNER=e107promo}", true);
 			// The expected value below was the actual observed output when the assertion was written:
 			$this->assertEquals('&nbsp;', $result,
 				"Banner shortcode is not returning an empty value, despite banner being uninstalled");
@@ -389,6 +388,8 @@
 
 		private function pluginInstall($pluginDir)
 		{
+			e107::setRegistry('core/form/related'); // reset.
+
 			e107::getPlugin()->uninstall($pluginDir);
 
 			$return_text = e107::getPlugin()->install($pluginDir);