mx4j/src/test/test/javax/management/modelmbean RequiredModelMBeanTest.java,1.11,1.12

Update of /cvsroot/mx4j/mx4j/src/test/test/javax/management/modelmbean
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17576/src/test/test/javax/management/modelmbean

Modified Files:
	RequiredModelMBeanTest.java 
Log Message:
Fixed broken tests

Index: RequiredModelMBeanTest.java
===================================================================
RCS file: /cvsroot/mx4j/mx4j/src/test/test/javax/management/modelmbean/RequiredModelMBeanTest.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** RequiredModelMBeanTest.java	4 Sep 2004 15:44:21 -0000	1.11
--- RequiredModelMBeanTest.java	9 Oct 2004 17:34:13 -0000	1.12
***************
*** 377,380 ****
--- 377,381 ----
        attrDescr1.setField("persistPolicy", "OnUpdate");
        info.setDescriptor(attrDescr1, "attribute");
+       rmmb.setModelMBeanInfo(info);
        storeTester.set(false);
  
***************
*** 396,399 ****
--- 397,401 ----
        attrDescr1.setField("persistPolicy", "OnUpdate");
        info.setDescriptor(attrDescr1, "attribute");
+       rmmb.setModelMBeanInfo(info);
        storeTester.set(false);
  
***************
*** 411,417 ****
           fail("No setMethod, bean should not have been modified");
        }
!       if (!info.getAttribute(attrName1).getDescriptor().getFieldValue("value").equals(value))
        {
!          fail("New value should have been cached");
        }
  
--- 413,419 ----
           fail("No setMethod, bean should not have been modified");
        }
!       if (info.getAttribute(attrName1).getDescriptor().getFieldValue("value") != null)
        {
!          fail("New value should not have been cached since currencyTimeLimit is negative");
        }
  
***************
*** 548,551 ****
--- 550,554 ----
  
        info.setDescriptor(operDescr, "operation");
+       rmmb.setModelMBeanInfo(info);
        list = (List)m_server.invoke(name, operation, args, params);
  
***************
*** 585,590 ****
        // Bug #940161 Required ModelMBean methods are not invoked
        m_server.invoke(name, "setManagedResource", new Object[]{new ModelMBeanTarget(new MutableInteger(0)), "ObjectReference"}, new String[]{Object.class.getName(), String.class.getName()});
-       m_server.invoke(name, "load", new Object[0], new String[0]);
        m_server.invoke(name, "store", new Object[0], new String[0]);
        m_server.invoke(name, "sendNotification", new Object[]{"generic"}, new String[]{String.class.getName()});
  
--- 588,593 ----
        // Bug #940161 Required ModelMBean methods are not invoked
        m_server.invoke(name, "setManagedResource", new Object[]{new ModelMBeanTarget(new MutableInteger(0)), "ObjectReference"}, new String[]{Object.class.getName(), String.class.getName()});
        m_server.invoke(name, "store", new Object[0], new String[0]);
+       m_server.invoke(name, "load", new Object[0], new String[0]);
        m_server.invoke(name, "sendNotification", new Object[]{"generic"}, new String[]{String.class.getName()});
  



-------------------------------------------------------
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal
Use IT products in your business? Tell us what you think of them. Give us
Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl