svn commit: r155190 - incubator/beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/composition/DriveOuterControl.java

[ky...@apache.org]

Author: kylem
Date: Thu Feb 24 07:15:39 2005
New Revision: 155190

URL: http://svn.apache.org/viewcvs?view=rev&rev=155190
Log:
Fixed bugs in composition test case that were root cause of BEEHIVE-126.  The test case now passes.

Modified:
    incubator/beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/composition/DriveOuterControl.java

Modified: incubator/beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/composition/DriveOuterControl.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/composition/DriveOuterControl.java?view=diff&r1=155189&r2=155190
==============================================================================
--- incubator/beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/composition/DriveOuterControl.java (original)
+++ incubator/beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/composition/DriveOuterControl.java Thu Feb 24 07:15:39 2005
@@ -138,15 +138,15 @@
 
 		if (report.getStatus().equals(Report.PASS)){
 			InnerControlBean innerbean2=myControl.getDeclaredNestedControl2();
-			String name2=innerbean.getName();
-			String job2=innerbean.getJob();
+			String name2=innerbean2.getName();
+			String job2=innerbean2.getJob();
 
 			if (job2==null){
 				report.setStatus(Report.FAIL);
 				report.setMessage("The property reset at declaration is NULL.JIRA-BEEHIVE-126" );
 			}
 			else{
-				if (name.equals(InnerControl.DEFAULT_NAME)&&(job.equals("farmer")))
+				if (name.equals(InnerControl.DEFAULT_NAME)&&(job2.equals("farmer")))
 					report.setStatus(Report.PASS);
 				else{
 					report.setStatus(Report.FAIL);
@@ -294,4 +294,4 @@
 
 		return report;
 	}
-}
\ No newline at end of file
+}