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 2017/02/02 20:28:53 UTC
svn commit: r1781466 - in /jmeter/trunk:
src/core/org/apache/jmeter/util/ScriptingTestElement.java
test/src/org/apache/jmeter/timers/ConstantThroughputTimerTest.java
test/src/org/apache/jmeter/timers/PackageTest.java
Author: pmouawad
Date: Thu Feb 2 20:28:53 2017
New Revision: 1781466
URL: http://svn.apache.org/viewvc?rev=1781466&view=rev
Log:
Add a Unit test for JSR223 Timer .
Drop duplicate test on BSF Timer
Removed:
jmeter/trunk/test/src/org/apache/jmeter/timers/PackageTest.java
Modified:
jmeter/trunk/src/core/org/apache/jmeter/util/ScriptingTestElement.java
jmeter/trunk/test/src/org/apache/jmeter/timers/ConstantThroughputTimerTest.java
Modified: jmeter/trunk/src/core/org/apache/jmeter/util/ScriptingTestElement.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/util/ScriptingTestElement.java?rev=1781466&r1=1781465&r2=1781466&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/util/ScriptingTestElement.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/util/ScriptingTestElement.java Thu Feb 2 20:28:53 2017
@@ -37,7 +37,7 @@ public abstract class ScriptingTestEleme
protected String scriptLanguage = ""; // BSF/JSR223 language to use
- protected final static String DEFAULT_SCRIPT_LANGUAGE = "groovy"; // if no language is chosen in GUI
+ public final static String DEFAULT_SCRIPT_LANGUAGE = "groovy"; // if no language is chosen in GUI
//-- For TestBean implementations only
Modified: jmeter/trunk/test/src/org/apache/jmeter/timers/ConstantThroughputTimerTest.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/timers/ConstantThroughputTimerTest.java?rev=1781466&r1=1781465&r2=1781466&view=diff
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/timers/ConstantThroughputTimerTest.java (original)
+++ jmeter/trunk/test/src/org/apache/jmeter/timers/ConstantThroughputTimerTest.java Thu Feb 2 20:28:53 2017
@@ -20,9 +20,12 @@ package org.apache.jmeter.timers;
import static org.junit.Assert.assertEquals;
+import java.util.UUID;
+
import org.apache.jmeter.threads.JMeterContextService;
import org.apache.jmeter.threads.TestJMeterContextService;
import org.apache.jmeter.util.BeanShellInterpreter;
+import org.apache.jmeter.util.ScriptingTestElement;
import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger;
import org.junit.Test;
@@ -81,19 +84,31 @@ public class ConstantThroughputTimerTest
return;
}
BeanShellTimer timer = new BeanShellTimer();
- long delay;
timer.setScript("\"60\"");
- delay = timer.delay();
- assertEquals(60,delay);
+ assertEquals(60, timer.delay());
+
+ timer.setScript("60");
+ assertEquals(60, timer.delay());
+
+ timer.setScript("5*3*4");
+ assertEquals(60,timer.delay());
+ }
+
+ @Test
+ public void testTimerJSR223Timer() throws Exception {
+ JSR223Timer timer = new JSR223Timer();
+ timer.setScriptLanguage(ScriptingTestElement.DEFAULT_SCRIPT_LANGUAGE);
+ timer.setCacheKey(UUID.randomUUID().toString());
+
+ timer.setScript("\"60\"");
+ assertEquals(60, timer.delay());
timer.setScript("60");
- delay = timer.delay();
- assertEquals(60,delay);
+ assertEquals(60, timer.delay());
timer.setScript("5*3*4");
- delay = timer.delay();
- assertEquals(60,delay);
+ assertEquals(60,timer.delay());
}
}