Skip to content

JBIDE-17196 org.jboss.tools.cdi.seam.text.ext.test failures on Windows #223

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

JBIDE-17196 org.jboss.tools.cdi.seam.text.ext.test failures on Windows #223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 31 additions & 25 deletions ...c/org/jboss/tools/cdi/seam/text/ext/test/CDISeamResourceLoadingHyperlinkDetectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,13 @@
import org.jboss.tools.cdi.text.ext.test.CDIHyperlinkTestUtil.TestRegion;

public class CDISeamResourceLoadingHyperlinkDetectorTest extends TCKTest{
private static final String INJECT_STRING = "@Inject";
private static final String BEANS_XML_STRING = "beansXml;";
private static final String PROPERTIES1_STRING = "properties1;";
private static final String PROPERTIES2_STRING = "properties2;";
private static final String PROPERTIES3_STRING = "properties3;";
private static final String PROPERTIES4_STRING = "properties4;";


public void testCDISeamResourceLoadingHyperlinkDetector_Solder30() throws Exception {
checkFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/openon/ResourceLoader30.java");
Expand All @@ -40,41 +47,40 @@ private void checkFile(String fileName) throws Exception{

ArrayList<TestRegion> regionList = new ArrayList<TestRegion>();

int injectPosition = text.indexOf("@Inject");
if(injectPosition > 0){
regionList.add(new TestRegion(injectPosition, 58,
new TestHyperlink[]{new TestHyperlink(CDISeamResourceLoadingHyperlink.class, NLS.bind(CDISeamExtMessages.CDI_SEAM_RESOURCE_LOADING_HYPERLINK,
int injectPosition = text.indexOf(INJECT_STRING);
int length = text.indexOf(BEANS_XML_STRING, injectPosition)+BEANS_XML_STRING.length()-injectPosition;
regionList.add(new TestRegion(injectPosition, length,
new TestHyperlink[]{new TestHyperlink(CDISeamResourceLoadingHyperlink.class, NLS.bind(CDISeamExtMessages.CDI_SEAM_RESOURCE_LOADING_HYPERLINK,
"WEB-INF/beans.xml",
"WebContent/WEB-INF/beans.xml"))}));
}
injectPosition = text.indexOf("@Inject",injectPosition+1);
if(injectPosition > 0){
regionList.add(new TestRegion(injectPosition, 97,
new TestHyperlink[]{new TestHyperlink(CDISeamResourceLoadingHyperlink.class, NLS.bind(CDISeamExtMessages.CDI_SEAM_RESOURCE_LOADING_HYPERLINK,

injectPosition = text.indexOf(INJECT_STRING,injectPosition+1);
length = text.indexOf(PROPERTIES1_STRING, injectPosition)+PROPERTIES1_STRING.length()-injectPosition;
regionList.add(new TestRegion(injectPosition, length,
new TestHyperlink[]{new TestHyperlink(CDISeamResourceLoadingHyperlink.class, NLS.bind(CDISeamExtMessages.CDI_SEAM_RESOURCE_LOADING_HYPERLINK,
"org/jboss/jsr299/tck/tests/jbt/openon/test.properties",
"JavaSource/org/jboss/jsr299/tck/tests/jbt/openon/test.properties"))}));
}
injectPosition = text.indexOf("@Inject",injectPosition+1);
if(injectPosition > 0){
regionList.add(new TestRegion(injectPosition, 86,
new TestHyperlink[]{new TestHyperlink(CDISeamResourceLoadingHyperlink.class, NLS.bind(CDISeamExtMessages.CDI_SEAM_RESOURCE_LOADING_HYPERLINK,

injectPosition = text.indexOf(INJECT_STRING,injectPosition+1);
length = text.indexOf(PROPERTIES2_STRING, injectPosition)+PROPERTIES2_STRING.length()-injectPosition;
regionList.add(new TestRegion(injectPosition, length,
new TestHyperlink[]{new TestHyperlink(CDISeamResourceLoadingHyperlink.class, NLS.bind(CDISeamExtMessages.CDI_SEAM_RESOURCE_LOADING_HYPERLINK,
"org/jboss/jsr299/tck/tests/jbt/openon/test",
"JavaSource/org/jboss/jsr299/tck/tests/jbt/openon/test.properties"))}));
}
injectPosition = text.indexOf("@Inject",injectPosition+1);
if(injectPosition > 0){
regionList.add(new TestRegion(injectPosition, 97,
new TestHyperlink[]{new TestHyperlink(CDISeamResourceLoadingHyperlink.class, NLS.bind(CDISeamExtMessages.CDI_SEAM_RESOURCE_LOADING_HYPERLINK,

injectPosition = text.indexOf(INJECT_STRING,injectPosition+1);
length = text.indexOf(PROPERTIES3_STRING, injectPosition)+PROPERTIES3_STRING.length()-injectPosition;
regionList.add(new TestRegion(injectPosition, length,
new TestHyperlink[]{new TestHyperlink(CDISeamResourceLoadingHyperlink.class, NLS.bind(CDISeamExtMessages.CDI_SEAM_RESOURCE_LOADING_HYPERLINK,
"org.jboss.jsr299.tck.tests.jbt.openon.test.properties",
"JavaSource/org/jboss/jsr299/tck/tests/jbt/openon/test.properties"))}));
}
injectPosition = text.indexOf("@Inject",injectPosition+1);
if(injectPosition > 0){
regionList.add(new TestRegion(injectPosition, 86,
new TestHyperlink[]{new TestHyperlink(CDISeamResourceLoadingHyperlink.class, NLS.bind(CDISeamExtMessages.CDI_SEAM_RESOURCE_LOADING_HYPERLINK,

injectPosition = text.indexOf(INJECT_STRING,injectPosition+1);
length = text.indexOf(PROPERTIES4_STRING, injectPosition)+PROPERTIES4_STRING.length()-injectPosition;
regionList.add(new TestRegion(injectPosition, length,
new TestHyperlink[]{new TestHyperlink(CDISeamResourceLoadingHyperlink.class, NLS.bind(CDISeamExtMessages.CDI_SEAM_RESOURCE_LOADING_HYPERLINK,
"org.jboss.jsr299.tck.tests.jbt.openon.test",
"JavaSource/org/jboss/jsr299/tck/tests/jbt/openon/test.properties"))}));
}

CDIHyperlinkTestUtil.checkRegions(tckProject, fileName, regionList, new CDISeamResourceLoadingHyperlinkDetector());
}
Expand Down
19 changes: 15 additions & 4 deletions ...t.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/SeamConfigTagNameHyperlinkTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,17 @@
*
*/
public class SeamConfigTagNameHyperlinkTest extends SeamConfigTest {
private static final String FILE_NAME = "src/META-INF/beans.xml";

public SeamConfigTagNameHyperlinkTest() {}

public void testSeamConfigTagNameHyperlink() throws Exception {
int offset = 802; // <|test602:Report>
IHyperlink hyperlink = CDIHyperlinkTestUtil.checkHyperLinkInXml("src/META-INF/beans.xml", project, offset, "org.jboss.tools.cdi.seam.text.ext.hyperlink.SeamConfigTagNameHyperlink");
IFile file = getTestProject().getFile(FILE_NAME);
String content = FileUtil.getContentFromEditorOrFile(file);

//int offset = 802; // <|test602:Report>
int offset = content.indexOf("test602:Report");
IHyperlink hyperlink = CDIHyperlinkTestUtil.checkHyperLinkInXml(FILE_NAME, project, offset, "org.jboss.tools.cdi.seam.text.ext.hyperlink.SeamConfigTagNameHyperlink");
hyperlink.open();

IEditorPart editor = CDISeamExtPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
Expand All @@ -41,8 +47,13 @@ public void testSeamConfigTagNameHyperlink() throws Exception {
}

public void testSeamConfigTagAttributeHyperlink() throws Exception {
int offset = 1088; // <test603:OtherQualifier va|lue1="AA"
IHyperlink hyperlink = CDIHyperlinkTestUtil.checkHyperLinkInXml("src/META-INF/beans.xml", project, offset, "org.jboss.tools.cdi.seam.text.ext.hyperlink.SeamConfigTagNameHyperlink");
IFile file = getTestProject().getFile(FILE_NAME);
String content = FileUtil.getContentFromEditorOrFile(file);
//int offset = 1088; // <test603:OtherQualifier va|lue1="AA"
int offset = content.indexOf("test603");
offset = content.indexOf("value1", offset);

IHyperlink hyperlink = CDIHyperlinkTestUtil.checkHyperLinkInXml(FILE_NAME, project, offset, "org.jboss.tools.cdi.seam.text.ext.hyperlink.SeamConfigTagNameHyperlink");
hyperlink.open();

IEditorPart editor = CDISeamExtPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
Expand Down
24 changes: 6 additions & 18 deletions ....ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/SeamResourceBundleHyperlinkTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@

import java.util.ArrayList;

import org.eclipse.jface.text.hyperlink.IHyperlink;
import org.jboss.tools.cdi.seam.core.test.SeamCoreTest;
import org.jboss.tools.cdi.text.ext.test.CDIHyperlinkTestUtil;
import org.jboss.tools.jst.web.ui.internal.text.ext.hyperlink.ELHyperlink;
import org.jboss.tools.jst.web.ui.internal.text.ext.hyperlink.ELHyperlinkDetector;

/**
* The JUnit test cases for JBIDE-9288 issue
Expand All @@ -31,23 +31,11 @@ public class SeamResourceBundleHyperlinkTest extends SeamCoreTest {
*/
public void testSeamResourceBundleHyperlink () throws Exception {
ArrayList<CDIHyperlinkTestUtil.TestRegion> regionList = new ArrayList<CDIHyperlinkTestUtil.TestRegion>();
regionList.add(new CDIHyperlinkTestUtil.TestRegion(398, 11,
new CDIHyperlinkTestUtil.TestHyperlink[]{new CDIHyperlinkTestUtil.TestHyperlink(ELHyperlink.class, "Open property 'home_header' of bundle 'messages'", "messages.properties")}));
regionList.add(new CDIHyperlinkTestUtil.TestRegion(389, 8,
new CDIHyperlinkTestUtil.TestHyperlink[]{new CDIHyperlinkTestUtil.TestHyperlink(ELHyperlink.class, "Open bundle 'messages'", (String)null)}));
regionList.add(new CDIHyperlinkTestUtil.TestRegion(381, 7,
new CDIHyperlinkTestUtil.TestHyperlink[]{new CDIHyperlinkTestUtil.TestHyperlink(ELHyperlink.class, "Open bundle 'messages'", (String)null)}));
regionList.add(new CDIHyperlinkTestUtil.TestRegion(381, 16,
regionList.add(new CDIHyperlinkTestUtil.TestRegion(/*381, 16*/"bundles.message",
new CDIHyperlinkTestUtil.TestHyperlink[]{new CDIHyperlinkTestUtil.TestHyperlink(ELHyperlink.class, "Open bundle 'messages'", (String)null)}));

for (CDIHyperlinkTestUtil.TestRegion testRegion : regionList) {
IHyperlink[] hyperlinks = CDIHyperlinkTestUtil.detectELHyperlinks(PAGE_NAME, getTestProject(), testRegion.getRegion().getOffset());
assertNotNull("Hyperlink not found!", hyperlinks);
for (IHyperlink hyperlink : hyperlinks) {
assertTrue("Hyperlink found is not EL Hyperlink", (hyperlink instanceof ELHyperlink));
}

CDIHyperlinkTestUtil.checkTestRegion(hyperlinks, testRegion, "");
}
regionList.add(new CDIHyperlinkTestUtil.TestRegion(/*398, 11*/"home_heade",
new CDIHyperlinkTestUtil.TestHyperlink[]{new CDIHyperlinkTestUtil.TestHyperlink(ELHyperlink.class, "Open property 'home_header' of bundle 'messages'", "messages.properties")}));

CDIHyperlinkTestUtil.checkRegions(getTestProject(), PAGE_NAME, regionList, new ELHyperlinkDetector());
}
}