mirror of https://github.com/apache/jmeter.git
Bug 60144 - View Results Tree : Add a more up to date Browser Renderer to replace old Render
Bugzilla Id: 60144
git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1771577 13f79535-47bb-0310-9956-ffa450edef68
Former-commit-id: 9d6acdf646
This commit is contained in:
Philippe Mouawad
parent
e3526fbba0
commit
e2a0688b97
|
|
@ -0,0 +1,193 @@
|
|||
/*
|
||||
* 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.visualizers;
|
||||
|
||||
import java.awt.BorderLayout;
|
||||
import java.awt.Dimension;
|
||||
|
||||
import javafx.application.Platform;
|
||||
import javafx.beans.value.ChangeListener;
|
||||
import javafx.beans.value.ObservableValue;
|
||||
import javafx.concurrent.Worker.State;
|
||||
import javafx.embed.swing.JFXPanel;
|
||||
import javafx.event.EventHandler;
|
||||
import javafx.scene.Scene;
|
||||
import javafx.scene.web.WebEngine;
|
||||
import javafx.scene.web.WebEvent;
|
||||
import javafx.scene.web.WebView;
|
||||
|
||||
import javax.swing.BorderFactory;
|
||||
import javax.swing.JLabel;
|
||||
import javax.swing.JOptionPane;
|
||||
import javax.swing.JPanel;
|
||||
import javax.swing.JProgressBar;
|
||||
import javax.swing.SwingUtilities;
|
||||
|
||||
import org.apache.jmeter.samplers.SampleResult;
|
||||
import org.apache.jmeter.util.JMeterUtils;
|
||||
|
||||
/**
|
||||
* {@link ResultRenderer} implementation that uses JAVAFX WebEngine to render as browser do
|
||||
* @since 3.2
|
||||
*/
|
||||
public class RenderInBrowser extends SamplerResultTab implements ResultRenderer {
|
||||
|
||||
private final JFXPanel jfxPanel = new JFXPanel();
|
||||
private WebEngine engine;
|
||||
private final JLabel lblStatus = new JLabel();
|
||||
private final JProgressBar progressBar = new JProgressBar();
|
||||
|
||||
private JPanel browserPanel;
|
||||
|
||||
/** {@inheritDoc} */
|
||||
@Override
|
||||
public void renderResult(SampleResult sampleResult) {
|
||||
String response = ViewResultsFullVisualizer
|
||||
.getResponseAsString(sampleResult);
|
||||
showRenderedResponse(response, sampleResult);
|
||||
}
|
||||
|
||||
protected void showRenderedResponse(String response, SampleResult res) {
|
||||
if (response == null) {
|
||||
results.setText("");
|
||||
return;
|
||||
}
|
||||
|
||||
int htmlIndex = response.indexOf("<HTML"); // could be <HTML lang=""> //
|
||||
// $NON-NLS-1$
|
||||
|
||||
// Look for a case variation
|
||||
if (htmlIndex < 0) {
|
||||
htmlIndex = response.indexOf("<html"); // ditto // $NON-NLS-1$
|
||||
}
|
||||
|
||||
// If we still can't find it, just try using all of the text
|
||||
if (htmlIndex < 0) {
|
||||
htmlIndex = 0;
|
||||
}
|
||||
|
||||
final String html = response.substring(htmlIndex);
|
||||
|
||||
if (browserPanel == null) {
|
||||
browserPanel = initComponents(html);
|
||||
}
|
||||
browserPanel.setVisible(true);
|
||||
resultsScrollPane.setViewportView(browserPanel);
|
||||
Platform.runLater(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
engine.loadContent(html);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private JPanel initComponents(String htmlContent) {
|
||||
createScene(htmlContent);
|
||||
|
||||
progressBar.setPreferredSize(new Dimension(150, 18));
|
||||
progressBar.setStringPainted(true);
|
||||
|
||||
JPanel statusBar = new JPanel(new BorderLayout(5, 0));
|
||||
statusBar.setBorder(BorderFactory.createEmptyBorder(3, 5, 3, 5));
|
||||
statusBar.add(lblStatus, BorderLayout.CENTER);
|
||||
statusBar.add(progressBar, BorderLayout.WEST);
|
||||
|
||||
JPanel panel = new JPanel(new BorderLayout());
|
||||
panel.setPreferredSize(new Dimension(1024, 600));
|
||||
panel.add(statusBar, BorderLayout.NORTH);
|
||||
panel.add(jfxPanel, BorderLayout.CENTER);
|
||||
return panel;
|
||||
}
|
||||
|
||||
private void createScene(final String htmlContent) {
|
||||
Platform.setImplicitExit(false);
|
||||
Platform.runLater(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
|
||||
WebView view = new WebView();
|
||||
engine = view.getEngine();
|
||||
|
||||
engine.setOnStatusChanged(new EventHandler<WebEvent<String>>() {
|
||||
@Override
|
||||
public void handle(final WebEvent<String> event) {
|
||||
SwingUtilities.invokeLater(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
lblStatus.setText(event.getData());
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
engine.getLoadWorker().workDoneProperty()
|
||||
.addListener(new ChangeListener<Number>() {
|
||||
@Override
|
||||
public void changed(
|
||||
ObservableValue<? extends Number> observableValue,
|
||||
Number oldValue, final Number newValue) {
|
||||
SwingUtilities.invokeLater(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
progressBar.setValue(newValue
|
||||
.intValue());
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
engine.getLoadWorker().exceptionProperty()
|
||||
.addListener(new ChangeListener<Throwable>() {
|
||||
|
||||
@Override
|
||||
public void changed(
|
||||
ObservableValue<? extends Throwable> o,
|
||||
Throwable old, final Throwable value) {
|
||||
if (engine.getLoadWorker().getState() == State.FAILED) {
|
||||
SwingUtilities.invokeLater(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
JOptionPane
|
||||
.showMessageDialog(
|
||||
resultsScrollPane,
|
||||
(value != null) ? engine
|
||||
.getLocation()
|
||||
+ "\n"
|
||||
+ value.getMessage()
|
||||
: engine.getLocation()
|
||||
+ "\nUnexpected error.",
|
||||
"Loading error...",
|
||||
JOptionPane.ERROR_MESSAGE);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
jfxPanel.setScene(new Scene(view));
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
/** {@inheritDoc} */
|
||||
@Override
|
||||
public String toString() {
|
||||
return JMeterUtils.getResString("view_results_render_browser"); // $NON-NLS-1$
|
||||
}
|
||||
}
|
||||
|
|
@ -1250,7 +1250,8 @@ view_results_in_table=View Results in Table
|
|||
view_results_latency=Latency:
|
||||
view_results_connect_time=Connect Time:
|
||||
view_results_load_time=Load time:
|
||||
view_results_render=Render:
|
||||
view_results_render=Render:
|
||||
view_results_render_browser=Browser
|
||||
view_results_render_document=Document
|
||||
view_results_render_html=HTML
|
||||
view_results_render_html_embedded=HTML (download resources)
|
||||
|
|
|
|||
|
|
@ -1235,7 +1235,8 @@ view_results_fields=champs \:
|
|||
view_results_in_table=Tableau de r\u00E9sultats
|
||||
view_results_latency=Latence \:
|
||||
view_results_load_time=Temps de r\u00E9ponse \:
|
||||
view_results_render=Rendu \:
|
||||
view_results_render=Rendu \:
|
||||
view_results_render_browser=Navigateur
|
||||
view_results_render_document=Document
|
||||
view_results_render_html=HTML
|
||||
view_results_render_html_embedded=HTML et ressources
|
||||
|
|
|
|||
|
|
@ -110,6 +110,7 @@ Fill in some detail.
|
|||
|
||||
<h3>Listeners</h3>
|
||||
<ul>
|
||||
<li><bug>60144</bug>View Results Tree : Add a more up to date Browser Renderer to replace old Render</li>
|
||||
</ul>
|
||||
|
||||
<h3>Timers, Assertions, Config, Pre- & Post-Processors</h3>
|
||||
|
|
|
|||
Loading…
Reference in New Issue