[mapguide-commits] r8413 - in trunk/MgDev/UnitTest: . WebTier/Php
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Fri Oct 17 05:40:50 PDT 2014
Author: jng
Date: 2014-10-17 05:40:50 -0700 (Fri, 17 Oct 2014)
New Revision: 8413
Modified:
trunk/MgDev/UnitTest/WebTier/Php/DrawingServiceAPI.php
trunk/MgDev/UnitTest/WebTier/Php/FeatureServiceAPI.php
trunk/MgDev/UnitTest/WebTier/Php/MapLayerAPI.php
trunk/MgDev/UnitTest/WebTier/Php/MappingServiceAPI.php
trunk/MgDev/UnitTest/WebTier/Php/MappingServiceHttpRequests.php
trunk/MgDev/UnitTest/WebTier/Php/ResourceServiceAPI.php
trunk/MgDev/UnitTest/WebTier/Php/Utils.php
trunk/MgDev/UnitTest/WebTier/Php/WebLayoutAPI.php
trunk/MgDev/UnitTest/WebTier/Php/createSdf.php
trunk/MgDev/UnitTest/WebTier/Php/createSdfUnicode.php
trunk/MgDev/UnitTest/WebTier/Php/testAwSelection.php
trunk/MgDev/UnitTest/prepare.php
Log:
#2494: PHP test runner fixes:
- Fix constants.php include paths
- Add linux rooted path check for Utils::GetPath()
Modified: trunk/MgDev/UnitTest/WebTier/Php/DrawingServiceAPI.php
===================================================================
--- trunk/MgDev/UnitTest/WebTier/Php/DrawingServiceAPI.php 2014-10-17 11:23:23 UTC (rev 8412)
+++ trunk/MgDev/UnitTest/WebTier/Php/DrawingServiceAPI.php 2014-10-17 12:40:50 UTC (rev 8413)
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-require_once("../../../Web/src/PhpApi/Constants.php");
+require_once("../../../Web/src/PhpApi/constants.php");
require_once("Result.php");
require_once("Utils.php");
Modified: trunk/MgDev/UnitTest/WebTier/Php/FeatureServiceAPI.php
===================================================================
--- trunk/MgDev/UnitTest/WebTier/Php/FeatureServiceAPI.php 2014-10-17 11:23:23 UTC (rev 8412)
+++ trunk/MgDev/UnitTest/WebTier/Php/FeatureServiceAPI.php 2014-10-17 12:40:50 UTC (rev 8413)
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-require_once("../../../Web/src/PhpApi/Constants.php");
+require_once("../../../Web/src/PhpApi/constants.php");
require_once("Utils.php");
require_once("Result.php");
Modified: trunk/MgDev/UnitTest/WebTier/Php/MapLayerAPI.php
===================================================================
--- trunk/MgDev/UnitTest/WebTier/Php/MapLayerAPI.php 2014-10-17 11:23:23 UTC (rev 8412)
+++ trunk/MgDev/UnitTest/WebTier/Php/MapLayerAPI.php 2014-10-17 12:40:50 UTC (rev 8413)
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-require_once("../../../Web/src/PhpApi/Constants.php");
+require_once("../../../Web/src/PhpApi/constants.php");
require_once("Result.php");
require_once("Utils.php");
Modified: trunk/MgDev/UnitTest/WebTier/Php/MappingServiceAPI.php
===================================================================
--- trunk/MgDev/UnitTest/WebTier/Php/MappingServiceAPI.php 2014-10-17 11:23:23 UTC (rev 8412)
+++ trunk/MgDev/UnitTest/WebTier/Php/MappingServiceAPI.php 2014-10-17 12:40:50 UTC (rev 8413)
@@ -19,7 +19,7 @@
require_once("Result.php");
require_once("Utils.php");
-require_once("../../../Web/src/PhpApi/Constants.php");
+require_once("../../../Web/src/PhpApi/constants.php");
//This file defines the operations that are currently supported for Mapping Service API by the unit test infrastructure.
//There is one function per operation. Each function tries to retrieve the parameters that are required for its corresponding
Modified: trunk/MgDev/UnitTest/WebTier/Php/MappingServiceHttpRequests.php
===================================================================
--- trunk/MgDev/UnitTest/WebTier/Php/MappingServiceHttpRequests.php 2014-10-17 11:23:23 UTC (rev 8412)
+++ trunk/MgDev/UnitTest/WebTier/Php/MappingServiceHttpRequests.php 2014-10-17 12:40:50 UTC (rev 8413)
@@ -19,7 +19,7 @@
require_once("HttpRequest.php");
require_once("Utils.php");
-require_once("../../../Web/src/PhpApi/Constants.php");
+require_once("../../../Web/src/PhpApi/constants.php");
//This file defines the operations that are currently supported by the unit test infrastructure for Drawing Service methods exposed through Htpp.
//There is one function per operation. Each function tries to retrieve the parameters that are required for its corresponding
Modified: trunk/MgDev/UnitTest/WebTier/Php/ResourceServiceAPI.php
===================================================================
--- trunk/MgDev/UnitTest/WebTier/Php/ResourceServiceAPI.php 2014-10-17 11:23:23 UTC (rev 8412)
+++ trunk/MgDev/UnitTest/WebTier/Php/ResourceServiceAPI.php 2014-10-17 12:40:50 UTC (rev 8413)
@@ -22,7 +22,7 @@
//operation and executes the operation
//Edit that file to add more operations for Resource Service API
-require_once("../../../Web/src/PhpApi/Constants.php");
+require_once("../../../Web/src/PhpApi/constants.php");
require_once("Utils.php");
require_once("Result.php");
Modified: trunk/MgDev/UnitTest/WebTier/Php/Utils.php
===================================================================
--- trunk/MgDev/UnitTest/WebTier/Php/Utils.php 2014-10-17 11:23:23 UTC (rev 8412)
+++ trunk/MgDev/UnitTest/WebTier/Php/Utils.php 2014-10-17 12:40:50 UTC (rev 8413)
@@ -81,9 +81,15 @@
public static function GetPath($fileName)
{
+ if (strpos($fileName, "/") === 0)
+ {
+ //echo "Utils::GetPath($fileName) - $fileName\n";
+ return $fileName;
+ }
$pos = strrpos($fileName, ':');
if($pos)
{
+ //echo "Utils::GetPath($fileName) - $fileName\n";
return $fileName;
}
@@ -98,13 +104,14 @@
//Replace the back slashes in the path with forward slashes for Linux compatibility
$relPath = str_replace("\\", "/", $relPath);
-
+ //echo "Utils::GetPath($fileName) - $relPath\n";
return $relPath;
}
public static function MapAgentInit($webConfigIniPath)
{
$cfgFile = self::GetPath($webConfigIniPath);
+ //echo "Initializing from $cfgFile\n\n";
MgInitializeWebTier($cfgFile);
}
Modified: trunk/MgDev/UnitTest/WebTier/Php/WebLayoutAPI.php
===================================================================
--- trunk/MgDev/UnitTest/WebTier/Php/WebLayoutAPI.php 2014-10-17 11:23:23 UTC (rev 8412)
+++ trunk/MgDev/UnitTest/WebTier/Php/WebLayoutAPI.php 2014-10-17 12:40:50 UTC (rev 8413)
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-require_once("../../../Web/src/PhpApi/Constants.php");
+require_once("../../../Web/src/PhpApi/constants.php");
require_once("Result.php");
require_once("Utils.php");
Modified: trunk/MgDev/UnitTest/WebTier/Php/createSdf.php
===================================================================
--- trunk/MgDev/UnitTest/WebTier/Php/createSdf.php 2014-10-17 11:23:23 UTC (rev 8412)
+++ trunk/MgDev/UnitTest/WebTier/Php/createSdf.php 2014-10-17 12:40:50 UTC (rev 8413)
@@ -18,7 +18,7 @@
//
-require_once("../../../Web/src/PhpApi/Constants.php");
+require_once("../../../Web/src/PhpApi/constants.php");
require_once("Utils.php");
try
Modified: trunk/MgDev/UnitTest/WebTier/Php/createSdfUnicode.php
===================================================================
--- trunk/MgDev/UnitTest/WebTier/Php/createSdfUnicode.php 2014-10-17 11:23:23 UTC (rev 8412)
+++ trunk/MgDev/UnitTest/WebTier/Php/createSdfUnicode.php 2014-10-17 12:40:50 UTC (rev 8413)
@@ -18,7 +18,7 @@
//
-require_once("../../../Web/src/PhpApi/Constants.php");
+require_once("../../../Web/src/PhpApi/constants.php");
require_once("Utils.php");
try
Modified: trunk/MgDev/UnitTest/WebTier/Php/testAwSelection.php
===================================================================
--- trunk/MgDev/UnitTest/WebTier/Php/testAwSelection.php 2014-10-17 11:23:23 UTC (rev 8412)
+++ trunk/MgDev/UnitTest/WebTier/Php/testAwSelection.php 2014-10-17 12:40:50 UTC (rev 8413)
@@ -18,7 +18,7 @@
//
-require_once("../../../Web/src/PhpApi/Constants.php");
+require_once("../../../Web/src/PhpApi/constants.php");
require_once("Utils.php");
interface FeatureClass
Modified: trunk/MgDev/UnitTest/prepare.php
===================================================================
--- trunk/MgDev/UnitTest/prepare.php 2014-10-17 11:23:23 UTC (rev 8412)
+++ trunk/MgDev/UnitTest/prepare.php 2014-10-17 12:40:50 UTC (rev 8413)
@@ -1,6 +1,6 @@
<?php
-require_once dirname(__FILE__)."/../Web/src/mapadmin/constants.php";
+require_once dirname(__FILE__)."/../Web/src/PhpApi/constants.php";
$file = dirname(__FILE__)."/webconfig.ini";
$mgp = dirname(__FILE__)."/TestData/Samples/Sheboygan/Sheboygan.mgp";
More information about the mapguide-commits
mailing list