pts-core: Unify pts_test_generate_install_xml() and

pts_test_refresh_install_xml() into pts_test_refresh_install_xml()

1 files changed, 56 insertions, 28 deletions

diff --git a/pts-core/functions/pts-functions_tests.php b/pts-core/functions/pts-functions_tests.php
index 08b82b4..7db927b 100644
--- a/pts-core/functions/pts-functions_tests.php
+++ b/pts-core/functions/pts-functions_tests.php
@@ -98,7 +98,7 @@ function pts_test_installed_profile_version($identifier)
 function pts_test_generate_install_xml($identifier)
 {
 	// Generate an install XML for pts-install.xml
-	$xml_writer = new tandem_XmlWriter();
+	/*$xml_writer = new tandem_XmlWriter();
 
 	$xml_writer->addXmlObject(P_INSTALL_TEST_NAME, 1, $identifier);
 	$xml_writer->addXmlObject(P_INSTALL_TEST_VERSION, 1, pts_test_profile_version($identifier));
@@ -108,39 +108,67 @@ function pts_test_generate_install_xml($identifier)
 	$xml_writer->addXmlObject(P_INSTALL_TEST_LASTRUNTIME, 2, "0000-00-00 00:00:00");
 	$xml_writer->addXmlObject(P_INSTALL_TEST_TIMESRUN, 2, "0");
 
-	file_put_contents(TEST_ENV_DIR . $identifier . "/pts-install.xml", $xml_writer->getXML());
+	file_put_contents(TEST_ENV_DIR . $identifier . "/pts-install.xml", $xml_writer->getXML());*/
+	return pts_test_refresh_install_xml($identifier, 0, true);
 }
-function pts_test_refresh_install_xml($identifier, $this_test_duration = 0)
+function pts_test_refresh_install_xml($identifier, $this_test_duration = 0, $new_install = false)
 {
-	// Refresh the pts-install.xml for a test
-	if(is_file(TEST_ENV_DIR . $identifier . "/pts-install.xml"))
+	// Generate/refresh an install XML for pts-install.xml
+ 	$xml_parser = new tandem_XmlReader(TEST_ENV_DIR . $identifier . "/pts-install.xml", false);
+	$xml_writer = new tandem_XmlWriter();
+
+	$test_duration = $xml_parser->getXMLValue(P_INSTALL_TEST_AVG_RUNTIME);
+	if(!is_numeric($test_duration))
 	{
-	 	$xml_parser = new tandem_XmlReader(TEST_ENV_DIR . $identifier . "/pts-install.xml", false);
-		$xml_writer = new tandem_XmlWriter();
+		$test_duration = $this_test_duration;
+	}
+	if(is_numeric($this_test_duration) && $this_test_duration > 0)
+	{
+		$test_duration = ceil((($test_duration * $xml_parser->getXMLValue(P_INSTALL_TEST_TIMESRUN)) + $this_test_duration) / ($xml_parser->getXMLValue(P_INSTALL_TEST_TIMESRUN) + 1));
+	}
 
-		$test_duration = $xml_parser->getXMLValue(P_INSTALL_TEST_AVG_RUNTIME);
-		if(!is_numeric($test_duration))
-		{
-			$test_duration = $this_test_duration;
-		}
-		if(is_numeric($this_test_duration) && $this_test_duration > 0)
-		{
-			$test_duration = ceil((($test_duration * $xml_parser->getXMLValue(P_INSTALL_TEST_TIMESRUN)) + $this_test_duration) / ($xml_parser->getXMLValue(P_INSTALL_TEST_TIMESRUN) + 1));
-		}
+	$test_version = $xml_parser->getXMLValue(P_INSTALL_TEST_VERSION);
+	if(empty($test_version) || $new_install)
+	{
+		$test_version = pts_test_profile_version($identifier);
+	}
 
-		$xml_writer->addXmlObject(P_INSTALL_TEST_NAME, 1, $xml_parser->getXMLValue(P_INSTALL_TEST_NAME));
-		$xml_writer->addXmlObject(P_INSTALL_TEST_VERSION, 1, $xml_parser->getXMLValue(P_INSTALL_TEST_VERSION));
-		$xml_writer->addXmlObject(P_INSTALL_TEST_CHECKSUM, 1, $xml_parser->getXMLValue(P_INSTALL_TEST_CHECKSUM));
-		$xml_writer->addXmlObject(P_INSTALL_TEST_SYSIDENTIFY, 1, $xml_parser->getXMLValue(P_INSTALL_TEST_SYSIDENTIFY));
-		$xml_writer->addXmlObject(P_INSTALL_TEST_INSTALLTIME, 2, $xml_parser->getXMLValue(P_INSTALL_TEST_INSTALLTIME));
-		$xml_writer->addXmlObject(P_INSTALL_TEST_LASTRUNTIME, 2, date("Y-m-d H:i:s"));
-		$xml_writer->addXmlObject(P_INSTALL_TEST_TIMESRUN, 2, ($xml_parser->getXMLValue(P_INSTALL_TEST_TIMESRUN) + 1));
-		$xml_writer->addXmlObject(P_INSTALL_TEST_AVG_RUNTIME, 2, $test_duration, 2);
-
-		file_put_contents(TEST_ENV_DIR . $identifier . "/pts-install.xml", $xml_writer->getXML());
-		return true;
+	$test_checksum = $xml_parser->getXMLValue(P_INSTALL_TEST_CHECKSUM);
+	if(empty($test_checksum) || $new_install)
+	{
+		$test_checksum = pts_test_checksum_installer($identifier);
+	}
+
+	$sys_identifier = $xml_parser->getXMLValue(P_INSTALL_TEST_SYSIDENTIFY);
+	if(empty($sys_identifier) || $new_install)
+	{
+		$sys_identifier = pts_system_identifier_string();
+	}
+
+	$install_time = $xml_parser->getXMLValue(P_INSTALL_TEST_INSTALLTIME);
+	if(empty($install_time))
+	{
+		$install_time = date("Y-m-d H:i:s");
 	}
-	return false;
+
+	$times_run = $xml_parser->getXMLValue(P_INSTALL_TEST_TIMESRUN);
+	if($new_install && empty($times_run))
+	{
+		$times_run = 0;
+	}
+	if(!$new_install)
+		$times_run++;
+
+	$xml_writer->addXmlObject(P_INSTALL_TEST_NAME, 1, $identifier);
+	$xml_writer->addXmlObject(P_INSTALL_TEST_VERSION, 1, $test_version);
+	$xml_writer->addXmlObject(P_INSTALL_TEST_CHECKSUM, 1, $test_checksum);
+	$xml_writer->addXmlObject(P_INSTALL_TEST_SYSIDENTIFY, 1, $sys_identifier);
+	$xml_writer->addXmlObject(P_INSTALL_TEST_INSTALLTIME, 2, $install_time);
+	$xml_writer->addXmlObject(P_INSTALL_TEST_LASTRUNTIME, 2, date("Y-m-d H:i:s"));
+	$xml_writer->addXmlObject(P_INSTALL_TEST_TIMESRUN, 2, $times_run);
+	$xml_writer->addXmlObject(P_INSTALL_TEST_AVG_RUNTIME, 2, $test_duration, 2);
+
+	file_put_contents(TEST_ENV_DIR . $identifier . "/pts-install.xml", $xml_writer->getXML());
 }
 function pts_test_name_to_identifier($name)
 {