You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by li...@apache.org on 2012/09/17 18:02:06 UTC

svn commit: r1386682 - in /incubator/ooo/trunk/test/testcommon/source/org/openoffice/test/common: SystemUtil.java XMLReporter.java

Author: liuzhe
Date: Mon Sep 17 16:02:05 2012
New Revision: 1386682

URL: http://svn.apache.org/viewvc?rev=1386682&view=rev
Log:
#120987 - Enable test automation framework to group test cases. Part 1

Modified:
    incubator/ooo/trunk/test/testcommon/source/org/openoffice/test/common/SystemUtil.java
    incubator/ooo/trunk/test/testcommon/source/org/openoffice/test/common/XMLReporter.java

Modified: incubator/ooo/trunk/test/testcommon/source/org/openoffice/test/common/SystemUtil.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testcommon/source/org/openoffice/test/common/SystemUtil.java?rev=1386682&r1=1386681&r2=1386682&view=diff
==============================================================================
--- incubator/ooo/trunk/test/testcommon/source/org/openoffice/test/common/SystemUtil.java (original)
+++ incubator/ooo/trunk/test/testcommon/source/org/openoffice/test/common/SystemUtil.java Mon Sep 17 16:02:05 2012
@@ -72,13 +72,6 @@ public class SystemUtil {
 			output.setLength(0);
 			if (exec(new String[]{"lsb_release", "-rs"}, output) == 0)
 				osVersion = output.toString().trim();	
-			
-			System.setProperty("info.os.name", SystemUtil.getOSName());
-			System.setProperty("info.os.version", SystemUtil.getOSVersion());
-			System.setProperty("info.os.arch", SystemUtil.getOSArch());
-			System.setProperty("info.os.arch", SystemUtil.getOSArch());
-			System.setProperty("info.ip", SystemUtil.getIPAddress());
-			System.setProperty("info.hostname", SystemUtil.getHostName());
 		}
 	}
 

Modified: incubator/ooo/trunk/test/testcommon/source/org/openoffice/test/common/XMLReporter.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testcommon/source/org/openoffice/test/common/XMLReporter.java?rev=1386682&r1=1386681&r2=1386682&view=diff
==============================================================================
--- incubator/ooo/trunk/test/testcommon/source/org/openoffice/test/common/XMLReporter.java (original)
+++ incubator/ooo/trunk/test/testcommon/source/org/openoffice/test/common/XMLReporter.java Mon Sep 17 16:02:05 2012
@@ -158,6 +158,13 @@ public class XMLReporter extends RunList
 		testsuiteEl.setAttribute("ignored", Long.toString(ignored));
 		Element props = doc.createElement("properties");
 		testsuiteEl.appendChild(props);
+		// Add some extra information
+		System.setProperty("info.os.name", SystemUtil.getOSName());
+		System.setProperty("info.os.version", SystemUtil.getOSVersion());
+		System.setProperty("info.os.arch", SystemUtil.getOSArch());
+		System.setProperty("info.os.arch", SystemUtil.getOSArch());
+		System.setProperty("info.ip", SystemUtil.getIPAddress());
+		System.setProperty("info.hostname", SystemUtil.getHostName());
 		Set<Entry<Object, Object>> entries = System.getProperties().entrySet();
 		for (Entry<Object, Object> e : entries) {
 			Element prop = doc.createElement("property");