svn commit: r919915 - in /jakarta/jmeter/trunk: docs/images/screenshots/junit_sampler.png xdocs/images/screenshots/junit_sampler.png xdocs/usermanual/component_reference.xml

[sebb]

Author: sebb
Date: Sun Mar  7 02:52:29 2010
New Revision: 919915

URL: http://svn.apache.org/viewvc?rev=919915&view=rev
Log:
Add details of JUnit4 support

Modified:
    jakarta/jmeter/trunk/docs/images/screenshots/junit_sampler.png
    jakarta/jmeter/trunk/xdocs/images/screenshots/junit_sampler.png
    jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml

Modified: jakarta/jmeter/trunk/docs/images/screenshots/junit_sampler.png
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/images/screenshots/junit_sampler.png?rev=919915&r1=919914&r2=919915&view=diff
==============================================================================
Binary files - no diff available.

Modified: jakarta/jmeter/trunk/xdocs/images/screenshots/junit_sampler.png
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/images/screenshots/junit_sampler.png?rev=919915&r1=919914&r2=919915&view=diff
==============================================================================
Binary files - no diff available.

Modified: jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml?rev=919915&r1=919914&r2=919915&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml (original)
+++ jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml Sun Mar  7 
02:52:29 2010
@@ -1251,7 +1251,7 @@
 
 
 
-<component name="JUnit Request" index="&sect-num;.1.16"  width="525" 
height="479" screenshot="junit_sampler.png">
+<component name="JUnit Request" index="&sect-num;.1.16"  width="457" 
height="507" screenshot="junit_sampler.png">
 <description>
 The current implementation supports standard Junit convention and extensions. 
It also
 includes extensions like oneTimeSetUp and oneTimeTearDown. The sampler works 
like the
@@ -1294,6 +1294,7 @@
 </description>
 <properties>
   <property name="Name" required="">Descriptive name for this element that is 
shown in the tree.</property>
+  <property name="Search for JUnit4 annotations" required="Yes">Select this to 
search for JUnit 4 tests (@Test annotations)</property>
   <property name="Package filter" required="">Comma separated list of packages 
to show. Example, org.apache.jmeter,junit.framework.</property>
   <property name="Class name" required="Yes">Fully qualified name of the JUnit 
test class.</property>
   <property name="Constructor string" required="">String pass to the string 
constructor. If a string is set, the sampler will use the
@@ -1312,6 +1313,14 @@
   <property name="Append assertion errors" required="Yes">Whether or not to 
append assertion errors to the response message.</property>
   <property name="Append runtime exceptions" required="Yes">Whether or not to 
append runtime exceptions to the response message. Only applies if "Append 
assertion errors" is not selected.</property>
 </properties>
+<p>
+The following JUnit4 annotations are recognised:
+<ul>
+<li>@Test - used to find test methods and classes. The "expected" and 
"timeout" attributes are supported.</li>
+<li>@Before - treated the same as setUp() in JUnit3</li>
+<li>@After - treated the same as tearDown() in JUnit3</li>
+</ul>
+</p>
 </component>
 
 <component name="Mail Reader Sampler"  index="&sect-num;.1.17"  width="399" 
height="306" screenshot="mailreader_sampler.png">



---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org