mirror of https://github.com/apache/jmeter.git
				
				
				
			Bug 43450 (partial fix) - Allow SampleCount to be saved/restored from XML files too
git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/trunk@578339 13f79535-47bb-0310-9956-ffa450edef68
Former-commit-id: dad0225dd8
			
			
This commit is contained in:
		
							parent
							
								
									7a41d6236d
								
							
						
					
					
						commit
						00f537132d
					
				|  | @ -77,6 +77,7 @@ public class SampleResultConverter extends AbstractCollectionConverter { | ||||||
|     private static final String ATT_RESPONSE_CODE_OLD = "rs"; //$NON-NLS-1$ |     private static final String ATT_RESPONSE_CODE_OLD = "rs"; //$NON-NLS-1$ | ||||||
|      |      | ||||||
|     private static final String ATT_SUCCESS           = "s";  //$NON-NLS-1$ |     private static final String ATT_SUCCESS           = "s";  //$NON-NLS-1$ | ||||||
|  |     private static final String ATT_SAMPLE_COUNT      = "sc"; //$NON-NLS-1$ | ||||||
|     private static final String ATT_TIME              = "t";  //$NON-NLS-1$ |     private static final String ATT_TIME              = "t";  //$NON-NLS-1$ | ||||||
|     private static final String ATT_TIME_STAMP        = "ts"; //$NON-NLS-1$ |     private static final String ATT_TIME_STAMP        = "ts"; //$NON-NLS-1$ | ||||||
|     private static final String ATT_THREADNAME        = "tn"; //$NON-NLS-1$ |     private static final String ATT_THREADNAME        = "tn"; //$NON-NLS-1$ | ||||||
|  | @ -247,6 +248,9 @@ public class SampleResultConverter extends AbstractCollectionConverter { | ||||||
| 			writer.addAttribute(ATT_DATA_ENCODING, ConversionHelp.encode(res.getDataEncoding())); | 			writer.addAttribute(ATT_DATA_ENCODING, ConversionHelp.encode(res.getDataEncoding())); | ||||||
| 		if (save.saveBytes()) | 		if (save.saveBytes()) | ||||||
| 			writer.addAttribute(ATT_BYTES, String.valueOf(res.getBytes())); | 			writer.addAttribute(ATT_BYTES, String.valueOf(res.getBytes())); | ||||||
|  |         if (save.saveSampleCount()){ | ||||||
|  |         	writer.addAttribute(ATT_SAMPLE_COUNT, String.valueOf(res.getSampleCount())); | ||||||
|  |         } | ||||||
|         if (save.saveThreadCounts()){ |         if (save.saveThreadCounts()){ | ||||||
|            writer.addAttribute(ATT_GRP_THRDS, String.valueOf(res.getGroupThreads())); |            writer.addAttribute(ATT_GRP_THRDS, String.valueOf(res.getGroupThreads())); | ||||||
|            writer.addAttribute(ATT_ALL_THRDS, String.valueOf(res.getAllThreads())); |            writer.addAttribute(ATT_ALL_THRDS, String.valueOf(res.getAllThreads())); | ||||||
|  | @ -348,6 +352,7 @@ public class SampleResultConverter extends AbstractCollectionConverter { | ||||||
| 				Converter.getLong(reader.getAttribute(ATT_TIME))); | 				Converter.getLong(reader.getAttribute(ATT_TIME))); | ||||||
| 		res.setLatency(Converter.getLong(reader.getAttribute(ATT_LATENCY))); | 		res.setLatency(Converter.getLong(reader.getAttribute(ATT_LATENCY))); | ||||||
| 		res.setBytes(Converter.getInt(reader.getAttribute(ATT_BYTES))); | 		res.setBytes(Converter.getInt(reader.getAttribute(ATT_BYTES))); | ||||||
|  | 		res.setSampleCount(Converter.getInt(reader.getAttribute(ATT_SAMPLE_COUNT),1)); // default is 1 | ||||||
| 		res.setGroupThreads(Converter.getInt(reader.getAttribute(ATT_GRP_THRDS))); | 		res.setGroupThreads(Converter.getInt(reader.getAttribute(ATT_GRP_THRDS))); | ||||||
| 		res.setAllThreads(Converter.getInt(reader.getAttribute(ATT_ALL_THRDS))); | 		res.setAllThreads(Converter.getInt(reader.getAttribute(ATT_ALL_THRDS))); | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
|  | @ -58,7 +58,7 @@ | ||||||
| <li>Fixup broken jmeter-server script</li> | <li>Fixup broken jmeter-server script</li> | ||||||
| <li>Bug 43364 - option to revert If Controller to pre 2.3RC3 behaviour</li> | <li>Bug 43364 - option to revert If Controller to pre 2.3RC3 behaviour</li> | ||||||
| <li>Bug 43449 - Statistical Remote mode does not handle Latency</li> | <li>Bug 43449 - Statistical Remote mode does not handle Latency</li> | ||||||
| <li>Bug 43450 (partial fix) - Allow SampleCount to be saved/restored from CSV files</li> | <li>Bug 43450 (partial fix) - Allow SampleCount to be saved/restored from files</li> | ||||||
| </ul> | </ul> | ||||||
| 
 | 
 | ||||||
| <h4>Improvements</h4> | <h4>Improvements</h4> | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue