Author: vrubezhny Date: 2009-08-06 11:15:45 -0400 (Thu, 06 Aug 2009) New Revision: 16989 Modified: trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/contentassist/SortingCompoundContentAssistProcessor.java Log: JBIDE-4660: Update and correct the CA-related JUnit tests after the new-style CA is applied. Test project data for SeamUiAllTests JUnit Test suite is updated to suite the new-style CA requirements: SeamELContentAssistTestCase.testSeamELContentAssist test case is fixed Modified: trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/contentassist/SortingCompoundContentAssistProcessor.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/contentassist/SortingCompoundContentAssistProcessor.java 2009-08-06 15:11:10 UTC (rev 16988) +++ trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/contentassist/SortingCompoundContentAssistProcessor.java 2009-08-06 15:15:45 UTC (rev 16989) @@ -280,7 +280,7 @@ displayStringUnquoted = displayStringUnquoted.substring(0, displayStringUnquoted.length() - 1); displayStringUnquoted = displayStringUnquoted.trim().toLowerCase(); - if (!present.contains(displayStringUnquoted)) { + if (displayStringUnquoted != null && displayStringUnquoted.length() > 0 && !present.contains(displayStringUnquoted)) { present.add(displayStringUnquoted); if (infoUnquoted != null && infoUnquoted.length() > 0) { if (!info.contains(infoUnquoted)) {