fixed TED[58382]:[os][430]Regression_215762 fail in Junit test of

org.eclipse.birt.report.tests.model. revert the regression_215862_golden.rptdesign to previous version.fixed getUpdated Exprssion() change the previous expression type pitfall while remaining contain the updated name.
eclipse-birt · Apr 2, 2013 · cf052b0 · cf052b0
1 parent 7006e8e
commit cf052b0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/....birt.report.model/src/org/eclipse/birt/report/model/util/ReportDesignSerializerImpl.java b/....birt.report.model/src/org/eclipse/birt/report/model/util/ReportDesignSerializerImpl.java
@@ -764,7 +764,7 @@ private Expression getUpdatedExpression( Expression old,
 			return null;
 
 		String expr = old.getStringExpression( );
-		String type = old.getUserDefinedType( );
+		String type = old.getType( );
 		Map<String, String> updateMap = getUpdateBindingMap( expr, nameMap,
 				type );
 
@@ -778,7 +778,7 @@ private Expression getUpdatedExpression( Expression old,
 				newExpr = newExpr.replaceAll( "(\\W)" + oldName + "(\\W)", //$NON-NLS-1$ //$NON-NLS-2$ 
 						"$1" + newName + "$2" ); //$NON-NLS-1$  //$NON-NLS-2$
 			}
-			return new Expression( newExpr, type );
+			return new Expression( newExpr, old.getUserDefinedType( ) );
 		}
 		return null;
 	}

diff --git a/.../org/eclipse/birt/report/tests/model/regression/golden/regression_215762_golden.rptdesign b/.../org/eclipse/birt/report/tests/model/regression/golden/regression_215762_golden.rptdesign
@@ -510,12 +510,12 @@ from OFFICES]]></xml-property>
             <list-property name="boundDataColumns">
                 <structure>
                     <property name="name">COUNTRY</property>
-                    <expression name="expression">dimension["location"]["COUNTRY"]</expression>
+                    <expression name="expression">dimension["location1"]["COUNTRY"]</expression>
                     <property name="dataType">string</property>
                 </structure>
                 <structure>
                     <property name="name">OFFICECODE_location/COUNTRY</property>
-                    <expression name="expression">measure["OFFICECODE"]</expression>
+                    <expression name="expression">measure["OFFICECODE1"]</expression>
                     <property name="dataType">integer</property>
                     <simple-property-list name="aggregateOn">
                         <value>location1/COUNTRY</value>