You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by sm...@apache.org on 2023/07/02 17:58:07 UTC

[directory-fortress-core] branch master updated: + fix problems with jmeter plug usage, like missing runtime dependency on jorphan

This is an automated email from the ASF dual-hosted git repository.

smckinney pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-fortress-core.git


The following commit(s) were added to refs/heads/master by this push:
     new 1a27013b + fix problems with jmeter plug usage, like missing runtime dependency on jorphan
1a27013b is described below

commit 1a27013b4376f5c1fb49cbcf51aa540d56300532
Author: Shawn McKinney <sm...@symas.com>
AuthorDate: Sun Jul 2 12:58:00 2023 -0500

    + fix problems with jmeter plug usage, like missing runtime dependency on jorphan
---
 README-LOAD-TESTING.md                             |  1 -
 pom.xml                                            | 25 +++++++++-------------
 .../directory/fortress/core/jmeter/UserBase.java   |  8 -------
 src/test/jmeter/ftAddUser.jmx                      |  9 ++++----
 src/test/jmeter/ftCheckUser.jmx                    |  9 ++++++--
 src/test/jmeter/ftDelUser.jmx                      |  8 +++----
 6 files changed, 25 insertions(+), 35 deletions(-)

diff --git a/README-LOAD-TESTING.md b/README-LOAD-TESTING.md
index bf446ced..5a10746d 100644
--- a/README-LOAD-TESTING.md
+++ b/README-LOAD-TESTING.md
@@ -137,7 +137,6 @@ Usage Tips:
 
 For more info on testing with the jmeter-maven-plugin: 
 - [Basic Configuration](https://github.com/jmeter-maven-plugin/jmeter-maven-plugin/wiki/Basic-Configuration)
-- [Advanced Configuration](https://github.com/jmeter-maven-plugin/jmeter-maven-plugin/wiki/Advanced-Configuration) 
 ___________________________________________________________________________________
 ### 6. Run the tests
 
diff --git a/pom.xml b/pom.xml
index ce40df90..dc0db460 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,9 +56,6 @@
     <url>https://issues.apache.org/jira/browse/DIRFORTRESS</url>
   </issueManagement>
 
-  <!-- ====================================================== -->
-  <!-- The list of current developers                         -->
-  <!-- ====================================================== -->
   <developers>
     <developer>
       <id>smckinney</id>
@@ -80,9 +77,6 @@
 
   </developers>
 
-  <!-- ====================================================== -->
-  <!-- The used properties for this project                   -->
-  <!-- ====================================================== -->
   <properties>
 
     <java.version>11</java.version>
@@ -108,9 +102,10 @@
     <slf4j.api.version>2.0.7</slf4j.api.version>
     <version.opencsv>2.3</version.opencsv>
     <version.jackson-annotations>2.15.2</version.jackson-annotations>
-    <version.jmeter.plugin>3.5.0</version.jmeter.plugin>
+    <version.jmeter.plugin>3.7.0</version.jmeter.plugin>
     <commons-pool2.version>2.9.0</commons-pool2.version>
 
+    <!-- TODO: FIX OR REMOVE -->
     <!-- ===================================================== -->
     <!-- This is a hack to allow someone to release            -->
     <!-- without having to run the tests. In order to          -->
@@ -121,13 +116,6 @@
     <release.arguments />
   </properties>
 
-  <!-- ====================================================== -->
-  <!-- The dependencies for all the projects                  -->
-  <!-- ====================================================== -->
-
-  <!-- ====================================================== -->
-  <!-- The dependencies                                       -->
-  <!-- ====================================================== -->
   <dependencies>
 
     <dependency>
@@ -396,6 +384,14 @@
       <scope>test</scope>
     </dependency>
 
+    <!-- Required for jmeter runtime scope. Fixes: Error in NonGUIDriver java.lang.NullPointerException -->
+    <dependency>
+      <groupId>org.apache.jmeter</groupId>
+      <artifactId>jorphan</artifactId>
+      <version>5.6</version>
+      <scope>runtime</scope>
+    </dependency>
+
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -423,7 +419,6 @@
       <version>${version.jaxb.impl}</version>
       <scope>test</scope>
     </dependency>
-
   </dependencies>
 
   <build>
diff --git a/src/test/java/org/apache/directory/fortress/core/jmeter/UserBase.java b/src/test/java/org/apache/directory/fortress/core/jmeter/UserBase.java
index d6e5a60a..f97f2d74 100644
--- a/src/test/java/org/apache/directory/fortress/core/jmeter/UserBase.java
+++ b/src/test/java/org/apache/directory/fortress/core/jmeter/UserBase.java
@@ -162,14 +162,6 @@ public abstract class UserBase extends AbstractJavaSamplerClient
             verify = szVerify.equalsIgnoreCase( "true" );
         }
         String szLog = System.getProperty( "log" );
-        if (StringUtils.isEmpty( szLog ))
-        {
-            output = samplerContext.getParameter( "output" ).equalsIgnoreCase( "true" );
-        }
-        else
-        {
-            output = szLog.equalsIgnoreCase( "true" );
-        }
         String szUpdate = System.getProperty( "update" );
         if (StringUtils.isEmpty( szUpdate ))
         {
diff --git a/src/test/jmeter/ftAddUser.jmx b/src/test/jmeter/ftAddUser.jmx
index 185a7a9b..c2c31b2b 100644
--- a/src/test/jmeter/ftAddUser.jmx
+++ b/src/test/jmeter/ftAddUser.jmx
@@ -19,7 +19,7 @@
 -->
 <jmeterTestPlan version="1.2" properties="2.6" jmeter="2.11 r1554548">
   <hashTree>
-    <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="RbacLoadTester" enabled="true">
+    <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="FortressLoadTester" enabled="true">
       <stringProp name="TestPlan.comments"></stringProp>
       <boolProp name="TestPlan.functional_mode">false</boolProp>
       <boolProp name="TestPlan.serialize_threadgroups">false</boolProp>
@@ -32,7 +32,7 @@
       <CSVDataSet guiclass="TestBeanGUI" testclass="CSVDataSet" testname="CSV Data Set Config" enabled="false">
         <stringProp name="delimiter">,</stringProp>
         <stringProp name="fileEncoding"></stringProp>
-        <stringProp name="filename">AddUser.csv</stringProp>
+        <stringProp name="filename">ftAddUser.csv</stringProp>
         <boolProp name="quotedData">false</boolProp>
         <boolProp name="recycle">true</boolProp>
         <stringProp name="shareMode">shareMode.all</stringProp>
@@ -40,11 +40,10 @@
         <stringProp name="variableNames"></stringProp>
       </CSVDataSet>
       <hashTree/>
-      <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Fortress CreateSession" enabled="true">
+      <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Fortress AddUser" enabled="true">
         <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
         <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
           <boolProp name="LoopController.continue_forever">false</boolProp>
-
           <stringProp name="LoopController.loops">1000</stringProp>
         </elementProp>
         <stringProp name="ThreadGroup.num_threads">10</stringProp>
@@ -54,7 +53,7 @@
         <stringProp name="ThreadGroup.delay"></stringProp>
       </ThreadGroup>
       <hashTree>
-        <JavaSampler guiclass="JavaTestSamplerGui" testclass="JavaSampler" testname="Fortress CheckAccess" enabled="true">
+        <JavaSampler guiclass="JavaTestSamplerGui" testclass="JavaSampler" testname="Fortress AddUser" enabled="true">
           <elementProp name="arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" enabled="true">
             <collectionProp name="Arguments.arguments">
               <elementProp name="qualifier" elementType="Argument">
diff --git a/src/test/jmeter/ftCheckUser.jmx b/src/test/jmeter/ftCheckUser.jmx
index 5ceef319..eee3e32e 100644
--- a/src/test/jmeter/ftCheckUser.jmx
+++ b/src/test/jmeter/ftCheckUser.jmx
@@ -19,7 +19,7 @@
 -->
 <jmeterTestPlan version="1.2" properties="2.6" jmeter="2.11 r1554548">
   <hashTree>
-    <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="RbacLoadTester" enabled="true">
+    <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="FortressLoadTester" enabled="true">
       <stringProp name="TestPlan.comments"></stringProp>
       <boolProp name="TestPlan.functional_mode">false</boolProp>
       <boolProp name="TestPlan.serialize_threadgroups">false</boolProp>
@@ -32,7 +32,7 @@
       <CSVDataSet guiclass="TestBeanGUI" testclass="CSVDataSet" testname="CSV Data Set Config" enabled="false">
         <stringProp name="delimiter">,</stringProp>
         <stringProp name="fileEncoding"></stringProp>
-        <stringProp name="filename">CheckUser.csv</stringProp>
+        <stringProp name="filename">ftCheckUser.csv</stringProp>
         <boolProp name="quotedData">false</boolProp>
         <boolProp name="recycle">true</boolProp>
         <stringProp name="shareMode">shareMode.all</stringProp>
@@ -67,6 +67,11 @@
                 <stringProp name="Argument.value">true</stringProp>
                 <stringProp name="Argument.metadata">=</stringProp>
               </elementProp>
+              <elementProp name="output" elementType="Argument">
+                <stringProp name="Argument.name">output</stringProp>
+                <stringProp name="Argument.value">false</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+              </elementProp>
               <elementProp name="update" elementType="Argument">
                 <stringProp name="Argument.name">update</stringProp>
                 <stringProp name="Argument.value">true</stringProp>
diff --git a/src/test/jmeter/ftDelUser.jmx b/src/test/jmeter/ftDelUser.jmx
index 3232f9be..86c2f7be 100644
--- a/src/test/jmeter/ftDelUser.jmx
+++ b/src/test/jmeter/ftDelUser.jmx
@@ -19,7 +19,7 @@
 -->
 <jmeterTestPlan version="1.2" properties="2.6" jmeter="2.11 r1554548">
   <hashTree>
-    <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="RbacLoadTester" enabled="true">
+    <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="FortressLoadTester" enabled="true">
       <stringProp name="TestPlan.comments"></stringProp>
       <boolProp name="TestPlan.functional_mode">false</boolProp>
       <boolProp name="TestPlan.serialize_threadgroups">false</boolProp>
@@ -32,7 +32,7 @@
       <CSVDataSet guiclass="TestBeanGUI" testclass="CSVDataSet" testname="CSV Data Set Config" enabled="false">
         <stringProp name="delimiter">,</stringProp>
         <stringProp name="fileEncoding"></stringProp>
-        <stringProp name="filename">DelUser.csv</stringProp>
+        <stringProp name="filename">ftDelUser.csv</stringProp>
         <boolProp name="quotedData">false</boolProp>
         <boolProp name="recycle">true</boolProp>
         <stringProp name="shareMode">shareMode.all</stringProp>
@@ -40,7 +40,7 @@
         <stringProp name="variableNames"></stringProp>
       </CSVDataSet>
       <hashTree/>
-      <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Fortress CreateSession" enabled="true">
+      <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Fortress DelUser" enabled="true">
         <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
         <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
           <boolProp name="LoopController.continue_forever">false</boolProp>
@@ -54,7 +54,7 @@
         <stringProp name="ThreadGroup.delay"></stringProp>
       </ThreadGroup>
       <hashTree>
-        <JavaSampler guiclass="JavaTestSamplerGui" testclass="JavaSampler" testname="Fortress CheckAccess" enabled="true">
+        <JavaSampler guiclass="JavaTestSamplerGui" testclass="JavaSampler" testname="Fortress DelUser" enabled="true">
           <elementProp name="arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" enabled="true">
             <collectionProp name="Arguments.arguments">
               <elementProp name="qualifier" elementType="Argument">