incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lil...@apache.org
Subject svn commit: r1387425 - in /incubator/ooo/trunk/test: testcommon/source/org/openoffice/test/Run.java testuno/source/pvt/uno/Conversion.java
Date Wed, 19 Sep 2012 01:40:31 GMT
Author: liliny
Date: Wed Sep 19 01:40:30 2012
New Revision: 1387425

URL: http://svn.apache.org/viewvc?rev=1387425&view=rev
Log:
Add propertyfile argument in Run.java

Modified:
    incubator/ooo/trunk/test/testcommon/source/org/openoffice/test/Run.java
    incubator/ooo/trunk/test/testuno/source/pvt/uno/Conversion.java

Modified: incubator/ooo/trunk/test/testcommon/source/org/openoffice/test/Run.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testcommon/source/org/openoffice/test/Run.java?rev=1387425&r1=1387424&r2=1387425&view=diff
==============================================================================
--- incubator/ooo/trunk/test/testcommon/source/org/openoffice/test/Run.java (original)
+++ incubator/ooo/trunk/test/testcommon/source/org/openoffice/test/Run.java Wed Sep 19 01:40:30
2012
@@ -90,7 +90,7 @@ public class Run {
 				if (++i >= args.length)
 					printUsage("Invalid arguments", 1);
 				Properties props = FileUtil.loadProperties(args[i]);
-				System.setProperties(props);
+				System.getProperties().putAll(props);
 			} else if (arg.equals("-r")) {
 				if (++i >= args.length)
 					printUsage("Invalid arguments", 1);

Modified: incubator/ooo/trunk/test/testuno/source/pvt/uno/Conversion.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testuno/source/pvt/uno/Conversion.java?rev=1387425&r1=1387424&r2=1387425&view=diff
==============================================================================
--- incubator/ooo/trunk/test/testuno/source/pvt/uno/Conversion.java (original)
+++ incubator/ooo/trunk/test/testuno/source/pvt/uno/Conversion.java Wed Sep 19 01:40:30 2012
@@ -72,7 +72,7 @@ public class Conversion {
 			+ "-f .*\\.((odp)|(otp))$ 'MS PowerPoint 97' ppt");
 
 	@FileRepeat
-	public static int repeat = 8;
+	public static int repeat = Integer.parseInt(System.getProperty("conversion.repeat", "8"));
 	
 	private static UnoApp app = new UnoApp();
 	
@@ -139,7 +139,7 @@ public class Conversion {
 	public void after() throws Exception{
 		result.println(sourceFileId + "," + scenario + "," + closeTime + "," + saveTime + "," +
loadTime);
 		log.info("Result [After Closing: " + closeTime + "] [After Saving: " + saveTime + "] [After
Loading: " + loadTime + "]");
-		if (counter % 8 == 0) {
+		if (counter % repeat == 0) {
 			app.close();
 		}
 	}



Mime
View raw message