sebb        2003/12/15 09:36:27

  Modified:    src/core/org/apache/jmeter/junit JMeterTestCase.java
  Log:
  Add helper mehtod to find test files
  
  Revision  Changes    Path
  1.7       +17 -0     
jakarta-jmeter/src/core/org/apache/jmeter/junit/JMeterTestCase.java
  
  Index: JMeterTestCase.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/junit/JMeterTestCase.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- JMeterTestCase.java       13 Dec 2003 16:21:24 -0000      1.6
  +++ JMeterTestCase.java       15 Dec 2003 17:36:27 -0000      1.7
  @@ -21,6 +21,7 @@
    */
   public abstract class JMeterTestCase extends TestCase
   {
  +     private static final String filePrefix; 
        public JMeterTestCase(){
                super();
        }
  @@ -49,12 +50,28 @@
                                // Also need to set working directory so test files 
can be found
                                
System.setProperty("user.dir",System.getProperty("user.dir")+File.separatorChar+"bin");
                                System.out.println("Setting 
user.dir="+System.getProperty("user.dir"));
  +                             filePrefix="bin/";
  +                     } else {
  +                             filePrefix="";
                        }
                JMeterUtils jmu = new JMeterUtils();
                jmu.initializeProperties(file);
  +     } else {
  +             filePrefix="";
        }
       }
       
  +     // Helper method to find a file
  +     protected static File findTestFile(String file)
  +     {
  +             File f= new File(file);
  +             if (filePrefix.length() > 0 && !f.isAbsolute())
  +             {
  +                     f= new File(filePrefix+file);// Add the offset
  +             }
  +             return f;
  +     }
  +
       protected static final Logger testLog = LoggingManager.getLoggerForClass();
   }
   
  
  
  

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

Reply via email to