Author: sebb
Date: Mon Nov 12 17:20:20 2007
New Revision: 594385
URL: http://svn.apache.org/viewvc?rev=594385&view=rev
Log:
Initial attempt at saving using SampleEvent.
Does not work yet; also needs to be enabled in SaveService.
Added:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleEventConverter.java
(with props)
Modified:
jakarta/jmeter/trunk/bin/saveservice.properties
Modified: jakarta/jmeter/trunk/bin/saveservice.properties
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/bin/saveservice.properties?rev=594385&r1=594384&r2=594385&view=diff
==============================================================================
--- jakarta/jmeter/trunk/bin/saveservice.properties (original)
+++ jakarta/jmeter/trunk/bin/saveservice.properties Mon Nov 12 17:20:20 2007
@@ -277,6 +277,7 @@
testResults=org.apache.jmeter.save.TestResultWrapper
assertionResult=org.apache.jmeter.assertions.AssertionResult
monitorStats=org.apache.jmeter.visualizers.MonitorStats
+sampleEvent=org.apache.jmeter.samplers.SampleEvent
#
# Converters to register. Must start line with '_'
# If the converter is a collection of subitems, set equal to "collection"
@@ -287,6 +288,7 @@
_org.apache.jmeter.save.converters.IntegerPropertyConverter=
_org.apache.jmeter.save.converters.LongPropertyConverter=
_org.apache.jmeter.save.converters.MultiPropertyConverter=collection
+_org.apache.jmeter.save.converters.SampleEventConverter=
_org.apache.jmeter.save.converters.SampleResultConverter=collection
_org.apache.jmeter.save.converters.SampleSaveConfigurationConverter=collection
_org.apache.jmeter.save.converters.StringPropertyConverter=
Added:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleEventConverter.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleEventConverter.java?rev=594385&view=auto
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleEventConverter.java
(added)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleEventConverter.java
Mon Nov 12 17:20:20 2007
@@ -0,0 +1,66 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.jmeter.save.converters;
+
+import org.apache.jmeter.protocol.http.sampler.HTTPSampleResult;
+import org.apache.jmeter.samplers.SampleEvent;
+import org.apache.jmeter.samplers.SampleResult;
+
+import com.thoughtworks.xstream.converters.Converter;
+import com.thoughtworks.xstream.converters.MarshallingContext;
+import com.thoughtworks.xstream.converters.UnmarshallingContext;
+import com.thoughtworks.xstream.io.HierarchicalStreamReader;
+import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
+
+/**
+ * XStream Converter for the SampleResult class
+ */
+public class SampleEventConverter implements Converter {
+ /**
+ * Returns the converter version; used to check for possible
+ * incompatibilities
+ */
+ public static String getVersion() {
+ return "$Revision$"; //$NON-NLS-1$
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
com.thoughtworks.xstream.converters.Converter#canConvert(java.lang.Class)
+ */
+ public boolean canConvert(Class arg0) {
+ return SampleEvent.class.equals(arg0);
+ }
+
+ // TODO save hostname; save sample type (plain or http)
+ public void marshal(Object source, HierarchicalStreamWriter writer,
+ MarshallingContext context) {
+ SampleEvent evt = (SampleEvent) source;
+ Object res = evt.getResult();
+ context.convertAnother(res);
+ }
+
+ // TODO does not work yet; need to determine the sample type
+ public Object unmarshal(HierarchicalStreamReader reader,
+ UnmarshallingContext context) {
+ SampleEvent evt = new SampleEvent();
+ return evt;
+ }
+}
\ No newline at end of file
Propchange:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleEventConverter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleEventConverter.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
