[Weberp-svn] SF.net SVN: weberp:[7206] trunk

[<tim...@us...>]

Revision: 7206
          http://weberp.svn.sourceforge.net/weberp/?rev=7206&view=rev
Author:   tim_schofield
Date:     2011-07-29 16:11:46 +0000 (Fri, 29 Jul 2011)

Log Message:
-----------
Improvements to testing suite

Modified Paths:
--------------
    trunk/build/tests/SupplierTest.php
    trunk/build/tests/classes/URLDetails.class.php
    trunk/build/tests/includes/SelectMenuOption.php
    trunk/includes/header.inc

Modified: trunk/build/tests/SupplierTest.php
===================================================================
--- trunk/build/tests/SupplierTest.php	2011-07-29 16:11:31 UTC (rev 7205)
+++ trunk/build/tests/SupplierTest.php	2011-07-29 16:11:46 UTC (rev 7206)
@@ -5,6 +5,7 @@
 
 include('includes/login.php');
 include('includes/SelectModule.php');
+include('includes/SelectMenuOption.php');
 
 include('includes/validators/XhtmlValidator.php');
 include('classes/URLDetails.class.php');
@@ -16,12 +17,8 @@
 
 $IndexPage=webERPLogIn($ch, $TestSessionID, $RootPath, $ServerPath, $CompanyName, $UserName, $Password);
 $APPage=FindModule($ch, $RootPath, $ServerPath, $TestSessionID, $IndexPage, 'AP');
+$SupplierInsertPage=ChooseMenuOption($ch, $RootPath, $ServerPath, $TestSessionID, $APPage, 'Add Supplier');
 //echo $APPage;
 curl_close($ch);
 
-/*
-exec('cat /tmp/'.$TestSessionID.'/login', $output);
-echo $output[0];
-
-*/
 ?>
\ No newline at end of file

Modified: trunk/build/tests/classes/URLDetails.class.php
===================================================================
--- trunk/build/tests/classes/URLDetails.class.php	2011-07-29 16:11:31 UTC (rev 7205)
+++ trunk/build/tests/classes/URLDetails.class.php	2011-07-29 16:11:46 UTC (rev 7206)
@@ -6,6 +6,7 @@
 	private $URL;
 	private $PostArray;
 	public $xml;
+	public $Links;
 
 	function __construct($SessionID) {
 		$this->SessionID = $SessionID;
@@ -184,6 +185,7 @@
 			for ($j=0; $j<$result->item($i)->attributes->length; $j++) {
 				$name = $result->item($i)->attributes->item($j)->name;
 				$Links[$k][$name]=(string)$result->item($i)->attributes->getNamedItem($name)->nodeValue;
+				$Links[$k]['value']=$result->item($i)->nodeValue;
 			}
 			$k++;
 		}

Modified: trunk/build/tests/includes/SelectMenuOption.php
===================================================================
--- trunk/build/tests/includes/SelectMenuOption.php	2011-07-29 16:11:31 UTC (rev 7205)
+++ trunk/build/tests/includes/SelectMenuOption.php	2011-07-29 16:11:46 UTC (rev 7206)
@@ -1,9 +1,7 @@
 <?php
 
-$OptionURL=mb_substr(mb_strstr(mb_substr(mb_strstr($result, $OptionName, true),-100,98), 'href', false),6);
+function ChooseMenuOption($ch, $RootPath, $ServerPath, $TestSessionID, $IndexPage, $MenuOption) {
 
-$url=$ServerPath.$OptionURL;
+}
 
-include('GetURL.php');
-
 ?>
\ No newline at end of file

Modified: trunk/includes/header.inc
===================================================================
--- trunk/includes/header.inc	2011-07-29 16:11:31 UTC (rev 7205)
+++ trunk/includes/header.inc	2011-07-29 16:11:46 UTC (rev 7206)
@@ -42,7 +42,7 @@
 		echo '<td align="left" style="width:100%;" class="quick_menu_left">';
 // Use icons for company and user data, saves screen realestate, use ALT tag in case theme icon not avail.
 		echo '<img src="'.$rootpath.'/css/'.$theme.'/images/company.png" title="' . _('Company') . '" ALT="' . _('Company') . '" />';
-		echo ' ' . stripslashes($_SESSION['CompanyRecord']['coyname']) . '  <a href="' .  $rootpath . '/UserSettings.php"><img src="'.$rootpath.'/css/'.$theme.'/images/user.png" TITLE="User" ALT="' . _('User') . '" /> ' . stripslashes($_SESSION['UsersRealName']) . '</a>';
+		echo ' ' . stripslashes($_SESSION['CompanyRecord']['coyname']) . '  <a href="' .  $rootpath . '/UserSettings.php"><img src="'.$rootpath.'/css/'.$theme.'/images/user.png" TITLE="User" ALT="' . _('User') . '" />' . stripslashes($_SESSION['UsersRealName']) . '</a>';
 // Make the title text a class, can be set to display:none is some themes
 		echo '<br /><font class="header_title"> ' . $title . '</font></td>';
 		echo '<td class="quick_menu_tabs">';


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.