Bugzilla 1009: mdui:DisplayName and OrganizationDisplayName should be…

… the same for IdPs

First step: add a "future" test for this.  Stop applying "future" tests to interfederation imports.

mdx/_rules/check_future_0.xsl

@@ -30,4 +30,26 @@
 	-->
 	<xsl:import href="check_framework.xsl"/>
 
+	<!--
+		If an IdP has both an OrganizationDisplayName in English, and an
+		mdui:DisplayName in English, they must be identical.
+		
+		UKFTS 1.4 section 3.3
+	-->
+	<xsl:template match="md:EntityDescriptor[md:IDPSSODescriptor]">
+		<xsl:variable name="mdui" select="md:IDPSSODescriptor/md:Extensions/mdui:UIInfo/mdui:DisplayName[@xml:lang='en']"/>
+		<xsl:variable name="odn" select="md:Organization/md:OrganizationDisplayName[@xml:lang='en']"/>
+		<xsl:if test="$mdui and $odn and $mdui != $odn">
+			<xsl:call-template name="error">
+				<xsl:with-param name="m">
+					<xsl:text>mismatched xml:lang='en' DisplayNames: '</xsl:text>
+					<xsl:value-of select="$mdui"/>
+					<xsl:text>' in mdui vs. '</xsl:text>
+					<xsl:value-of select="$odn"/>
+					<xsl:text>' in ODN</xsl:text>
+				</xsl:with-param>
+			</xsl:call-template>
+		</xsl:if>
+	</xsl:template>
+
 </xsl:stylesheet>

mdx/validation-beans.xml

@@ -672,7 +672,6 @@
         <property name="composedStages">
             <list>
                 <ref bean="CHECK_std"/>
-                <ref bean="check_future"/>
                 <ref bean="check_regscope"/>
             </list>
         </property>