sebb        2003/11/28 07:08:25

  Modified:    src/core/org/apache/jmeter/util BeanShellServer.java
  Log:
  Add JUnit tests
  
  Revision  Changes    Path
  1.3       +30 -2     
jakarta-jmeter/src/core/org/apache/jmeter/util/BeanShellServer.java
  
  Index: BeanShellServer.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/util/BeanShellServer.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- BeanShellServer.java      30 Oct 2003 12:20:49 -0000      1.2
  +++ BeanShellServer.java      28 Nov 2003 15:08:25 -0000      1.3
  @@ -58,6 +58,8 @@
   import java.lang.reflect.InvocationTargetException;
   import java.lang.reflect.Method;
   
  +import junit.framework.TestCase;
  +
   import org.apache.jorphan.logging.LoggingManager;
   import org.apache.log.Logger;
   
  @@ -92,6 +94,7 @@
        serverport=0;
        serverfile="";
       }
  +    // For use by the server script
        private static String getprop(String s){
                return JMeterUtils.getPropDefault(s,s);
        }
  @@ -138,7 +141,8 @@
                                        if (t != null) log.warn(t.toString());
                                }
                        }
  -                     eval.invoke(instance, new Object[]{"server(portnum)"});
  +                     eval.invoke(instance, new Object[]{"setAccessibility(true);"});
  +                     eval.invoke(instance, new Object[]{"server(portnum);"});
   
                }
                catch(ClassNotFoundException e ){
  @@ -149,5 +153,29 @@
                        log.error("Problem starting BeanShell server ",e);
                }
        }
  +     public static class BeanShellServerTest extends TestCase
  +     {
  +             //private static Logger log = LoggingManager.getLoggerForClass();
  +
  +             public BeanShellServerTest()
  +             {
  +                     super();
  +             }
   
  +        public void testServer() throws Exception
  +        {
  +             BeanShellServer bshs = new BeanShellServer(9876,"");
  +             assertNotNull(bshs);
  +             // Not sure we can test anything else here
  +        }
  +        
  +             public void testProps() throws Exception
  +             {
  +                     if (JMeterUtils.getJMeterProperties() != null){//Can't test 
standalone
  +                     assertNotNull("Property user.dir should not be 
null",getprop("user.dir"));
  +                     setprop("beanshelltest","xyz");
  +                     assertEquals("xyz",getprop("beanshelltest"));
  +                     }
  +             }
  +     }
   }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to