You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2007/06/23 02:58:06 UTC

svn commit: r549987 - in /jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters: TestElementConverter.java TestElementPropertyConverter.java

Author: sebb
Date: Fri Jun 22 17:58:05 2007
New Revision: 549987

URL: http://svn.apache.org/viewvc?view=rev&rev=549987
Log:
Don't save empty comments (except for test plan)

Modified:
    jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/TestElementConverter.java
    jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/TestElementPropertyConverter.java

Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/TestElementConverter.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/TestElementConverter.java?view=diff&rev=549987&r1=549986&r2=549987
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/TestElementConverter.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/TestElementConverter.java Fri Jun 22 17:58:05 2007
@@ -20,6 +20,7 @@
 
 import org.apache.jmeter.save.SaveService;
 import org.apache.jmeter.testelement.TestElement;
+import org.apache.jmeter.testelement.TestPlan;
 import org.apache.jmeter.testelement.property.JMeterProperty;
 import org.apache.jmeter.testelement.property.PropertyIterator;
 import org.apache.jorphan.logging.LoggingManager;
@@ -76,7 +77,15 @@
             JMeterProperty jmp=iter.next();
             // Skip special properties if required
             if (!testFormat22 || !ConversionHelp.isSpecialProperty(jmp.getName())) {
-                writeItem(jmp, context, writer);
+            	// Don't save empty comments - except for the TestPlan (to maintain compatibility)
+	       		if (!(
+		       			TestPlan.COMMENTS.equals(jmp.getName())
+		       			&& jmp.getStringValue().length()==0
+		       			&& !el.getClass().equals(TestPlan.class)
+	       			))
+	       		{
+		            writeItem(jmp, context, writer);
+	       		}
             }
 		}
 	}

Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/TestElementPropertyConverter.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/TestElementPropertyConverter.java?view=diff&rev=549987&r1=549986&r2=549987
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/TestElementPropertyConverter.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/TestElementPropertyConverter.java Fri Jun 22 17:58:05 2007
@@ -21,6 +21,7 @@
 import org.apache.jmeter.config.ConfigTestElement;
 import org.apache.jmeter.save.SaveService;
 import org.apache.jmeter.testelement.TestElement;
+import org.apache.jmeter.testelement.TestPlan;
 import org.apache.jmeter.testelement.property.JMeterProperty;
 import org.apache.jmeter.testelement.property.PropertyIterator;
 import org.apache.jmeter.testelement.property.TestElementProperty;
@@ -88,7 +89,12 @@
             // Skip special properties if required
             if (!testFormat22 || !ConversionHelp.isSpecialProperty(jmp.getName())) 
             {
-                writeItem(jmp, context, writer);
+            	// Don't save empty comments
+	       		if (!(TestPlan.COMMENTS.equals(jmp.getName())
+		       			&& jmp.getStringValue().length()==0))
+		       	{
+		            writeItem(jmp, context, writer);
+		       	}
             }
 		}
         //TODO clazz is probably always the same as testclass



---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org