You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2019/07/02 20:31:16 UTC
[jmeter] branch master updated: Fix trailing space
This is an automated email from the ASF dual-hosted git repository.
pmouawad pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
The following commit(s) were added to refs/heads/master by this push:
new 02b9d8a Fix trailing space
02b9d8a is described below
commit 02b9d8aabbf6c9a170c611ae99e1c37a0934e842
Author: pmouawad <p....@ubik-ingenierie.com>
AuthorDate: Tue Jul 2 22:30:59 2019 +0200
Fix trailing space
---
.../org/apache/jmeter/threads/AbstractThreadGroup.java | 4 ++--
src/core/org/apache/jmeter/threads/JMeterThread.java | 2 +-
src/core/org/apache/jmeter/threads/ThreadGroup.java | 8 ++++----
src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java | 4 ++--
.../apache/jmeter/protocol/http/control/AuthManager.java | 2 +-
.../apache/jmeter/protocol/http/control/CacheManager.java | 2 +-
.../apache/jmeter/protocol/http/control/CookieManager.java | 2 +-
.../org/apache/jmeter/protocol/http/gui/AuthPanel.java | 6 +++---
.../apache/jmeter/protocol/http/gui/CacheManagerGui.java | 6 +++---
.../org/apache/jmeter/protocol/http/gui/CookiePanel.java | 2 +-
.../apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java | 4 ++--
.../http/control/TestAuthManagerThreadIteration.java | 2 +-
.../http/control/TestCacheManagerThreadIteration.java | 14 +++++++-------
.../http/control/TestCookieManagerThreadIteration.java | 4 ++--
14 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/src/core/org/apache/jmeter/threads/AbstractThreadGroup.java b/src/core/org/apache/jmeter/threads/AbstractThreadGroup.java
index 06ecc63..17ceed8 100644
--- a/src/core/org/apache/jmeter/threads/AbstractThreadGroup.java
+++ b/src/core/org/apache/jmeter/threads/AbstractThreadGroup.java
@@ -73,7 +73,7 @@ public abstract class AbstractThreadGroup extends AbstractTestElement
public static final String NUM_THREADS = "ThreadGroup.num_threads";
public static final String MAIN_CONTROLLER = "ThreadGroup.main_controller";
-
+
/** The same user or different users */
public static final String IS_SAME_USER_ON_NEXT_ITERATION = "ThreadGroup.same_user_on_next_iteration";
@@ -304,7 +304,7 @@ public abstract class AbstractThreadGroup extends AbstractTestElement
public void breakThreadLoop() {
((LoopController) getSamplerController()).breakLoop();
}
-
+
/**
* Set the kind of user
*
diff --git a/src/core/org/apache/jmeter/threads/JMeterThread.java b/src/core/org/apache/jmeter/threads/JMeterThread.java
index 2cec5e7..258c901 100644
--- a/src/core/org/apache/jmeter/threads/JMeterThread.java
+++ b/src/core/org/apache/jmeter/threads/JMeterThread.java
@@ -153,7 +153,7 @@ public class JMeterThread implements Runnable, Interruptible {
public JMeterThread(HashTree test, JMeterThreadMonitor monitor, ListenerNotifier note) {
this(test, monitor, note, false);
}
-
+
public JMeterThread(HashTree test, JMeterThreadMonitor monitor, ListenerNotifier note,Boolean isSameUserOnNextIteration) {
this.monitor = monitor;
threadVars = new JMeterVariables();
diff --git a/src/core/org/apache/jmeter/threads/ThreadGroup.java b/src/core/org/apache/jmeter/threads/ThreadGroup.java
index 6e70fe2..bf5c250 100644
--- a/src/core/org/apache/jmeter/threads/ThreadGroup.java
+++ b/src/core/org/apache/jmeter/threads/ThreadGroup.java
@@ -239,8 +239,8 @@ public class ThreadGroup extends AbstractThreadGroup {
log.debug("Computed delayForNextThreadInMillis:{} for thread:{}", delayForNextThreadInMillis, Thread.currentThread().getId());
}
lastThreadStartInMillis = nowInMillis;
- startNewThread(notifier, threadGroupTree, engine, threadNum, context,
- nowInMillis, Math.max(0, delayForNextThreadInMillis), isSameUserOnNextIteration);
+ startNewThread(notifier, threadGroupTree, engine, threadNum, context, nowInMillis, Math.max(0, delayForNextThreadInMillis),
+ isSameUserOnNextIteration);
}
}
log.info("Started thread group number {}", groupNumber);
@@ -293,12 +293,12 @@ public class ThreadGroup extends AbstractThreadGroup {
* @param engine {@link StandardJMeterEngine}
* @param threadNumber int thread number
* @param context {@link JMeterContext}
- * @param isSameUserOnNextIteration Boolean
+ * @param isSameUserOnNextIteration Boolean
* @return {@link JMeterThread}
*/
private JMeterThread makeThread(
ListenerNotifier notifier, ListedHashTree threadGroupTree,
- StandardJMeterEngine engine, int threadNumber,
+ StandardJMeterEngine engine, int threadNumber,
JMeterContext context, Boolean isSameUserOnNextIteration) { // N.B. Context needs to be fetched in the correct thread
boolean onErrorStopTest = getOnErrorStopTest();
boolean onErrorStopTestNow = getOnErrorStopTestNow();
diff --git a/src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java b/src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java
index 1010c3a..80bb43e 100644
--- a/src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java
+++ b/src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java
@@ -244,7 +244,7 @@ public class ThreadGroupGui extends AbstractThreadGroupGui implements ItemListen
// LOOP COUNT
threadPropsPanel.add(createControllerPanel());
- threadPropsPanel.add(createUserOptionsPanel());
+ threadPropsPanel.add(createUserOptionsPanel());
if (showDelayedStart) {
delayedStart = new JCheckBox(JMeterUtils.getResString("delayed_start")); // $NON-NLS-1$
threadPropsPanel.add(delayedStart);
@@ -268,7 +268,7 @@ public class ThreadGroupGui extends AbstractThreadGroupGui implements ItemListen
intgrationPanel.add(mainPanel);
add(intgrationPanel, BorderLayout.CENTER);
}
-
+
private JPanel createUserOptionsPanel(){
ButtonGroup group = new ButtonGroup();
sameUserBox = new JRadioButton(JMeterUtils.getResString("threadgroup_same_user")); //$NON-NLS-1$
diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/control/AuthManager.java b/src/protocol/http/org/apache/jmeter/protocol/http/control/AuthManager.java
index 8bc5148..f66c906 100644
--- a/src/protocol/http/org/apache/jmeter/protocol/http/control/AuthManager.java
+++ b/src/protocol/http/org/apache/jmeter/protocol/http/control/AuthManager.java
@@ -560,7 +560,7 @@ public class AuthManager extends ConfigTestElement implements TestStateListener,
kerberosManager.clearSubjects();
}
}
-
+
public boolean getControlledByThread() {
return getPropertyAsBoolean(CONTROLLED_BY_THREADGROUP);
}
diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/control/CacheManager.java b/src/protocol/http/org/apache/jmeter/protocol/http/control/CacheManager.java
index 529e460..e1a599a 100644
--- a/src/protocol/http/org/apache/jmeter/protocol/http/control/CacheManager.java
+++ b/src/protocol/http/org/apache/jmeter/protocol/http/control/CacheManager.java
@@ -633,7 +633,7 @@ public class CacheManager extends ConfigTestElement implements TestStateListener
@Override
public void testIterationStart(LoopIterationEvent event) {
JMeterVariables jMeterVariables = JMeterContextService.getContext().getVariables();
- if ((getControlledByThread() && !jMeterVariables.isSameUserOnNextIteration())
+ if ((getControlledByThread() && !jMeterVariables.isSameUserOnNextIteration())
|| (!getControlledByThread() && getClearEachIteration())) {
clearCache();
}
diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java b/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java
index 189030a..6ef4110 100644
--- a/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java
+++ b/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java
@@ -439,7 +439,7 @@ public class CookieManager extends ConfigTestElement implements TestStateListene
@Override
public void testIterationStart(LoopIterationEvent event) {
JMeterVariables jMeterVariables = JMeterContextService.getContext().getVariables();
- if ((getControlledByThread() && !jMeterVariables.isSameUserOnNextIteration())
+ if ((getControlledByThread() && !jMeterVariables.isSameUserOnNextIteration())
|| (!getControlledByThread() && getClearEachIteration())) {
log.debug("Initialise cookies from pre-defined list");
// No need to call clear
diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java b/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java
index 9b34541..fd349c3 100644
--- a/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java
+++ b/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java
@@ -144,7 +144,7 @@ public class AuthPanel extends AbstractConfigGui implements ActionListener {
public void configure(TestElement el) {
super.configure(el);
tableModel.manager.clear();
- AuthManager authManager = (AuthManager) el;
+ AuthManager authManager = (AuthManager) el;
tableModel.manager.addTestElement((AuthManager) authManager.clone());
clearEachIteration.setSelected(authManager.getClearEachIteration());
controlledByThreadGroup.setSelected(authManager.getControlledByThread());
@@ -175,7 +175,7 @@ public class AuthPanel extends AbstractConfigGui implements ActionListener {
clearEachIteration =
new JCheckBox(JMeterUtils.getResString("auth_manager_clear_per_iter"), false); //$NON-NLS-1$
- controlledByThreadGroup =
+ controlledByThreadGroup =
new JCheckBox(JMeterUtils.getResString("auth_manager_clear_controlled_by_threadgroup"), false); //$NON-NLS-1$
controlledByThreadGroup.setActionCommand(CONTROLLED_BY_THREADGROUP);
controlledByThreadGroup.addActionListener(this);
@@ -238,7 +238,7 @@ public class AuthPanel extends AbstractConfigGui implements ActionListener {
if (action.equals(CONTROLLED_BY_THREADGROUP)) {
clearEachIteration.setEnabled(!controlledByThreadGroup.isSelected());
}
-
+
if (action.equals(DELETE_COMMAND)) {
deleteRows();
}
diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/gui/CacheManagerGui.java b/src/protocol/http/org/apache/jmeter/protocol/http/gui/CacheManagerGui.java
index 8f9ada6..bf27a63 100644
--- a/src/protocol/http/org/apache/jmeter/protocol/http/gui/CacheManagerGui.java
+++ b/src/protocol/http/org/apache/jmeter/protocol/http/gui/CacheManagerGui.java
@@ -111,12 +111,12 @@ public class CacheManagerGui extends AbstractConfigGui implements ActionListener
setBorder(makeBorder());
clearEachIteration = new JCheckBox(JMeterUtils.getResString("clear_cache_per_iter"), false); // $NON-NLS-1$
-
- controlledByThreadGroup =
+
+ controlledByThreadGroup =
new JCheckBox(JMeterUtils.getResString("cache_clear_controlled_by_threadgroup"), false); //$NON-NLS-1$
controlledByThreadGroup.setActionCommand(CONTROLLED_BY_THREADGROUP);
controlledByThreadGroup.addActionListener(this);
-
+
useExpires = new JCheckBox(JMeterUtils.getResString("use_expires"), false); // $NON-NLS-1$
JPanel northPanel = new JPanel();
diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java b/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java
index 4f77a11..0058ffc 100644
--- a/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java
+++ b/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java
@@ -283,7 +283,7 @@ public class CookiePanel extends AbstractConfigGui implements ActionListener {
tableModel = new PowerTableModel(COLUMN_RESOURCE_NAMES, columnClasses);
clearEachIteration =
new JCheckBox(JMeterUtils.getResString("clear_cookies_per_iter"), false); //$NON-NLS-1$
- controlledByThreadGroup =
+ controlledByThreadGroup =
new JCheckBox(JMeterUtils.getResString("cookie_clear_controlled_by_threadgroup"), false); //$NON-NLS-1$
controlledByThreadGroup.setActionCommand(CONTROLLED_BY_THREADGROUP);
controlledByThreadGroup.addActionListener(this);
diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java b/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
index f93728f..e12b463 100644
--- a/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
+++ b/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
@@ -1792,11 +1792,11 @@ public class HTTPHC4Impl extends HTTPHCAbstractImpl {
Boolean.valueOf(RESET_STATE_ON_THREAD_GROUP_ITERATION));
JMeterVariables jMeterVariables = JMeterContextService.getContext().getVariables();
if (jMeterVariables.isSameUserOnNextIteration()) {
- log.debug("Thread Group is configured to simulate a returning visitor on each iteration, ignoring property value {}",
+ log.debug("Thread Group is configured to simulate a returning visitor on each iteration, ignoring property value {}",
RESET_STATE_ON_THREAD_GROUP_ITERATION);
resetStateOnThreadGroupIteration.set(false);
} else {
- log.debug("Thread Group is configured to simulate a new visitor on each iteration, using property value {}",
+ log.debug("Thread Group is configured to simulate a new visitor on each iteration, using property value {}",
RESET_STATE_ON_THREAD_GROUP_ITERATION);
resetStateOnThreadGroupIteration.set(Boolean.valueOf(RESET_STATE_ON_THREAD_GROUP_ITERATION));
}
diff --git a/test/src/org/apache/jmeter/protocol/http/control/TestAuthManagerThreadIteration.java b/test/src/org/apache/jmeter/protocol/http/control/TestAuthManagerThreadIteration.java
index 4282a2d..25a1aab 100644
--- a/test/src/org/apache/jmeter/protocol/http/control/TestAuthManagerThreadIteration.java
+++ b/test/src/org/apache/jmeter/protocol/http/control/TestAuthManagerThreadIteration.java
@@ -13,7 +13,7 @@
* 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.protocol.http.control;
diff --git a/test/src/org/apache/jmeter/protocol/http/control/TestCacheManagerThreadIteration.java b/test/src/org/apache/jmeter/protocol/http/control/TestCacheManagerThreadIteration.java
index d434416f..d05cea7 100644
--- a/test/src/org/apache/jmeter/protocol/http/control/TestCacheManagerThreadIteration.java
+++ b/test/src/org/apache/jmeter/protocol/http/control/TestCacheManagerThreadIteration.java
@@ -13,7 +13,7 @@
* 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.protocol.http.control;
@@ -87,7 +87,7 @@ public class TestCacheManagerThreadIteration {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.http.message.AbstractHttpMessage#getAllHeaders()
*/
@Override
@@ -97,7 +97,7 @@ public class TestCacheManagerThreadIteration {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.http.message.AbstractHttpMessage#addHeader(org.apache.http.Header)
*/
@@ -108,7 +108,7 @@ public class TestCacheManagerThreadIteration {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.http.message.AbstractHttpMessage#getFirstHeader(java.lang.String)
*/
@@ -123,7 +123,7 @@ public class TestCacheManagerThreadIteration {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.http.message.AbstractHttpMessage#getLastHeader(java.lang.String)
*/
@@ -138,7 +138,7 @@ public class TestCacheManagerThreadIteration {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.http.message.AbstractHttpMessage#getHeaders(java.lang.String)
*/
@Override
@@ -368,7 +368,7 @@ public class TestCacheManagerThreadIteration {
this.cacheManager.testIterationStart(null);
assertNull("After iterantion, should not find entry", getThreadCacheEntry(LOCAL_HOST));
assertFalse("After iterantion, should not find valid entry", this.cacheManager.inCache(url, headers));
-
+
//Controlled by cacheManager
jmvars.putObject(SAME_USER, true);
jmctx.setVariables(jmvars);
diff --git a/test/src/org/apache/jmeter/protocol/http/control/TestCookieManagerThreadIteration.java b/test/src/org/apache/jmeter/protocol/http/control/TestCookieManagerThreadIteration.java
index 20c0586..f075f68 100644
--- a/test/src/org/apache/jmeter/protocol/http/control/TestCookieManagerThreadIteration.java
+++ b/test/src/org/apache/jmeter/protocol/http/control/TestCookieManagerThreadIteration.java
@@ -13,7 +13,7 @@
* 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.protocol.http.control;
@@ -156,7 +156,7 @@ public class TestCookieManagerThreadIteration {
cookieManagerDynamic.getCookies().get(0).getName());
assertTrue("After the iteration, the quantity of cookies should be 1",
cookieManagerDynamic.getCookies().size() == 1);
-
+
// Controlled by CookieManager
jmvars.putObject(SAME_USER, false);
jmctx.setVariables(jmvars);