Skip to content

Commit

Permalink
Release XLT 7.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jowerner committed Oct 20, 2023
2 parents fddd92b + af86dbb commit 7cde978
Show file tree
Hide file tree
Showing 87 changed files with 2,213 additions and 1,216 deletions.
2 changes: 1 addition & 1 deletion .settings/org.eclipse.jdt.core.prefs
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ org.eclipse.jdt.core.formatter.alignment_for_assignment=0
org.eclipse.jdt.core.formatter.alignment_for_binary_expression=18
org.eclipse.jdt.core.formatter.alignment_for_compact_if=18
org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=18
org.eclipse.jdt.core.formatter.alignment_for_enum_constants=50
org.eclipse.jdt.core.formatter.alignment_for_enum_constants=49
org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
Expand Down
6 changes: 6 additions & 0 deletions config/ec2_admin.properties
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,22 @@
#aws.keypair.ap-northeast-2 =
#aws.keypair.ap-northeast-3 =
#aws.keypair.ap-south-1 =
#aws.keypair.ap-south-2 =
#aws.keypair.ap-southeast-1 =
#aws.keypair.ap-southeast-2 =
#aws.keypair.ap-southeast-3 =
#aws.keypair.ap-southeast-4 =
#aws.keypair.ca-central-1 =
#aws.keypair.eu-central-1 =
#aws.keypair.eu-central-2 =
#aws.keypair.eu-north-1 =
#aws.keypair.eu-south-1 =
#aws.keypair.eu-south-2 =
#aws.keypair.eu-west-1 =
#aws.keypair.eu-west-2 =
#aws.keypair.eu-west-3 =
#aws.keypair.il-central-1 =
#aws.keypair.me-central-1 =
#aws.keypair.me-south-1 =
#aws.keypair.sa-east-1 =
#aws.keypair.us-east-1 =
Expand Down
5 changes: 0 additions & 5 deletions config/mastercontroller.properties
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,6 @@ com.xceptance.xlt.mastercontroller.testSuitePath = samples/testsuite-posters
# Console UI
# ==================

## Whether to display detailed status information for each simulated test user.
## If set to false, status information will be aggregated into one line per
## user type.
com.xceptance.xlt.mastercontroller.ui.status.detailedList = false

## The number of seconds to wait before the status list is updated again.
com.xceptance.xlt.mastercontroller.ui.status.updateInterval = 5

Expand Down
13 changes: 10 additions & 3 deletions config/testreport/css/default.css
Original file line number Diff line number Diff line change
Expand Up @@ -1596,9 +1596,16 @@ tr:hover td.n90 , tr:hover td.n91 , tr:hover td.n92 , tr:hover td.n93 , tr:hover
tr:hover td.n100 { background: linear-gradient(rgb(200,120,120), rgba(0,0,0,0), rgb(200,120,120)) !important; }


.added { color: #888 !important;}
.removed { color: #888 !important;}
.infinity { background-color: rgb(200,120,120) !important;}
.added { color: #888 !important; }
.removed { color: #888 !important; }

.infinity {
background-color: rgb(200,120,120) !important;
/* The infinity symbol is rather small, so we use a larger font size for it, however, without increasing the height of the table cell. */
font-size: 1.3rem;
line-height: 0;
}
tr:hover .infinity { background: linear-gradient(rgb(200,120,120), rgba(0,0,0,0), rgb(200,120,120)) !important; }


/*
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>com.xceptance</groupId>
<artifactId>xlt</artifactId>
<version>7.2.0</version>
<version>7.3.0</version>
<packaging>jar</packaging>

<name>XLT</name>
Expand Down Expand Up @@ -310,7 +310,7 @@
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20230227</version>
<version>20231013</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down Expand Up @@ -406,7 +406,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>31.1-jre</version>
<version>32.1.2-jre</version>
</dependency>
<!-- Script-Doc Generator -->
<dependency>
Expand Down
14 changes: 11 additions & 3 deletions samples/testsuite-performance/config/default.properties
Original file line number Diff line number Diff line change
Expand Up @@ -181,11 +181,19 @@ com.xceptance.xlt.staticContentCache.size = 1000
#
################################################################################

## Whether JavaScript is enabled.
com.xceptance.xlt.javaScriptEnabled = true
## Whether the JavaScript Engine is enabled. Default is false.
## The JS engine of the HtmlUnit web client is heavy so if you don't need it,
## don't enable it.
#com.xceptance.xlt.javaScriptEngineEnabled = false

## Whether the execution of JavaScript code in a Web page is enabled. Default
## is false. When enabling it, ensure the javaScriptEngineEnabled flag above
## is true as well.
#com.xceptance.xlt.javaScriptEnabled = false

## Whether the JavaScript debugger (function call logger) is enabled.
com.xceptance.xlt.js.debugger.enabled = false
## Default is false.
#com.xceptance.xlt.js.debugger.enabled = false

## In case the JavaScript debugger is enabled, this setting controls whether
## downloaded JavaScript content should be beautified in order to ease debugging.
Expand Down
12 changes: 10 additions & 2 deletions samples/testsuite-posters/config/default.properties
Original file line number Diff line number Diff line change
Expand Up @@ -181,11 +181,19 @@ com.xceptance.xlt.staticContentCache.size = 1000
#
################################################################################

## Whether JavaScript is enabled.
## Whether the JavaScript Engine is enabled. Default is false.
## The JS engine of the HtmlUnit web client is heavy so if you don't need it,
## don't enable it.
com.xceptance.xlt.javaScriptEngineEnabled = true

## Whether the execution of JavaScript code in a Web page is enabled. Default
## is false. When enabling it, ensure the javaScriptEngineEnabled flag above
## is true as well.
com.xceptance.xlt.javaScriptEnabled = true

## Whether the JavaScript debugger (function call logger) is enabled.
com.xceptance.xlt.js.debugger.enabled = false
## Default is false.
#com.xceptance.xlt.js.debugger.enabled = false

## In case the JavaScript debugger is enabled, this setting controls whether
## downloaded JavaScript content should be beautified in order to ease debugging.
Expand Down
12 changes: 10 additions & 2 deletions samples/testsuite-showcases/config/default.properties
Original file line number Diff line number Diff line change
Expand Up @@ -181,11 +181,19 @@ com.xceptance.xlt.staticContentCache.size = 1000
#
################################################################################

## Whether JavaScript is enabled.
## Whether the JavaScript Engine is enabled. Default is false.
## The JS engine of the HtmlUnit web client is heavy so if you don't need it,
## don't enable it.
com.xceptance.xlt.javaScriptEngineEnabled = true

## Whether the execution of JavaScript code in a Web page is enabled. Default
## is false. When enabling it, ensure the javaScriptEngineEnabled flag above
## is true as well.
com.xceptance.xlt.javaScriptEnabled = true

## Whether the JavaScript debugger (function call logger) is enabled.
com.xceptance.xlt.js.debugger.enabled = false
## Default is false.
#com.xceptance.xlt.js.debugger.enabled = false

## In case the JavaScript debugger is enabled, this setting controls whether
## downloaded JavaScript content should be beautified in order to ease debugging.
Expand Down
14 changes: 11 additions & 3 deletions samples/testsuite-template/config/default.properties
Original file line number Diff line number Diff line change
Expand Up @@ -181,11 +181,19 @@ com.xceptance.xlt.staticContentCache.size = 1000
#
################################################################################

## Whether JavaScript is enabled.
com.xceptance.xlt.javaScriptEnabled = true
## Whether the JavaScript Engine is enabled. Default is false.
## The JS engine of the HtmlUnit web client is heavy so if you don't need it,
## don't enable it.
#com.xceptance.xlt.javaScriptEngineEnabled = false

## Whether the execution of JavaScript code in a Web page is enabled. Default
## is false. When enabling it, ensure the javaScriptEngineEnabled flag above
## is true as well.
#com.xceptance.xlt.javaScriptEnabled = false

## Whether the JavaScript debugger (function call logger) is enabled.
com.xceptance.xlt.js.debugger.enabled = false
## Default is false.
#com.xceptance.xlt.js.debugger.enabled = false

## In case the JavaScript debugger is enabled, this setting controls whether
## downloaded JavaScript content should be beautified in order to ease debugging.
Expand Down
12 changes: 10 additions & 2 deletions samples/testsuite-xlt/config/default.properties
Original file line number Diff line number Diff line change
Expand Up @@ -181,11 +181,19 @@ com.xceptance.xlt.staticContentCache.size = 1000
#
################################################################################

## Whether JavaScript is enabled.
## Whether the JavaScript Engine is enabled. Default is false.
## The JS engine of the HtmlUnit web client is heavy so if you don't need it,
## don't enable it.
com.xceptance.xlt.javaScriptEngineEnabled = true

## Whether the execution of JavaScript code in a Web page is enabled. Default
## is false. When enabling it, ensure the javaScriptEngineEnabled flag above
## is true as well.
com.xceptance.xlt.javaScriptEnabled = true

## Whether the JavaScript debugger (function call logger) is enabled.
com.xceptance.xlt.js.debugger.enabled = false
## Default is false.
#com.xceptance.xlt.js.debugger.enabled = false

## In case the JavaScript debugger is enabled, this setting controls whether
## downloaded JavaScript content should be beautified in order to ease debugging.
Expand Down
10 changes: 8 additions & 2 deletions src/main/java/com/xceptance/common/collection/FastHashMap.java
Original file line number Diff line number Diff line change
Expand Up @@ -79,17 +79,23 @@ public V get( final K key )
if ( k == FREE_KEY )
return null; //end of chain already

if ( k.equals( key ) ) //we check FREE and REMOVED prior to this call
if ( k.hashCode() == key.hashCode() && k.equals( key ) ) //we check FREE and REMOVED prior to this call
{
return (V) m_data[ ptr + 1 ];
}

while ( true )
{
ptr = (ptr + 2) & m_mask2; //that's next index
k = m_data[ ptr ];
if ( k == FREE_KEY )
{
return null;
if ( k.equals( key ) )
}
if ( k.hashCode() == key.hashCode() && k.equals( key ) )
{
return (V) m_data[ ptr + 1 ];
}
}
}

Expand Down
15 changes: 15 additions & 0 deletions src/main/java/com/xceptance/common/io/IoActionHandler.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
/*
* Copyright (c) 2005-2023 Xceptance Software Technologies GmbH
*
* Licensed 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 com.xceptance.common.io;

import java.io.IOException;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

import java.io.IOException;
import java.io.Reader;
import java.io.Serializable;
import java.io.Writer;
import java.nio.CharBuffer;
import java.util.Iterator;
Expand Down Expand Up @@ -409,9 +408,6 @@ public int readFrom(final Readable readable) throws IOException {
* @return this, to enable chaining
*/
public OpenStringBuilder appendNull() {
if (nullText == null) {
return this;
}
return append(nullText);
}

Expand Down
Loading

0 comments on commit 7cde978

Please sign in to comment.