sebb        2004/03/13 12:57:56

  Modified:    src/core/org/apache/jmeter/junit JMeterTest.java
  Log:
  Better handling of getlabelResource errors
  
  Revision  Changes    Path
  1.53      +16 -6     jakarta-jmeter/src/core/org/apache/jmeter/junit/JMeterTest.java
  
  Index: JMeterTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/junit/JMeterTest.java,v
  retrieving revision 1.52
  retrieving revision 1.53
  diff -u -r1.52 -r1.53
  --- JMeterTest.java   13 Mar 2004 19:47:22 -0000      1.52
  +++ JMeterTest.java   13 Mar 2004 20:57:56 -0000      1.53
  @@ -356,6 +356,10 @@
                            (title.indexOf("(ALPHA") == -1)
                            &&
                            (title.indexOf("(BETA")  == -1)
  +                             &&
  +                             (!title.equals("Example1")) // Skip the example 
samplers ...
  +                             &&
  +                             (!title.equals("Example2"))
                        )
                        {// No, not a work in progress ...
                                assertTrue("component_reference.xml needs '"+title+"' 
anchor for "+guiItem.getClass().getName(),ct);
  @@ -410,10 +414,16 @@
               guiItem.getName());
           if (!name.endsWith("TestBeanGUI"))
           {
  -             String label = guiItem.getLabelResource();
  -            assertTrue(label.length() > 0);
  -            assertFalse("Label should be in resource file for "+name
  -                     
,JMeterUtils.getResString(label).startsWith(JMeterUtils.RES_KEY_PFX));
  +             try{
  +                     String label = guiItem.getLabelResource();
  +                 assertTrue(label.length() > 0);
  +                 assertFalse("'"+label+"' should be in resource file for "+name
  +                             
,JMeterUtils.getResString(label).startsWith(JMeterUtils.RES_KEY_PFX));
  +             }
  +            catch(UnsupportedOperationException uoe)
  +                     {
  +             log.warn("Class has not yet implemented getLabelResource "+name);
  +            }
           }
       }
   
  
  
  

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

Reply via email to