diff options
Diffstat (limited to 'org.eclipse.ua.tests/help/org/eclipse/ua')
79 files changed, 851 insertions, 851 deletions
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/criteria/ParseTocWithCriteria.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/criteria/ParseTocWithCriteria.java index 2bfb3afa8..64fa6614f 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/criteria/ParseTocWithCriteria.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/criteria/ParseTocWithCriteria.java @@ -63,18 +63,18 @@ public class ParseTocWithCriteria { IToc2 toc = parseToc("data/help/criteria/c1.xml"); Map<String, Set<String>> criteria = new HashMap<>(); CriteriaUtilities.addCriteriaToMap(criteria, toc.getCriteria()); - assertEquals(2, criteria.size()); - Set<String> versions = criteria.get("version"); - assertNotNull(versions); - assertEquals(2, versions.size()); - assertTrue(versions.contains("1.0")); - assertTrue(versions.contains("2.0")); - - Set<String> platforms = criteria.get("platform"); - assertNotNull(platforms); - assertEquals(2, platforms.size()); - assertTrue(platforms.contains("linux")); - assertTrue(platforms.contains("win32")); + assertEquals(2, criteria.size()); + Set<String> versions = criteria.get("version"); + assertNotNull(versions); + assertEquals(2, versions.size()); + assertTrue(versions.contains("1.0")); + assertTrue(versions.contains("2.0")); + + Set<String> platforms = criteria.get("platform"); + assertNotNull(platforms); + assertEquals(2, platforms.size()); + assertTrue(platforms.contains("linux")); + assertTrue(platforms.contains("win32")); } @Test @@ -83,18 +83,18 @@ public class ParseTocWithCriteria { Toc toc = new Toc(toc0); Map<String, Set<String>> criteria = new HashMap<>(); CriteriaUtilities.addCriteriaToMap(criteria, toc.getCriteria()); - assertEquals(2, criteria.size()); - Set<String> versions = criteria.get("version"); - assertNotNull(versions); - assertEquals(2, versions.size()); - assertTrue(versions.contains("1.0")); - assertTrue(versions.contains("2.0")); - - Set<String> platforms = criteria.get("platform"); - assertNotNull(platforms); - assertEquals(2, platforms.size()); - assertTrue(platforms.contains("linux")); - assertTrue(platforms.contains("win32")); + assertEquals(2, criteria.size()); + Set<String> versions = criteria.get("version"); + assertNotNull(versions); + assertEquals(2, versions.size()); + assertTrue(versions.contains("1.0")); + assertTrue(versions.contains("2.0")); + + Set<String> platforms = criteria.get("platform"); + assertNotNull(platforms); + assertEquals(2, platforms.size()); + assertTrue(platforms.contains("linux")); + assertTrue(platforms.contains("win32")); } @Test @@ -106,23 +106,23 @@ public class ParseTocWithCriteria { Map<String, Set<String>> criteria = new HashMap<>(); assertTrue(topics[0] instanceof ITopic2); CriteriaUtilities.addCriteriaToMap(criteria, ((ITopic2)topics[0]).getCriteria()); - assertEquals(2, criteria.size()); - Set<String> versions = criteria.get("version"); - assertNotNull(versions); - assertEquals(1, versions.size()); - assertTrue(versions.contains("1.0")); - assertFalse(versions.contains("2.0")); + assertEquals(2, criteria.size()); + Set<String> versions = criteria.get("version"); + assertNotNull(versions); + assertEquals(1, versions.size()); + assertTrue(versions.contains("1.0")); + assertFalse(versions.contains("2.0")); // Second topic criteria = new HashMap<>(); assertTrue(topics[1] instanceof ITopic2); CriteriaUtilities.addCriteriaToMap(criteria, ((ITopic2)topics[1]).getCriteria()); - versions = criteria.get("version"); - assertNotNull(versions); - assertEquals(1, versions.size()); - assertTrue(versions.contains("2.0")); - assertFalse(versions.contains("1.0")); + versions = criteria.get("version"); + assertNotNull(versions); + assertEquals(1, versions.size()); + assertTrue(versions.contains("2.0")); + assertFalse(versions.contains("1.0")); } @Test @@ -194,11 +194,11 @@ public class ParseTocWithCriteria { toc.addCriterion(criterion2); ICriteria[] criteria = toc.getCriteria(); - assertEquals(2, criteria.length); - assertEquals("version", criteria[0].getName()); - assertEquals("1.0", criteria[0].getValue()); - assertEquals("version", criteria[1].getName()); - assertEquals("2.0", criteria[1].getValue()); + assertEquals(2, criteria.length); + assertEquals("version", criteria[0].getName()); + assertEquals("1.0", criteria[0].getValue()); + assertEquals("version", criteria[1].getName()); + assertEquals("2.0", criteria[1].getValue()); } @Test @@ -212,11 +212,11 @@ public class ParseTocWithCriteria { Toc copy = new Toc(toc); ICriteria[] criteria = copy.getCriteria(); - assertEquals(2, criteria.length); - assertEquals("version", criteria[0].getName()); - assertEquals("1.0", criteria[0].getValue()); - assertEquals("version", criteria[1].getName()); - assertEquals("2.0", criteria[1].getValue()); + assertEquals(2, criteria.length); + assertEquals("version", criteria[0].getName()); + assertEquals("1.0", criteria[0].getValue()); + assertEquals("version", criteria[1].getName()); + assertEquals("2.0", criteria[1].getValue()); } @Test @@ -230,11 +230,11 @@ public class ParseTocWithCriteria { Topic copy = new Topic(topic); ICriteria[] criteria = copy.getCriteria(); - assertEquals(2, criteria.length); - assertEquals("version", criteria[0].getName()); - assertEquals("1.0", criteria[0].getValue()); - assertEquals("version", criteria[1].getName()); - assertEquals("2.0", criteria[1].getValue()); + assertEquals(2, criteria.length); + assertEquals("version", criteria[0].getName()); + assertEquals("1.0", criteria[0].getValue()); + assertEquals("version", criteria[1].getName()); + assertEquals("2.0", criteria[1].getValue()); } @Test @@ -245,11 +245,11 @@ public class ParseTocWithCriteria { topic.addCriterion(criterion1); topic.addCriterion(criterion2); ICriteria[] criteria = topic.getCriteria(); - assertEquals(2, criteria.length); - assertEquals("version", criteria[0].getName()); - assertEquals("1.0", criteria[0].getValue()); - assertEquals("version", criteria[1].getName()); - assertEquals("2.0", criteria[1].getValue()); + assertEquals(2, criteria.length); + assertEquals("version", criteria[0].getName()); + assertEquals("1.0", criteria[0].getValue()); + assertEquals("version", criteria[1].getName()); + assertEquals("2.0", criteria[1].getValue()); } @Test diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/criteria/TestCriteriaProvider.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/criteria/TestCriteriaProvider.java index f1a3292d5..ddea24dd2 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/criteria/TestCriteriaProvider.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/criteria/TestCriteriaProvider.java @@ -41,17 +41,17 @@ public class TestCriteriaProvider { Topic copy = new Topic(topic); ICriteria[] nativeCriteria = copy.getCriteria(); - assertEquals(2, nativeCriteria.length); - assertEquals("version", nativeCriteria[0].getName()); - assertEquals("1.0", nativeCriteria[0].getValue()); - assertEquals("version", nativeCriteria[1].getName()); - assertEquals("2.0", nativeCriteria[1].getValue()); - - ICriteria[] allCriteria = CriteriaProviderRegistry.getInstance().getAllCriteria(copy); - assertTrue(containsCriterion(allCriteria, "version", "2.0")); - assertTrue(containsCriterion(allCriteria, "version", "1.0")); - assertTrue(containsCriterion(allCriteria, "containsLetter", "c")); - assertFalse(containsCriterion(allCriteria, "containsLetter", "k")); + assertEquals(2, nativeCriteria.length); + assertEquals("version", nativeCriteria[0].getName()); + assertEquals("1.0", nativeCriteria[0].getValue()); + assertEquals("version", nativeCriteria[1].getName()); + assertEquals("2.0", nativeCriteria[1].getValue()); + + ICriteria[] allCriteria = CriteriaProviderRegistry.getInstance().getAllCriteria(copy); + assertTrue(containsCriterion(allCriteria, "version", "2.0")); + assertTrue(containsCriterion(allCriteria, "version", "1.0")); + assertTrue(containsCriterion(allCriteria, "containsLetter", "c")); + assertFalse(containsCriterion(allCriteria, "containsLetter", "k")); } @Test @@ -65,17 +65,17 @@ public class TestCriteriaProvider { Toc copy = new Toc(toc); ICriteria[] nativeCriteria = copy.getCriteria(); - assertEquals(2, nativeCriteria.length); - assertEquals("version", nativeCriteria[0].getName()); - assertEquals("1.0", nativeCriteria[0].getValue()); - assertEquals("version", nativeCriteria[1].getName()); - assertEquals("2.0", nativeCriteria[1].getValue()); - - ICriteria[] allCriteria = CriteriaProviderRegistry.getInstance().getAllCriteria(copy); - assertTrue(containsCriterion(allCriteria, "version", "2.0")); - assertTrue(containsCriterion(allCriteria, "version", "1.0")); - assertTrue(containsCriterion(allCriteria, "containsLetter", "c")); - assertFalse(containsCriterion(allCriteria, "containsLetter", "k")); + assertEquals(2, nativeCriteria.length); + assertEquals("version", nativeCriteria[0].getName()); + assertEquals("1.0", nativeCriteria[0].getValue()); + assertEquals("version", nativeCriteria[1].getName()); + assertEquals("2.0", nativeCriteria[1].getValue()); + + ICriteria[] allCriteria = CriteriaProviderRegistry.getInstance().getAllCriteria(copy); + assertTrue(containsCriterion(allCriteria, "version", "2.0")); + assertTrue(containsCriterion(allCriteria, "version", "1.0")); + assertTrue(containsCriterion(allCriteria, "containsLetter", "c")); + assertFalse(containsCriterion(allCriteria, "containsLetter", "k")); } @Test @@ -96,17 +96,17 @@ public class TestCriteriaProvider { //public void testWorkingSetScope() throws Exception { // TODO write a test which creates a working set scope based on the - // criteria which are generated by the criteria provider + // criteria which are generated by the criteria provider //} private boolean containsCriterion(ICriteria[] allCriteria, String name, String value) { - for (ICriteria element : allCriteria) { - if (element.getName().equals(name) && element.getValue().equals(value)) { - return true; - } - } - return false; + for (ICriteria element : allCriteria) { + if (element.getName().equals(name) && element.getValue().equals(value)) { + return true; + } + } + return false; } } diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/dynamic/DynamicXHTMLProcessorTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/dynamic/DynamicXHTMLProcessorTest.java index 3f67eae98..bd4cc9212 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/dynamic/DynamicXHTMLProcessorTest.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/dynamic/DynamicXHTMLProcessorTest.java @@ -115,8 +115,8 @@ public class DynamicXHTMLProcessorTest { @Test public void testValidXML() throws Exception { - String processed = process("data/help/dynamic/xhtml/emptyAnchor.xhtml"); - XMLUtil.assertParseableXML(processed); + String processed = process("data/help/dynamic/xhtml/emptyAnchor.xhtml"); + XMLUtil.assertParseableXML(processed); } } diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/index/IndexAssemblerTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/index/IndexAssemblerTest.java index 2a69667f9..f5bd8b9a7 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/index/IndexAssemblerTest.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/index/IndexAssemblerTest.java @@ -64,9 +64,9 @@ public class IndexAssemblerTest { IndexAssembler assembler = new IndexAssembler(); List<IndexContribution> contributions = new ArrayList<>(Arrays.asList(contrib)); Index index = assembler.assemble(contributions, Platform.getNL()); - IIndexEntry[] children = index.getEntries(); - assertEquals(2,children.length); - IIndexEntry eclipseEntry = children[0]; + IIndexEntry[] children = index.getEntries(); + assertEquals(2,children.length); + IIndexEntry eclipseEntry = children[0]; assertEquals("eclipse", eclipseEntry.getKeyword()); IUAElement[] eclipseChildren = eclipseEntry.getChildren(); assertEquals(4, eclipseChildren.length); @@ -78,11 +78,11 @@ public class IndexAssemblerTest { IndexSee seeHeliosRelease = (IndexSee) eclipseChildren[3]; assertEquals(0, seeHelios.getSubpathElements().length); assertEquals(1, seeHeliosRelease.getSubpathElements().length); - IIndexEntry heliosEntry = children[1]; + IIndexEntry heliosEntry = children[1]; assertEquals("helios", heliosEntry.getKeyword()); - IIndexSee[] heliosSees = ((IIndexEntry2)heliosEntry).getSees(); - assertEquals(1, heliosSees.length); - assertEquals("eclipse", heliosSees[0].getKeyword()); + IIndexSee[] heliosSees = ((IIndexEntry2)heliosEntry).getSees(); + assertEquals(1, heliosSees.length); + assertEquals("eclipse", heliosSees[0].getKeyword()); } @Test @@ -92,14 +92,14 @@ public class IndexAssemblerTest { IndexAssembler assembler = new IndexAssembler(); List<IndexContribution> contributions = new ArrayList<>(Arrays.asList(contrib)); Index index = assembler.assemble(contributions, Platform.getNL()); - IIndexEntry[] children = index.getEntries(); - assertEquals(1,children.length); - assertEquals("keyword1", children[0].getKeyword()); - ITopic[] topics = children[0].getTopics(); - assertEquals(3, topics.length); - assertEquals("topic0", topics[0].getLabel()); - assertEquals("topic1", topics[1].getLabel()); - assertEquals("topic2", topics[2].getLabel()); + IIndexEntry[] children = index.getEntries(); + assertEquals(1,children.length); + assertEquals("keyword1", children[0].getKeyword()); + ITopic[] topics = children[0].getTopics(); + assertEquals(3, topics.length); + assertEquals("topic0", topics[0].getLabel()); + assertEquals("topic1", topics[1].getLabel()); + assertEquals("topic2", topics[2].getLabel()); } // Replaces white space between ">" and "<" by a single newline diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/ConcurrentTocAccess.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/ConcurrentTocAccess.java index a79f0123f..b9f0bed5c 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/ConcurrentTocAccess.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/ConcurrentTocAccess.java @@ -39,10 +39,10 @@ public class ConcurrentTocAccess { this.dimensions = dimensions; result = new StringBuilder(); result.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"); - result.append("<?NLS TYPE=\"org.eclipse.help.toc\"?>\n"); - result.append("<toc label=\"Test Toc\" >\n"); - generateTopics(0); - result.append("</toc>"); + result.append("<?NLS TYPE=\"org.eclipse.help.toc\"?>\n"); + result.append("<toc label=\"Test Toc\" >\n"); + generateTopics(0); + result.append("</toc>"); return result.toString(); } @@ -73,12 +73,12 @@ public class ConcurrentTocAccess { @Override public void run() { - try { + try { int result = traverseToc(toc); setLeafCount(result); } catch (Exception e) { - setLeafCount(-1); - this.exception = e; + setLeafCount(-1); + this.exception = e; } } @@ -119,8 +119,8 @@ public class ConcurrentTocAccess { } for (int i = 0; i < numberOfThreads; i++) { if (visitors[i].isAlive()) { - complete = false; - try { + complete = false; + try { Thread.sleep(100); } catch (InterruptedException e) { fail("Interrupted Exception"); @@ -183,7 +183,7 @@ public class ConcurrentTocAccess { Toc toc; Document doc; try { - doc = DocumentCreator.createDocument(tocSource); + doc = DocumentCreator.createDocument(tocSource); } catch (Exception e) { fail("Exception creating TOC"); doc = null; diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/ContextMergeTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/ContextMergeTest.java index b06a1711a..fff3efc06 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/ContextMergeTest.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/ContextMergeTest.java @@ -29,7 +29,7 @@ import org.w3c.dom.Element; public class ContextMergeTest { private static final String ENABLEMENT_CHEATSHEETS = "<enablement><with variable=\"platform\">" + - "<test property=\"org.eclipse.core.runtime.isBundleInstalled\" args=\"org.eclipse.ui.cheatsheets\"/>" + + "<test property=\"org.eclipse.core.runtime.isBundleInstalled\" args=\"org.eclipse.ui.cheatsheets\"/>" + "</with></enablement>"; private static final String TOPIC_END = "</topic>"; private static final String TOPIC_HEAD_ECLIPSE = "<topic href=\"http://www.eclipse.org\" label=\"enabled\">"; @@ -44,7 +44,7 @@ public class ContextMergeTest { Context context; Document doc; try { - doc = DocumentCreator.createDocument(contextSource); + doc = DocumentCreator.createDocument(contextSource); } catch (Exception e) { fail("Caught Exception"); doc = null; @@ -56,14 +56,14 @@ public class ContextMergeTest { @Test public void testContextMerge() { final String contextSource1 = CONTEXT_HEAD + - CONTEXT_DESCRIPTION + - TOPIC_ECLIPSE + - TOPIC_WITH_ENABLEMENT + - END_CONTEXT; + CONTEXT_DESCRIPTION + + TOPIC_ECLIPSE + + TOPIC_WITH_ENABLEMENT + + END_CONTEXT; final String contextSource2 = CONTEXT_HEAD + - CONTEXT_DESCRIPTION + - TOPIC_BUGZILLA + - END_CONTEXT; + CONTEXT_DESCRIPTION + + TOPIC_BUGZILLA + + END_CONTEXT; Context context1; Context context2; context1 = createContext(contextSource1); diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/ContextTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/ContextTest.java index 794090fde..4e75ed120 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/ContextTest.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/ContextTest.java @@ -36,16 +36,16 @@ import org.w3c.dom.Element; public class ContextTest { private static final String ENABLEMENT_CHEATSHEETS = "<enablement><with variable=\"platform\">" + - "<test property=\"org.eclipse.core.runtime.isBundleInstalled\" args=\"org.eclipse.ui.cheatsheets\"/>" + + "<test property=\"org.eclipse.core.runtime.isBundleInstalled\" args=\"org.eclipse.ui.cheatsheets\"/>" + "</with></enablement>"; private static final String ENABLEMENT_INVALID = "<enablement><with variable=\"platform\">" + - "<test property=\"org.eclipse.core.runtime.isBundleInstalled\" args=\"org.eclipse.ui.invalid\"/>" + + "<test property=\"org.eclipse.core.runtime.isBundleInstalled\" args=\"org.eclipse.ui.invalid\"/>" + "</with></enablement>"; private static final String FILTER_OUT = "<filter name = \"plugin\" value = \"org.eclipse.ua.invalid\"/>"; private static final String TOPIC_END = "</topic>"; private static final String TOPIC_HEAD_ECLIPSE = "<topic href=\"http://www.eclipse.org\" label=\"enabled\">"; private final String TOPIC_OLD_FILTER_DISABLED = "<topic filter=\"plugin=org.eclipse.ua.invalid\" href=\"www.eclipse.org\"" - + " label=\"Transformations and transformation configurations\"/>"; + + " label=\"Transformations and transformation configurations\"/>"; private static final String CONTEXT_DESCRIPTION = "<description>Context Description</description>"; private static final String EMPTY_DESCRIPTION = "<description></description>"; private static final String CONTEXT_HEAD = "<context id=\"viewer\" title=\"Sample View\">"; @@ -54,7 +54,7 @@ public class ContextTest { private final String TOPIC_WITH_ENABLEMENT = TOPIC_HEAD_ECLIPSE + ENABLEMENT_CHEATSHEETS + TOPIC_END; private final String TOPIC_DISABLED = TOPIC_HEAD_ECLIPSE + ENABLEMENT_INVALID + TOPIC_END; private final String TOPIC_FILTER_OUT = TOPIC_HEAD_ECLIPSE + FILTER_OUT + TOPIC_END; - private final String END_CONTEXT = "</context>"; + private final String END_CONTEXT = "</context>"; @Before public void setUp() throws Exception { @@ -66,7 +66,7 @@ public class ContextTest { Context context; Document doc; try { - doc = DocumentCreator.createDocument(contextSource); + doc = DocumentCreator.createDocument(contextSource); } catch (Exception e) { fail("Caught Exception"); doc = null; @@ -78,9 +78,9 @@ public class ContextTest { @Test public void testSimpleContext() { final String contextSource = CONTEXT_HEAD + - CONTEXT_DESCRIPTION + - TOPIC_ECLIPSE + - END_CONTEXT; + CONTEXT_DESCRIPTION + + TOPIC_ECLIPSE + + END_CONTEXT; Context context; context = createContext(contextSource); assertEquals("Sample View", context.getTitle()); @@ -93,9 +93,9 @@ public class ContextTest { @Test public void testContextWithEnablement() { final String contextSource = CONTEXT_HEAD + - CONTEXT_DESCRIPTION + - TOPIC_WITH_ENABLEMENT + - END_CONTEXT; + CONTEXT_DESCRIPTION + + TOPIC_WITH_ENABLEMENT + + END_CONTEXT; Context context; context = createContext(contextSource); assertEquals("Sample View", context.getTitle()); @@ -113,9 +113,9 @@ public class ContextTest { @Test public void testCopyContext() { final String contextSource = CONTEXT_HEAD + - CONTEXT_DESCRIPTION + - TOPIC_WITH_ENABLEMENT + - END_CONTEXT; + CONTEXT_DESCRIPTION + + TOPIC_WITH_ENABLEMENT + + END_CONTEXT; Context context = createContext(contextSource); Context context2 = new Context(context, "new id"); Context context3 = new Context(context2, "new id2"); @@ -152,11 +152,11 @@ public class ContextTest { @Test public void testEnablement() { final String contextSource = CONTEXT_HEAD + - CONTEXT_DESCRIPTION + - TOPIC_WITH_ENABLEMENT + - TOPIC_DISABLED + - TOPIC_OLD_FILTER_DISABLED + - END_CONTEXT; + CONTEXT_DESCRIPTION + + TOPIC_WITH_ENABLEMENT + + TOPIC_DISABLED + + TOPIC_OLD_FILTER_DISABLED + + END_CONTEXT; Context context = createContext(contextSource); IHelpResource[] related = context.getRelatedTopics(); assertEquals(3, related.length); @@ -168,10 +168,10 @@ public class ContextTest { @Test public void testOldStyleFilteringOfCopies() { final String contextSource = CONTEXT_HEAD + - CONTEXT_DESCRIPTION + - TOPIC_WITH_ENABLEMENT + - TOPIC_OLD_FILTER_DISABLED + - END_CONTEXT; + CONTEXT_DESCRIPTION + + TOPIC_WITH_ENABLEMENT + + TOPIC_OLD_FILTER_DISABLED + + END_CONTEXT; Context context1 = createContext(contextSource); Context context2 = new Context(context1, "id"); Context context3 = new Context(context2, "id2"); @@ -195,10 +195,10 @@ public class ContextTest { @Test public void testOldStyleFilteringOfCopies2() { final String contextSource = CONTEXT_HEAD + - CONTEXT_DESCRIPTION + - TOPIC_WITH_ENABLEMENT + - TOPIC_OLD_FILTER_DISABLED + - END_CONTEXT; + CONTEXT_DESCRIPTION + + TOPIC_WITH_ENABLEMENT + + TOPIC_OLD_FILTER_DISABLED + + END_CONTEXT; Context context1 = createContext(contextSource); Context context2 = new Context(context1, "id"); Context context3 = new Context(context1, "id2"); @@ -222,10 +222,10 @@ public class ContextTest { @Test public void testFilteringOfCopies() { final String contextSource = CONTEXT_HEAD + - CONTEXT_DESCRIPTION + - TOPIC_WITH_ENABLEMENT + - TOPIC_FILTER_OUT + - END_CONTEXT; + CONTEXT_DESCRIPTION + + TOPIC_WITH_ENABLEMENT + + TOPIC_FILTER_OUT + + END_CONTEXT; Context context1 = createContext(contextSource); Context context2 = new Context(context1, "id"); Context context3 = new Context(context2, "id2"); @@ -248,10 +248,10 @@ public class ContextTest { @Test public void testFilteringOfCopies2() { final String contextSource = CONTEXT_HEAD + - CONTEXT_DESCRIPTION + - TOPIC_WITH_ENABLEMENT + - TOPIC_FILTER_OUT + - END_CONTEXT; + CONTEXT_DESCRIPTION + + TOPIC_WITH_ENABLEMENT + + TOPIC_FILTER_OUT + + END_CONTEXT; Context context1 = createContext(contextSource); Context context2 = new Context(context1, "id"); Context context3 = new Context(context1, "id2"); @@ -275,10 +275,10 @@ public class ContextTest { @Test public void testEnablementOfCopies() { final String contextSource = CONTEXT_HEAD + - CONTEXT_DESCRIPTION + - TOPIC_WITH_ENABLEMENT + - TOPIC_DISABLED + - END_CONTEXT; + CONTEXT_DESCRIPTION + + TOPIC_WITH_ENABLEMENT + + TOPIC_DISABLED + + END_CONTEXT; Context context1 = createContext(contextSource); Context context2 = new Context(context1, "id"); Context context3 = new Context(context2, "id2"); @@ -301,10 +301,10 @@ public class ContextTest { @Test public void testEnablementOfCopies2() { final String contextSource = CONTEXT_HEAD + - CONTEXT_DESCRIPTION + - TOPIC_WITH_ENABLEMENT + - TOPIC_DISABLED + - END_CONTEXT; + CONTEXT_DESCRIPTION + + TOPIC_WITH_ENABLEMENT + + TOPIC_DISABLED + + END_CONTEXT; Context context1 = createContext(contextSource); Context context2 = new Context(context1, "id"); Context context3 = new Context(context1, "id2"); @@ -328,10 +328,10 @@ public class ContextTest { @Test public void testEnablementOfCopies3() { final String contextSource = CONTEXT_HEAD + - CONTEXT_DESCRIPTION + - TOPIC_WITH_ENABLEMENT + - TOPIC_DISABLED + - END_CONTEXT; + CONTEXT_DESCRIPTION + + TOPIC_WITH_ENABLEMENT + + TOPIC_DISABLED + + END_CONTEXT; Context context1 = createContext(contextSource); Context context2 = new Context(context1, "id"); Context context3 = new Context(context1, "id2"); @@ -360,9 +360,9 @@ public class ContextTest { @Test public void testContextWithAttribute() { final String contextSource = CONTEXT_HEAD_WITH_ATTRIBUTE + - CONTEXT_DESCRIPTION + - TOPIC_ECLIPSE + - END_CONTEXT; + CONTEXT_DESCRIPTION + + TOPIC_ECLIPSE + + END_CONTEXT; Context context; context = createContext(contextSource); assertEquals("abc", context.getAttribute("att")); @@ -371,8 +371,8 @@ public class ContextTest { @Test public void testContextWithoutDescription() { final String contextSource = CONTEXT_HEAD + - TOPIC_ECLIPSE + - END_CONTEXT; + TOPIC_ECLIPSE + + END_CONTEXT; Context context; context = createContext(contextSource); assertNull(context.getText()); @@ -381,9 +381,9 @@ public class ContextTest { @Test public void testContextWithEmptyDescription() { final String contextSource = CONTEXT_HEAD + - EMPTY_DESCRIPTION + - TOPIC_ECLIPSE + - END_CONTEXT; + EMPTY_DESCRIPTION + + TOPIC_ECLIPSE + + END_CONTEXT; Context context; context = createContext(contextSource); assertEquals("", context.getText()); @@ -392,8 +392,8 @@ public class ContextTest { @Test public void testContextWithoutDescriptionSelfCatenation() { final String contextSource = CONTEXT_HEAD + - TOPIC_ECLIPSE + - END_CONTEXT; + TOPIC_ECLIPSE + + END_CONTEXT; Context context1 = createContext(contextSource); Context context2 = createContext(contextSource); context1.mergeContext(context2); @@ -403,12 +403,12 @@ public class ContextTest { @Test public void testContextWithoutDescriptionMixedCatenation() { final String contextSourceEmpty = CONTEXT_HEAD + - TOPIC_ECLIPSE + - END_CONTEXT; + TOPIC_ECLIPSE + + END_CONTEXT; final String contextSourceWithDesc = CONTEXT_HEAD + - CONTEXT_DESCRIPTION + - TOPIC_ECLIPSE + - END_CONTEXT; + CONTEXT_DESCRIPTION + + TOPIC_ECLIPSE + + END_CONTEXT; Context context1 = createContext(contextSourceEmpty); Context context2 = createContext(contextSourceWithDesc); context1.mergeContext(context2); @@ -422,9 +422,9 @@ public class ContextTest { /* public void testCopyContextWithAttribute() { final String contextSource = CONTEXT_HEAD_WITH_ATTRIBUTE + - CONTEXT_DESCRIPTION + - TOPIC_ECLIPSE + - END_CONTEXT; + CONTEXT_DESCRIPTION + + TOPIC_ECLIPSE + + END_CONTEXT; Context context1; context1 = createContext(contextSource); Context context2 = new Context(context1, "id"); diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/DocumentReaderTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/DocumentReaderTest.java index b84709768..8465a2b60 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/DocumentReaderTest.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/DocumentReaderTest.java @@ -42,7 +42,7 @@ public class DocumentReaderTest { @Test public void testDocumentReader() throws IOException, SAXException, ParserConfigurationException { - DocumentReader docReader = new DocumentReader(); + DocumentReader docReader = new DocumentReader(); ResourceReader[] resReaders = new ResourceReader[3]; resReaders[0] = new ResourceReader(docReader,"data/help/index/assembler/a.xml"); resReaders[1] = new ResourceReader(docReader,"data/help/index/assembler/b.xml"); @@ -79,7 +79,7 @@ public class DocumentReaderTest { public void run() { try { for (int i = 0; i < 10; i++) { - readFile(reader, file); + readFile(reader, file); } status = SUCCESS; } catch (Exception e) { diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/EntityResolutionTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/EntityResolutionTest.java index 84be0774d..26cabee35 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/EntityResolutionTest.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/EntityResolutionTest.java @@ -53,39 +53,39 @@ public class EntityResolutionTest { } @Test - public void testFramset() throws Exception { - resolve("http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd", true); - } + public void testFramset() throws Exception { + resolve("http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd", true); + } @Test - public void testFlat() throws Exception { - resolve("http://www.w3.org/TR/xhtml11/DTD/xhtml11-flat.dtd", true); - } + public void testFlat() throws Exception { + resolve("http://www.w3.org/TR/xhtml11/DTD/xhtml11-flat.dtd", true); + } @Test - public void testStrict() throws Exception { - resolve("http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd", true); - } + public void testStrict() throws Exception { + resolve("http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd", true); + } @Test - public void testTransitional() throws Exception { - resolve("http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd", true); - } + public void testTransitional() throws Exception { + resolve("http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd", true); + } @Test - public void testLat1() throws Exception { - resolve("http://www.w3.org/TR/xhtml1/DTD/xhtml-lat1.ent", true); - } + public void testLat1() throws Exception { + resolve("http://www.w3.org/TR/xhtml1/DTD/xhtml-lat1.ent", true); + } @Test - public void testSpecial() throws Exception { - resolve("http://www.w3.org/TR/xhtml1/DTD/xhtml-special.ent", true); - } + public void testSpecial() throws Exception { + resolve("http://www.w3.org/TR/xhtml1/DTD/xhtml-special.ent", true); + } @Test - public void testResolveSymbol() throws Exception { - resolve("http://www.w3.org/TR/xhtml1/DTD/xhtml-symbol.ent", true); - } + public void testResolveSymbol() throws Exception { + resolve("http://www.w3.org/TR/xhtml1/DTD/xhtml-symbol.ent", true); + } @Test public void testUnsupportedDtds() throws Exception { diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/IndexEntryTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/IndexEntryTest.java index f1a3be3b4..e5a9a7836 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/IndexEntryTest.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/IndexEntryTest.java @@ -42,7 +42,7 @@ public class IndexEntryTest { private static final String INVALID_INSTALLED = "<with variable=\"platform\">" + "<test property=\"org.eclipse.core.runtime.isBundleInstalled\" args=\"org.eclipse.ui.invalid\"/></with>"; private static final String CS_INSTALLED = "<with variable=\"platform\">" + - "<test property=\"org.eclipse.core.runtime.isBundleInstalled\" args=\"org.eclipse.ui.cheatsheets\"/></with>"; + "<test property=\"org.eclipse.core.runtime.isBundleInstalled\" args=\"org.eclipse.ui.cheatsheets\"/></with>"; private static final String ENABLEMENT_CHEATSHEETS = "<enablement>" + CS_INSTALLED + "</enablement>"; private static final String ENABLEMENT_INVALID = "<enablement>" + INVALID_INSTALLED + "</enablement>"; private static final String FILTER_IN = "<filter name = \"plugin\" value = \"org.eclipse.ua.tests\"/>"; @@ -62,13 +62,13 @@ public class IndexEntryTest { private final String ENTRY_FILTER_OUT = ENTRY_HEAD_ECLIPSE + FILTER_OUT + ENTRY_END; private final String ENTRY_FILTER_MIXED = ENTRY_HEAD_ECLIPSE + FILTER_IN + FILTER_OUT + ENTRY_END; private final String ENTRY_OLD_FILTER = "<entry filter=\"plugin=org.eclipse.ua.tests\" " - + " keyword=\"Transformations and transformation configurations\"/>"; + + " keyword=\"Transformations and transformation configurations\"/>"; private final String ENTRY_OLD_FILTER_DISABLED = "<entry filter=\"plugin=org.eclipse.ua.invalid\" " - + " keyword=\"Transformations and transformation configurations\"/>"; + + " keyword=\"Transformations and transformation configurations\"/>"; private final String ENTRY_OLD_FILTER_IN__NEGATED = "<entry filter=\"plugin!=org.eclipse.ua.tests\" " - + " keyword=\"Transformations and transformation configurations\"/>"; + + " keyword=\"Transformations and transformation configurations\"/>"; private final String ENTRY_OLD_FILTER_OUT_NEGATED = "<entry filter=\"plugin!=org.eclipse.ua.invalid\" " - + " keyword=\"Transformations and transformation configurations\"/>"; + + " keyword=\"Transformations and transformation configurations\"/>"; private final String ENTRY_WITH_CHILD = ENTRY_HEAD_ECLIPSE + ENTRY_BUGZILLA + ENTRY_END; private final String ENTRY_WITH_TOPIC = ENTRY_HEAD_ECLIPSE + TOPIC_BUGZILLA + ENTRY_END; private final String ENTRY_WITH_SEE = ENTRY_HEAD_ECLIPSE + SEE_ALSO_SDK + ENTRY_END; @@ -82,7 +82,7 @@ public class IndexEntryTest { IndexEntry element; Document doc; try { - doc = DocumentCreator.createDocument(elementSource); + doc = DocumentCreator.createDocument(elementSource); } catch (Exception e) { fail("Caught Exception"); doc = null; @@ -315,15 +315,15 @@ public class IndexEntryTest { assertEquals(2, subentries.length); assertEquals(1, sees.length); assertEquals(3,topics.length); - assertEquals("jdt", subentries[0].getKeyword()); - assertEquals("compiler", subentries[1].getKeyword()); - assertEquals("label1", topics[0].getLabel()); - assertEquals("label2", topics[1].getLabel()); - assertEquals("label3", topics[2].getLabel()); - assertEquals("href1", topics[0].getHref()); - assertEquals("href2", topics[1].getHref()); - assertEquals("href3", topics[2].getHref()); - assertEquals("beans", sees[0].getKeyword()); + assertEquals("jdt", subentries[0].getKeyword()); + assertEquals("compiler", subentries[1].getKeyword()); + assertEquals("label1", topics[0].getLabel()); + assertEquals("label2", topics[1].getLabel()); + assertEquals("label3", topics[2].getLabel()); + assertEquals("href1", topics[0].getHref()); + assertEquals("href2", topics[1].getHref()); + assertEquals("href3", topics[2].getHref()); + assertEquals("beans", sees[0].getKeyword()); } private void checkEntryChildEnablement(IIndexEntry2 entry) { @@ -333,12 +333,12 @@ public class IndexEntryTest { assertEquals(2, subentries.length); assertEquals(1, sees.length); assertEquals(3,topics.length); - assertTrue(subentries[0].isEnabled(HelpEvaluationContext.getContext())); - assertFalse(subentries[1].isEnabled(HelpEvaluationContext.getContext())); - assertTrue(topics[0].isEnabled(HelpEvaluationContext.getContext())); - assertFalse(topics[1].isEnabled(HelpEvaluationContext.getContext())); - assertTrue(topics[2].isEnabled(HelpEvaluationContext.getContext())); - assertTrue(sees[0].isEnabled(HelpEvaluationContext.getContext())); + assertTrue(subentries[0].isEnabled(HelpEvaluationContext.getContext())); + assertFalse(subentries[1].isEnabled(HelpEvaluationContext.getContext())); + assertTrue(topics[0].isEnabled(HelpEvaluationContext.getContext())); + assertFalse(topics[1].isEnabled(HelpEvaluationContext.getContext())); + assertTrue(topics[2].isEnabled(HelpEvaluationContext.getContext())); + assertTrue(sees[0].isEnabled(HelpEvaluationContext.getContext())); } private UserIndexEntry createUserEntry() { diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/IndexSeeTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/IndexSeeTest.java index 1c42fbf0d..9b9043dfb 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/IndexSeeTest.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/IndexSeeTest.java @@ -36,7 +36,7 @@ public class IndexSeeTest { private static final String ECLIPSE = "eclipse"; private static final String SDK = "sdk"; private static final String VIEWS = "views"; - private static final String SEE_END = "</see>"; + private static final String SEE_END = "</see>"; private static final String SEE_HEAD_ECLIPSE = "<see keyword=\"eclipse\">"; private static final String SEE_ECLIPSE = "<see keyword=\"eclipse\"/>"; private static final String SEE_SDK = "<see keyword=\"sdk\"/>"; @@ -44,11 +44,11 @@ public class IndexSeeTest { private static final String SUBPATH_VIEWS = "<subpath keyword=\"views\">"; private static final String SUBPATH_END = "</subpath>"; private static final String SEE_ECLIPSE_SDK = SEE_HEAD_ECLIPSE + - SUBPATH_SDK + SUBPATH_END + SEE_END; + SUBPATH_SDK + SUBPATH_END + SEE_END; private static final String SEE_ECLIPSE_VIEWS = SEE_HEAD_ECLIPSE + - SUBPATH_SDK + SUBPATH_END + SUBPATH_VIEWS + SUBPATH_END + SEE_END; + SUBPATH_SDK + SUBPATH_END + SUBPATH_VIEWS + SUBPATH_END + SEE_END; private static final String SEE_ECLIPSE_SDK_VIEWS = SEE_HEAD_ECLIPSE + - SUBPATH_SDK + SUBPATH_END + SUBPATH_VIEWS + SUBPATH_END + SEE_END; + SUBPATH_SDK + SUBPATH_END + SUBPATH_VIEWS + SUBPATH_END + SEE_END; @Before public void setUp() throws Exception { @@ -59,7 +59,7 @@ public class IndexSeeTest { IndexSee element; Document doc; try { - doc = DocumentCreator.createDocument(elementSource); + doc = DocumentCreator.createDocument(elementSource); } catch (Exception e) { fail("Caught Exception"); doc = null; @@ -73,7 +73,7 @@ public class IndexSeeTest { Document doc; String elementSource = "<see keyword=\"" + keyword + "\" />"; try { - doc = DocumentCreator.createDocument(elementSource); + doc = DocumentCreator.createDocument(elementSource); } catch (Exception e) { fail("Caught Exception"); doc = null; @@ -96,11 +96,11 @@ public class IndexSeeTest { see1 = createSee(SEE_ECLIPSE); IndexSee see2 = new IndexSee(see1); assertEquals(ECLIPSE, see1.getKeyword()); - assertEquals(0, see1.getSubpathElements().length); + assertEquals(0, see1.getSubpathElements().length); assertEquals(ECLIPSE, see1.getKeyword()); assertEquals(ECLIPSE, see2.getKeyword()); - assertEquals(0, see2.getSubpathElements().length); + assertEquals(0, see2.getSubpathElements().length); assertEquals(ECLIPSE, see2.getKeyword()); } @@ -231,30 +231,30 @@ public class IndexSeeTest { @Test public void testUserSee() { - UserIndexSee u1; - u1 = createUserSee(); - IndexSee see = new IndexSee(u1); - checkCreatedSee(see); + UserIndexSee u1; + u1 = createUserSee(); + IndexSee see = new IndexSee(u1); + checkCreatedSee(see); } @Test public void testCopyUserSee() { - UserIndexSee u1; - u1 = createUserSee(); - IndexSee see = new IndexSee(u1); - IndexSee see2 = new IndexSee(see); - checkCreatedSee(see); - checkCreatedSee(see2); + UserIndexSee u1; + u1 = createUserSee(); + IndexSee see = new IndexSee(u1); + IndexSee see2 = new IndexSee(see); + checkCreatedSee(see); + checkCreatedSee(see2); } @Test public void testCreateTwiceUserSee() { - UserIndexSee u1; - u1 = createUserSee(); - IndexSee see = new IndexSee(u1); - IndexSee see2 = new IndexSee(u1); - checkCreatedSee(see); - checkCreatedSee(see2); + UserIndexSee u1; + u1 = createUserSee(); + IndexSee see = new IndexSee(u1); + IndexSee see2 = new IndexSee(u1); + checkCreatedSee(see); + checkCreatedSee(see2); } @Test @@ -299,19 +299,19 @@ public class IndexSeeTest { private UserIndexSee createUserSee() { UserIndexSee u1; u1 = new UserIndexSee("eclipse", false); - UserIndexSubpath u2 = new UserIndexSubpath("platform"); - UserIndexSubpath u3 = new UserIndexSubpath("ui"); - u1.addSubpath(u2); - u1.addSubpath(u3); + UserIndexSubpath u2 = new UserIndexSubpath("platform"); + UserIndexSubpath u3 = new UserIndexSubpath("ui"); + u1.addSubpath(u2); + u1.addSubpath(u3); return u1; } private void checkCreatedSee(IndexSee see) { assertEquals("eclipse", see.getKeyword()); - IIndexSubpath[] subpath = see.getSubpathElements(); - assertEquals(2, subpath.length); - assertEquals("platform", subpath[0].getKeyword()); - assertEquals("ui", subpath[1].getKeyword()); + IIndexSubpath[] subpath = see.getSubpathElements(); + assertEquals(2, subpath.length); + assertEquals("platform", subpath[0].getKeyword()); + assertEquals("ui", subpath[1].getKeyword()); } } diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/TocObjectTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/TocObjectTest.java index 1eb73186a..c8f1ad608 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/TocObjectTest.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/TocObjectTest.java @@ -34,9 +34,9 @@ public class TocObjectTest { @Test public void testLookupUnanchoredHref() { - UserToc utoc = new UserToc(TITLE_1, null, true); - UserTopic utopic = new UserTopic(TOPIC_LABEL_1, PATH, true); - utoc.addTopic(utopic); + UserToc utoc = new UserToc(TITLE_1, null, true); + UserTopic utopic = new UserTopic(TOPIC_LABEL_1, PATH, true); + utoc.addTopic(utopic); Toc toc = new Toc(utoc); ITopic topic = toc.getTopic(PATH); assertNotNull(topic); @@ -45,9 +45,9 @@ public class TocObjectTest { @Test public void testLookupAnchoredHrefByAnchor() { - UserToc utoc = new UserToc(TITLE_1, null, true); - UserTopic utopic = new UserTopic(TOPIC_LABEL_1, PATH + ANCHOR1, true); - utoc.addTopic(utopic); + UserToc utoc = new UserToc(TITLE_1, null, true); + UserTopic utopic = new UserTopic(TOPIC_LABEL_1, PATH + ANCHOR1, true); + utoc.addTopic(utopic); Toc toc = new Toc(utoc); ITopic topic = toc.getTopic(PATH + ANCHOR1); assertNotNull(topic); @@ -56,9 +56,9 @@ public class TocObjectTest { @Test public void testLookupAnchoredHref() { - UserToc utoc = new UserToc(TITLE_1, null, true); - UserTopic utopic = new UserTopic(TOPIC_LABEL_1, PATH + ANCHOR1, true); - utoc.addTopic(utopic); + UserToc utoc = new UserToc(TITLE_1, null, true); + UserTopic utopic = new UserTopic(TOPIC_LABEL_1, PATH + ANCHOR1, true); + utoc.addTopic(utopic); Toc toc = new Toc(utoc); ITopic topic = toc.getTopic(PATH); assertNotNull(topic); @@ -67,13 +67,13 @@ public class TocObjectTest { @Test public void testUnanchoredFoundFirst() { - UserToc utoc = new UserToc(TITLE_1, null, true); - UserTopic utopic = new UserTopic(TOPIC_LABEL_1, PATH + ANCHOR1, true); - utoc.addTopic(utopic); - utopic = new UserTopic(TOPIC_LABEL_2, PATH, true); - utoc.addTopic(utopic); - utopic = new UserTopic(TOPIC_LABEL_3, PATH + ANCHOR2, true); - utoc.addTopic(utopic); + UserToc utoc = new UserToc(TITLE_1, null, true); + UserTopic utopic = new UserTopic(TOPIC_LABEL_1, PATH + ANCHOR1, true); + utoc.addTopic(utopic); + utopic = new UserTopic(TOPIC_LABEL_2, PATH, true); + utoc.addTopic(utopic); + utopic = new UserTopic(TOPIC_LABEL_3, PATH + ANCHOR2, true); + utoc.addTopic(utopic); Toc toc = new Toc(utoc); ITopic topic = toc.getTopic(PATH); assertNotNull(topic); diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/TopicTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/TopicTest.java index a342c84b1..d9def5aea 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/TopicTest.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/TopicTest.java @@ -39,7 +39,7 @@ public class TopicTest { private static final String INVALID_INSTALLED = "<with variable=\"platform\">" + "<test property=\"org.eclipse.core.runtime.isBundleInstalled\" args=\"org.eclipse.ui.invalid\"/></with>"; private static final String CS_INSTALLED = "<with variable=\"platform\">" + - "<test property=\"org.eclipse.core.runtime.isBundleInstalled\" args=\"org.eclipse.ui.cheatsheets\"/></with>"; + "<test property=\"org.eclipse.core.runtime.isBundleInstalled\" args=\"org.eclipse.ui.cheatsheets\"/></with>"; private static final String ENABLEMENT_CHEATSHEETS = "<enablement>" + CS_INSTALLED + "</enablement>"; private static final String ENABLEMENT_INVALID = "<enablement>" + INVALID_INSTALLED + "</enablement>"; private static final String FILTER_IN = "<filter name = \"plugin\" value = \"org.eclipse.ua.tests\"/>"; @@ -57,13 +57,13 @@ public class TopicTest { private final String TOPIC_FILTER_OUT = TOPIC_HEAD_ECLIPSE + FILTER_OUT + TOPIC_END; private final String TOPIC_FILTER_MIXED = TOPIC_HEAD_ECLIPSE + FILTER_IN + FILTER_OUT + TOPIC_END; private final String TOPIC_OLD_FILTER = "<topic filter=\"plugin=org.eclipse.ua.tests\" href=\"www.eclipse.org\"" - + " label=\"Transformations and transformation configurations\"/>"; + + " label=\"Transformations and transformation configurations\"/>"; private final String TOPIC_OLD_FILTER_DISABLED = "<topic filter=\"plugin=org.eclipse.ua.invalid\" href=\"www.eclipse.org\"" - + " label=\"Transformations and transformation configurations\"/>"; + + " label=\"Transformations and transformation configurations\"/>"; private final String TOPIC_OLD_FILTER_IN__NEGATED = "<topic filter=\"plugin!=org.eclipse.ua.tests\" href=\"www.eclipse.org\"" - + " label=\"Transformations and transformation configurations\"/>"; + + " label=\"Transformations and transformation configurations\"/>"; private final String TOPIC_OLD_FILTER_OUT_NEGATED = "<topic filter=\"plugin!=org.eclipse.ua.invalid\" href=\"www.eclipse.org\"" - + " label=\"Transformations and transformation configurations\"/>"; + + " label=\"Transformations and transformation configurations\"/>"; private final String TOPIC_WITH_CHILD = TOPIC_HEAD_ECLIPSE + TOPIC_BUGZILLA + TOPIC_END; private int mode; @@ -84,7 +84,7 @@ public class TopicTest { Topic topic; Document doc; try { - doc = DocumentCreator.createDocument(topicSource); + doc = DocumentCreator.createDocument(topicSource); } catch (Exception e) { fail("Caught Exception"); doc = null; diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UAElementTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UAElementTest.java index e4b5f37a1..e6e50e689 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UAElementTest.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UAElementTest.java @@ -43,11 +43,11 @@ public class UAElementTest { Object topicChildren = element.getChildren(Topic.class); assertTrue(topicChildren instanceof Topic[]); assertTrue(((Topic[])topicChildren).length == 0); - assertNull(element.getParentElement()); - assertNull(element.getAttribute("a1")); - assertTrue(element.equals(element)); - assertFalse(element.equals(null)); - assertFalse(element.equals("A string")); + assertNull(element.getParentElement()); + assertNull(element.getAttribute("a1")); + assertTrue(element.equals(element)); + assertFalse(element.equals(null)); + assertFalse(element.equals("A string")); } @Test diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserCriterionDefinition.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserCriterionDefinition.java index 285cab30a..6cfbb85d6 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserCriterionDefinition.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserCriterionDefinition.java @@ -58,7 +58,7 @@ public class UserCriterionDefinition implements ICriterionDefinition { @Override public IUAElement[] getChildren() { - return getCriterionValueDefinitions(); + return getCriterionValueDefinitions(); } @Override diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserCriterionValueDefinition.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserCriterionValueDefinition.java index 7d42135bf..dd4af58c7 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserCriterionValueDefinition.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/UserCriterionValueDefinition.java @@ -45,7 +45,7 @@ public class UserCriterionValueDefinition implements ICriterionValueDefinition { @Override public IUAElement[] getChildren() { - return new IUAElement[0]; + return new IUAElement[0]; } } diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/HelpServerTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/HelpServerTest.java index fe3026e48..50381f6a4 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/HelpServerTest.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/HelpServerTest.java @@ -51,7 +51,7 @@ public class HelpServerTest extends PerformanceTestCase { for (int i=0; i < 100; ++i) { boolean warmup = i < 2; if (!warmup) { - startMeasuring(); + startMeasuring(); } for (int j = 0; j <= 100; j++) { @@ -59,8 +59,8 @@ public class HelpServerTest extends PerformanceTestCase { } if (!warmup) { - stopMeasuring(); - } + stopMeasuring(); + } } commitMeasurements(); @@ -75,14 +75,14 @@ public class HelpServerTest extends PerformanceTestCase { boolean warmup = i < 2; LoadServletUtil.stopServer(); if (!warmup) { - startMeasuring(); + startMeasuring(); } LoadServletUtil.startServer(); if (!warmup) { - stopMeasuring(); - } + stopMeasuring(); + } } commitMeasurements(); diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/IndexAssemblePerformanceTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/IndexAssemblePerformanceTest.java index 1091be281..588c9fadc 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/IndexAssemblePerformanceTest.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/IndexAssemblePerformanceTest.java @@ -55,14 +55,14 @@ public class IndexAssemblePerformanceTest extends PerformanceTestCase { for (int i=0; i < 10; ++i) { boolean warmup = i == 0; if (!warmup) { - startMeasuring(); + startMeasuring(); } assembleIndex(); if (!warmup) { - stopMeasuring(); - } + stopMeasuring(); + } } commitMeasurements(); diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/LowIterationHelpServerTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/LowIterationHelpServerTest.java index 8b990160a..7b956f5a1 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/LowIterationHelpServerTest.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/LowIterationHelpServerTest.java @@ -51,7 +51,7 @@ public class LowIterationHelpServerTest extends PerformanceTestCase { for (int i=0; i < 15; ++i) { boolean warmup = i < 2; if (!warmup) { - startMeasuring(); + startMeasuring(); } for (int j = 0; j <= 20; j++) { @@ -59,8 +59,8 @@ public class LowIterationHelpServerTest extends PerformanceTestCase { } if (!warmup) { - stopMeasuring(); - } + stopMeasuring(); + } } commitMeasurements(); @@ -75,14 +75,14 @@ public class LowIterationHelpServerTest extends PerformanceTestCase { boolean warmup = i < 2; LoadServletUtil.stopServer(); if (!warmup) { - startMeasuring(); + startMeasuring(); } LoadServletUtil.startServer(); if (!warmup) { - stopMeasuring(); - } + stopMeasuring(); + } } commitMeasurements(); diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/TocAssemblePerformanceTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/TocAssemblePerformanceTest.java index 4c9549b11..e3efd43d0 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/TocAssemblePerformanceTest.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/TocAssemblePerformanceTest.java @@ -85,14 +85,14 @@ public class TocAssemblePerformanceTest extends PerformanceTestCase { for (int i=0; i < 100; ++i) { boolean warmup = i < 2; if (!warmup) { - startMeasuring(); + startMeasuring(); } for (int j = 0; j < 20; j++) { - assembleToc(); + assembleToc(); } if (!warmup) { - stopMeasuring(); - } + stopMeasuring(); + } } commitMeasurements(); diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/preferences/HelpDataTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/preferences/HelpDataTest.java index 69ccb706c..1fd25a4f1 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/preferences/HelpDataTest.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/preferences/HelpDataTest.java @@ -52,11 +52,11 @@ public class HelpDataTest { @Before public void setUp() throws Exception { baseTocsPreference = Platform.getPreferencesService().getString - (HelpPlugin.PLUGIN_ID, HelpPlugin.BASE_TOCS_KEY, "", null); + (HelpPlugin.PLUGIN_ID, HelpPlugin.BASE_TOCS_KEY, "", null); ignoredTocsPreference = Platform.getPreferencesService().getString - (HelpPlugin.PLUGIN_ID, HelpPlugin.IGNORED_TOCS_KEY, "", null); + (HelpPlugin.PLUGIN_ID, HelpPlugin.IGNORED_TOCS_KEY, "", null); ignoredIndexesPreference = Platform.getPreferencesService().getString - (HelpPlugin.PLUGIN_ID, HelpPlugin.IGNORED_INDEXES_KEY, "", null); + (HelpPlugin.PLUGIN_ID, HelpPlugin.IGNORED_INDEXES_KEY, "", null); setBaseTocs(""); setIgnoredTocs(""); setIgnoredIndexes(""); @@ -70,18 +70,18 @@ public class HelpDataTest { } private void setBaseTocs(String value) { - IEclipsePreferences pref = InstanceScope.INSTANCE.getNode(HelpPlugin.PLUGIN_ID); - pref.put(HelpPlugin.BASE_TOCS_KEY, value); + IEclipsePreferences pref = InstanceScope.INSTANCE.getNode(HelpPlugin.PLUGIN_ID); + pref.put(HelpPlugin.BASE_TOCS_KEY, value); } private void setIgnoredTocs(String value) { - IEclipsePreferences pref = InstanceScope.INSTANCE.getNode(HelpPlugin.PLUGIN_ID); - pref.put(HelpPlugin.IGNORED_TOCS_KEY, value); + IEclipsePreferences pref = InstanceScope.INSTANCE.getNode(HelpPlugin.PLUGIN_ID); + pref.put(HelpPlugin.IGNORED_TOCS_KEY, value); } private void setIgnoredIndexes(String value) { - IEclipsePreferences pref = InstanceScope.INSTANCE.getNode(HelpPlugin.PLUGIN_ID); - pref.put(HelpPlugin.IGNORED_INDEXES_KEY, value); + IEclipsePreferences pref = InstanceScope.INSTANCE.getNode(HelpPlugin.PLUGIN_ID); + pref.put(HelpPlugin.IGNORED_INDEXES_KEY, value); } @Test diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/ContentServletTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/ContentServletTest.java index ca97940fb..bb27b932b 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/ContentServletTest.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/ContentServletTest.java @@ -45,7 +45,7 @@ public class ContentServletTest { final String path = "/data/help/index/topic1.html"; String remoteContent = RemoteTestUtils.getRemoteContent(UA_TESTS, path, "en"); String localContent = RemoteTestUtils.getLocalContent(UA_TESTS, path); - assertEquals(remoteContent, localContent); + assertEquals(remoteContent, localContent); } @Test @@ -53,7 +53,7 @@ public class ContentServletTest { final String path = "/data/help/manual/filter.xhtml"; String remoteContent = RemoteTestUtils.getRemoteContent(UA_TESTS, path, "en"); String localContent = RemoteTestUtils.getLocalContent(UA_TESTS, path); - assertEquals(remoteContent, localContent); + assertEquals(remoteContent, localContent); } @Test @@ -61,7 +61,7 @@ public class ContentServletTest { final String path = "/data/help/search/testnl1.xhtml"; String remoteContent = RemoteTestUtils.getRemoteContent(UA_TESTS, path, "en"); String localContent = RemoteTestUtils.getLocalContent(UA_TESTS, path); - assertEquals(remoteContent, localContent); + assertEquals(remoteContent, localContent); } @Test @@ -70,8 +70,8 @@ public class ContentServletTest { String remoteContent = RemoteTestUtils.getRemoteContent(UA_TESTS, path, "de"); String enLocalContent = RemoteTestUtils.getLocalContent(UA_TESTS, path); String deLocalContent = RemoteTestUtils.getLocalContent(UA_TESTS, "/nl/de" + path); - assertEquals(remoteContent, deLocalContent); - assertFalse(remoteContent.equals(enLocalContent)); + assertEquals(remoteContent, deLocalContent); + assertFalse(remoteContent.equals(enLocalContent)); } @Test(expected = IOException.class) diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/ContextServletTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/ContextServletTest.java index 753030a36..327793835 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/ContextServletTest.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/ContextServletTest.java @@ -67,7 +67,7 @@ public class ContextServletTest { @Test public void testRemoteContextFoundDe() throws Exception { Element[] topics = getContextsUsingLocale - ("org.eclipse.ua.tests.test_cheatsheets", "de"); + ("org.eclipse.ua.tests.test_cheatsheets", "de"); assertEquals(1, topics.length); assertEquals("German Context", topics[0].getAttribute("label")); } diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/GetContentUsingRemoteHelp.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/GetContentUsingRemoteHelp.java index c945dccd3..5fcf061dc 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/GetContentUsingRemoteHelp.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/GetContentUsingRemoteHelp.java @@ -37,8 +37,8 @@ public class GetContentUsingRemoteHelp { @Before public void setUp() throws Exception { BaseHelpSystem.ensureWebappRunning(); - mode = BaseHelpSystem.getMode(); - RemotePreferenceStore.savePreferences(); + mode = BaseHelpSystem.getMode(); + RemotePreferenceStore.savePreferences(); RemotePreferenceStore.setMockRemoteServer(); RemotePreferenceStore.disableErrorPage(); BaseHelpSystem.setMode(BaseHelpSystem.MODE_INFOCENTER); @@ -63,8 +63,8 @@ public class GetContentUsingRemoteHelp { @Test public void testContentFound() throws Exception { - final String path = "/data/help/index/topic1.html"; - String remoteContent = getHelpContent("mock.toc", path, "en"); + final String path = "/data/help/index/topic1.html"; + String remoteContent = getHelpContent("mock.toc", path, "en"); int port = TestServerManager.getPort(0); String expectedContent = RemoteTestUtils.createMockContent("mock.toc", path, "en", port); assertEquals(expectedContent, remoteContent); @@ -72,8 +72,8 @@ public class GetContentUsingRemoteHelp { @Test public void testContentFoundDe() throws Exception { - final String path = "/data/help/index/topic2.html"; - String remoteContent = getHelpContent("mock.toc", path, "de"); + final String path = "/data/help/index/topic2.html"; + String remoteContent = getHelpContent("mock.toc", path, "de"); int port = TestServerManager.getPort(0); String expectedContent = RemoteTestUtils.createMockContent("mock.toc", path, "de", port); assertEquals(expectedContent, remoteContent); @@ -81,8 +81,8 @@ public class GetContentUsingRemoteHelp { @Test public void testLocalBeatsRemote() throws Exception { - final String path = "/doc/help_home.html"; - String plugin = "org.eclipse.help.base"; + final String path = "/doc/help_home.html"; + String plugin = "org.eclipse.help.base"; String helpContent = getHelpContent(plugin, path, "en"); String localContent = RemoteTestUtils.getLocalContent(plugin, path); assertEquals(localContent, helpContent); @@ -93,8 +93,8 @@ public class GetContentUsingRemoteHelp { RemotePreferenceStore.setMockRemotePriority(); HelpPlugin.getTocManager().clearCache(); HelpPlugin.getTocManager().getTocs("en"); - final String path = "/doc/help_home.html"; - String plugin = "org.eclipse.help.base"; + final String path = "/doc/help_home.html"; + String plugin = "org.eclipse.help.base"; String helpContent = getHelpContent(plugin, path, "en"); int port = TestServerManager.getPort(0); @@ -109,20 +109,20 @@ public class GetContentUsingRemoteHelp { HelpPlugin.getTocManager().clearCache(); HelpPlugin.getTocManager().getTocs("en"); //Verify help coming from first one - final String path = "/doc/help_home.html"; - String plugin = "org.eclipse.help.base"; - String helpContent = GetContentUsingRemoteHelp.getHelpContent(plugin, path, "en"); + final String path = "/doc/help_home.html"; + String plugin = "org.eclipse.help.base"; + String helpContent = GetContentUsingRemoteHelp.getHelpContent(plugin, path, "en"); - //Get remote content from first one in prefs + //Get remote content from first one in prefs - int port0 = TestServerManager.getPort(0); - String remoteContent0 = RemoteTestUtils.createMockContent(plugin, path, "en", port0); + int port0 = TestServerManager.getPort(0); + String remoteContent0 = RemoteTestUtils.createMockContent(plugin, path, "en", port0); - int port1 = TestServerManager.getPort(1); - String remoteContent1 = RemoteTestUtils.createMockContent(plugin, path, "en", port1); + int port1 = TestServerManager.getPort(1); + String remoteContent1 = RemoteTestUtils.createMockContent(plugin, path, "en", port1); - assertEquals(remoteContent0, helpContent); - assertFalse(remoteContent1.equals(helpContent)); + assertEquals(remoteContent0, helpContent); + assertFalse(remoteContent1.equals(helpContent)); } @@ -133,21 +133,21 @@ public class GetContentUsingRemoteHelp { HelpPlugin.getTocManager().clearCache(); HelpPlugin.getTocManager().getTocs("en"); //Verify help coming from first one - final String path = "/doc/help_home.html"; - String plugin = "org.eclipse.help.base"; - String helpContent = GetContentUsingRemoteHelp.getHelpContent(plugin, path, "en"); + final String path = "/doc/help_home.html"; + String plugin = "org.eclipse.help.base"; + String helpContent = GetContentUsingRemoteHelp.getHelpContent(plugin, path, "en"); - //Get remote content from second in prefs + //Get remote content from second in prefs - int port0 = TestServerManager.getPort(0); - String remoteContent0 = RemoteTestUtils.createMockContent(plugin, path, "en", port0); + int port0 = TestServerManager.getPort(0); + String remoteContent0 = RemoteTestUtils.createMockContent(plugin, path, "en", port0); - int port1 = TestServerManager.getPort(1); - String remoteContent1 = RemoteTestUtils.createMockContent(plugin, path, "en", port1); + int port1 = TestServerManager.getPort(1); + String remoteContent1 = RemoteTestUtils.createMockContent(plugin, path, "en", port1); - assertEquals(remoteContent1, helpContent); - assertFalse(remoteContent0.equals(helpContent)); + assertEquals(remoteContent1, helpContent); + assertFalse(remoteContent0.equals(helpContent)); } @@ -157,7 +157,7 @@ public class GetContentUsingRemoteHelp { HelpPlugin.getTocManager().clearCache(); HelpPlugin.getTocManager().getTocs("en"); final String path = "/data/help/nonlocal.html"; - String plugin = "org.eclipse.help.base"; + String plugin = "org.eclipse.help.base"; String remoteContent = getHelpContent(plugin, path, "en"); int port = TestServerManager.getPort(0); String expectedContent = RemoteTestUtils.createMockContent(plugin, path, "en", port); diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/GetContextUsingRemoteHelp.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/GetContextUsingRemoteHelp.java index b0818d852..a4c7b1a77 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/GetContextUsingRemoteHelp.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/GetContextUsingRemoteHelp.java @@ -33,8 +33,8 @@ public class GetContextUsingRemoteHelp { @Before public void setUp() throws Exception { - RemotePreferenceStore.savePreferences(); - mode = BaseHelpSystem.getMode(); + RemotePreferenceStore.savePreferences(); + mode = BaseHelpSystem.getMode(); RemotePreferenceStore.setMockRemoteServer(); BaseHelpSystem.setMode(BaseHelpSystem.MODE_INFOCENTER); } @@ -57,7 +57,7 @@ public class GetContextUsingRemoteHelp { assertEquals("context_one_en", title); RemotePreferenceStore.disableRemoteHelp(); context = HelpPlugin.getContextManager().getContext("org.eclipse.ua.tests.test_one", "en"); - assertNull(context); + assertNull(context); } @Test @@ -79,7 +79,7 @@ public class GetContextUsingRemoteHelp { @Test public void testContextNotFound() throws Exception { IContext context = HelpPlugin.getContextManager().getContext("org.eclipse.ua.tests.no_such_ctx", "en"); - assertNull(context); + assertNull(context); } } diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/IndexServletTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/IndexServletTest.java index a4f2780c1..70fa9941b 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/IndexServletTest.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/IndexServletTest.java @@ -56,70 +56,70 @@ public class IndexServletTest { public void testIndexServletContainsSimpleWord() throws Exception { Node root = getIndexContributions("en"); Element[] UARoot = findEntryInAllContributions(root, "xyz"); - assertEquals(1, UARoot.length); + assertEquals(1, UARoot.length); } @Test public void testIndexServletContainsWordWithAccent() throws Exception { Node root = getIndexContributions("en"); Element[] UARoot = findEntryInAllContributions(root, "\u00E1mbito"); - assertEquals(1, UARoot.length); + assertEquals(1, UARoot.length); } @Test public void testIndexServletContainsWordWithGt() throws Exception { Node root = getIndexContributions("en"); Element[] UARoot = findEntryInAllContributions(root, "character >"); - assertEquals(1, UARoot.length); + assertEquals(1, UARoot.length); } @Test public void testIndexServletContainsWordWithLt() throws Exception { Node root = getIndexContributions("en"); Element[] UARoot = findEntryInAllContributions(root, "character <"); - assertEquals(1, UARoot.length); + assertEquals(1, UARoot.length); } @Test public void testIndexServletContainsWordWithAmp() throws Exception { Node root = getIndexContributions("en"); Element[] UARoot = findEntryInAllContributions(root, "character &"); - assertEquals(1, UARoot.length); + assertEquals(1, UARoot.length); } @Test public void testIndexServletContainsWordWithQuot() throws Exception { Node root = getIndexContributions("en"); Element[] UARoot = findEntryInAllContributions(root, "character \""); - assertEquals(1, UARoot.length); + assertEquals(1, UARoot.length); } @Test public void testIndexServletContainsWordWithApostrophe() throws Exception { Node root = getIndexContributions("en"); Element[] UARoot = findEntryInAllContributions(root, "character '"); - assertEquals(1, UARoot.length); + assertEquals(1, UARoot.length); } @Test public void testDeWordNotInEnIndex() throws Exception { Node root = getIndexContributions("en"); Element[] UARoot = findEntryInAllContributions(root, "munich"); - assertEquals(0, UARoot.length); + assertEquals(0, UARoot.length); } @Test public void testWordInDeIndex() throws Exception { Node root = getIndexContributions("de"); Element[] UARoot = findEntryInAllContributions(root, "munich"); - assertEquals(1, UARoot.length); + assertEquals(1, UARoot.length); } @Test public void testWordNotInDeIndex() throws Exception { Node root = getIndexContributions("de"); Element[] UARoot = findEntryInAllContributions(root, "xyz"); - assertEquals(0, UARoot.length); + assertEquals(0, UARoot.length); } private Element[] findEntryInAllContributions(Node parent, String keyword) { @@ -131,7 +131,7 @@ public class IndexServletTest { Element nextElement = (Element)next; if ("indexContribution".equals(nextElement.getTagName())) { findEntryInIndexContribution(nextElement, keyword, results); - } + } } } return results.toArray(new Element[results.size()]); diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/LoadIndexUsingRemoteHelp.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/LoadIndexUsingRemoteHelp.java index 7297180db..56d18699a 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/LoadIndexUsingRemoteHelp.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/LoadIndexUsingRemoteHelp.java @@ -33,8 +33,8 @@ public class LoadIndexUsingRemoteHelp { @Before public void setUp() throws Exception { - RemotePreferenceStore.savePreferences(); - mode = BaseHelpSystem.getMode(); + RemotePreferenceStore.savePreferences(); + mode = BaseHelpSystem.getMode(); BaseHelpSystem.setMode(BaseHelpSystem.MODE_INFOCENTER); } @@ -71,7 +71,7 @@ public class LoadIndexUsingRemoteHelp { HelpPlugin.getIndexManager().clearCache(); index = HelpPlugin.getIndexManager().getIndex(locale); // Entry 1 has the same child on each remote server, Entry 2 has different children - entry1 = matchingEntries(index, "entry1_" + locale); + entry1 = matchingEntries(index, "entry1_" + locale); entry2 = matchingEntries(index, "entry2_" + locale); assertEquals(1, entry1.length); assertEquals(1, entry1[0].getTopics().length); diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/LoadTocUsingRemoteHelp.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/LoadTocUsingRemoteHelp.java index 6219a48fb..9ea8d9c27 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/LoadTocUsingRemoteHelp.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/LoadTocUsingRemoteHelp.java @@ -29,8 +29,8 @@ public class LoadTocUsingRemoteHelp { @Before public void setUp() throws Exception { - RemotePreferenceStore.savePreferences(); - mode = BaseHelpSystem.getMode(); + RemotePreferenceStore.savePreferences(); + mode = BaseHelpSystem.getMode(); } @After @@ -53,7 +53,7 @@ public class LoadTocUsingRemoteHelp { assertEquals(0, deTocs); deTocs = matchingTocs(tocs, "Mock Toc 2 de"); assertEquals(0, deTocs); - RemotePreferenceStore.disableRemoteHelp(); + RemotePreferenceStore.disableRemoteHelp(); } @Test @@ -70,7 +70,7 @@ public class LoadTocUsingRemoteHelp { assertEquals(1, deTocs); deTocs = matchingTocs(tocs, "Mock Toc 2 de"); assertEquals(1, deTocs); - RemotePreferenceStore.disableRemoteHelp(); + RemotePreferenceStore.disableRemoteHelp(); } @Test @@ -83,7 +83,7 @@ public class LoadTocUsingRemoteHelp { assertEquals(1, enTocs); int deTocs = matchingTocs(tocs, "Mock Toc de"); assertEquals(0, deTocs); - RemotePreferenceStore.disableRemoteHelp(); + RemotePreferenceStore.disableRemoteHelp(); } /* diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/MockContentServlet.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/MockContentServlet.java index 8f334e8d3..6a5564cf3 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/MockContentServlet.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/MockContentServlet.java @@ -46,8 +46,8 @@ public class MockContentServlet extends HttpServlet { resp.setStatus(HttpServletResponse.SC_NOT_FOUND); } else { int port = req.getLocalPort(); - String response = RemoteTestUtils.createMockContent(plugin, file, locale, port); - resp.getWriter().write(response); + String response = RemoteTestUtils.createMockContent(plugin, file, locale, port); + resp.getWriter().write(response); } callcount++; } diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/MockSearchServlet.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/MockSearchServlet.java index f2f9393ff..260243d56 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/MockSearchServlet.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/MockSearchServlet.java @@ -46,8 +46,8 @@ public class MockSearchServlet extends HttpServlet { 0, null, null, null, false); results.add(hit); } - String response = SearchServlet.serialize(results); - resp.getWriter().write(response); + String response = SearchServlet.serialize(results); + resp.getWriter().write(response); } private boolean isSearchHit(String phrase, String locale) { diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/MockTocServlet.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/MockTocServlet.java index 5df3acbcf..110d75200 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/MockTocServlet.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/MockTocServlet.java @@ -46,10 +46,10 @@ public class MockTocServlet extends TocServlet { UserTopic topic2 = new UserTopic("Topic_" + locale, "http://www.eclipse.org", true); toc2.addTopic(topic2); TocContribution contribution2 = createToc(toc2, "mock.toc", locale); - String response; + String response; try { response = serialize(new TocContribution[] { contribution1, contribution2 }, locale); - resp.getWriter().write(response); + resp.getWriter().write(response); } catch (TransformerException e) { resp.sendError(400); } @@ -62,10 +62,10 @@ public class MockTocServlet extends TocServlet { contribution.setContributorId(id); contribution.setExtraDocuments(new String[0]); contribution.setLocale(locale); - contribution.setPrimary(true); - contribution.setSubToc(false); + contribution.setPrimary(true); + contribution.setSubToc(false); contribution.setId(id); - contribution.setToc(new Toc(toc)); + contribution.setToc(new Toc(toc)); return contribution; } diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/ParallelSearchServletTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/ParallelSearchServletTest.java index a304a373f..9e927d168 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/ParallelSearchServletTest.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/ParallelSearchServletTest.java @@ -89,24 +89,24 @@ public class ParallelSearchServletTest { @Test public void testNotFoundInParallel() { ParallelTestSupport.testInParallel(new SearchServletTester[] - { new SearchServletTester("duernfryehd", 0), - new SearchServletTester("duernfryehd", 0)}, 100); + { new SearchServletTester("duernfryehd", 0), + new SearchServletTester("duernfryehd", 0)}, 100); } @Test public void testFoundInParallel() { ParallelTestSupport.testInParallel(new SearchServletTester[] - { new SearchServletTester("jehcyqpfjs", 1), - new SearchServletTester("jehcyqpfjs", 1)}, 100); + { new SearchServletTester("jehcyqpfjs", 1), + new SearchServletTester("jehcyqpfjs", 1)}, 100); } @Test public void testMixedParallelSearches() { ParallelTestSupport.testInParallel(new SearchServletTester[] - { new SearchServletTester("jehcyqpfjs", 1), + { new SearchServletTester("jehcyqpfjs", 1), new SearchServletTester("duernfryehd", 0), - new SearchServletTester("jehcyqpfjs", 1), - new SearchServletTester("duernfryehd", 0)}, 100); + new SearchServletTester("jehcyqpfjs", 1), + new SearchServletTester("duernfryehd", 0)}, 100); } private Node[] getSearchHitsFromServlet(String phrase) diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/ParallelSearchUsingRemote.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/ParallelSearchUsingRemote.java index 19920e7eb..2450d316f 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/ParallelSearchUsingRemote.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/ParallelSearchUsingRemote.java @@ -44,8 +44,8 @@ public class ParallelSearchUsingRemote { @Before public void setUp() throws Exception { - RemotePreferenceStore.savePreferences(); - mode = BaseHelpSystem.getMode(); + RemotePreferenceStore.savePreferences(); + mode = BaseHelpSystem.getMode(); } @After @@ -59,7 +59,7 @@ public class ParallelSearchUsingRemote { BaseHelpSystem.setMode(BaseHelpSystem.MODE_INFOCENTER); RemotePreferenceStore.setMockRemoteServer(); ParallelTestSupport.testSingleCase(new Searcher(), 100); - RemotePreferenceStore.disableRemoteHelp(); + RemotePreferenceStore.disableRemoteHelp(); } @Test @@ -71,7 +71,7 @@ public class ParallelSearchUsingRemote { testCases[i] = new Searcher(); } ParallelTestSupport.testInParallel(testCases, 100); - RemotePreferenceStore.disableRemoteHelp(); + RemotePreferenceStore.disableRemoteHelp(); } } diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/RemotePreferenceStore.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/RemotePreferenceStore.java index 5941a4bbb..dd6592147 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/RemotePreferenceStore.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/RemotePreferenceStore.java @@ -34,36 +34,36 @@ public class RemotePreferenceStore { private static String pageNotFound; public static void savePreferences() throws Exception { - namePreference = Platform.getPreferencesService().getString - (HelpBasePlugin.PLUGIN_ID, IHelpBaseConstants.P_KEY_REMOTE_HELP_NAME, - "", null); - hostPreference = Platform.getPreferencesService().getString - (HelpBasePlugin.PLUGIN_ID, IHelpBaseConstants.P_KEY_REMOTE_HELP_HOST, - "", null); + namePreference = Platform.getPreferencesService().getString + (HelpBasePlugin.PLUGIN_ID, IHelpBaseConstants.P_KEY_REMOTE_HELP_NAME, + "", null); + hostPreference = Platform.getPreferencesService().getString + (HelpBasePlugin.PLUGIN_ID, IHelpBaseConstants.P_KEY_REMOTE_HELP_HOST, + "", null); pathPreference = Platform.getPreferencesService().getString - (HelpBasePlugin.PLUGIN_ID, IHelpBaseConstants.P_KEY_REMOTE_HELP_PATH, - "", null); + (HelpBasePlugin.PLUGIN_ID, IHelpBaseConstants.P_KEY_REMOTE_HELP_PATH, + "", null); protocolPreference = Platform.getPreferencesService().getString - (HelpBasePlugin.PLUGIN_ID, IHelpBaseConstants.P_KEY_REMOTE_HELP_PROTOCOL, - "", null); + (HelpBasePlugin.PLUGIN_ID, IHelpBaseConstants.P_KEY_REMOTE_HELP_PROTOCOL, + "", null); portPreference = Platform.getPreferencesService().getString - (HelpBasePlugin.PLUGIN_ID, IHelpBaseConstants.P_KEY_REMOTE_HELP_PORT, - "", null); + (HelpBasePlugin.PLUGIN_ID, IHelpBaseConstants.P_KEY_REMOTE_HELP_PORT, + "", null); icEnabledPreference = Platform.getPreferencesService().getString - (HelpBasePlugin.PLUGIN_ID, IHelpBaseConstants.P_KEY_REMOTE_HELP_ICEnabled, - "", null); + (HelpBasePlugin.PLUGIN_ID, IHelpBaseConstants.P_KEY_REMOTE_HELP_ICEnabled, + "", null); defaultPort = Platform.getPreferencesService().getString - (HelpBasePlugin.PLUGIN_ID, IHelpBaseConstants.P_KEY_REMOTE_HELP_DEFAULT_PORT, - "", null); + (HelpBasePlugin.PLUGIN_ID, IHelpBaseConstants.P_KEY_REMOTE_HELP_DEFAULT_PORT, + "", null); helpOn = Platform.getPreferencesService().getString - (HelpBasePlugin.PLUGIN_ID, IHelpBaseConstants.P_KEY_REMOTE_HELP_ON, - "", null); + (HelpBasePlugin.PLUGIN_ID, IHelpBaseConstants.P_KEY_REMOTE_HELP_ON, + "", null); remoteHelpPreferred = Platform.getPreferencesService().getString - (HelpBasePlugin.PLUGIN_ID, IHelpBaseConstants.P_KEY_REMOTE_HELP_PREFERRED, - "", null); + (HelpBasePlugin.PLUGIN_ID, IHelpBaseConstants.P_KEY_REMOTE_HELP_PREFERRED, + "", null); pageNotFound = Platform.getPreferencesService().getString - (HelpBasePlugin.PLUGIN_ID, IHelpBaseConstants.P_PAGE_NOT_FOUND, - "", null); + (HelpBasePlugin.PLUGIN_ID, IHelpBaseConstants.P_PAGE_NOT_FOUND, + "", null); } public static void restorePreferences() throws Exception { @@ -81,7 +81,7 @@ public class RemotePreferenceStore { } public static void setMockRemoteServer() throws Exception { - TestServerManager.start("ua.test", 0); + TestServerManager.start("ua.test", 0); RemotePreferenceTest.setPreference("remoteHelpOn", "true"); RemotePreferenceTest.setPreference("remoteHelpHost", "localhost"); RemotePreferenceTest.setPreference("remoteHelpPath", "/help"); @@ -94,8 +94,8 @@ public class RemotePreferenceStore { } public static void setTwoMockRemoteServers() throws Exception { - TestServerManager.start("ua.test", 0); - TestServerManager.start("ua.test2", 1); + TestServerManager.start("ua.test", 0); + TestServerManager.start("ua.test2", 1); RemotePreferenceTest.setPreference("remoteHelpOn", "true"); RemotePreferenceTest.setPreference("remoteHelpHost", "localhost,localhost"); RemotePreferenceTest.setPreference("remoteHelpPath", "/help,/help"); @@ -108,8 +108,8 @@ public class RemotePreferenceStore { RemotePreferenceTest.setPreference("remoteHelpICContributed", "false,false"); } public static void setTwoMockRemoteServersReversePriority() throws Exception { - TestServerManager.start("ua.test", 0); - TestServerManager.start("ua.test2", 1); + TestServerManager.start("ua.test", 0); + TestServerManager.start("ua.test2", 1); RemotePreferenceTest.setPreference("remoteHelpOn", "true"); RemotePreferenceTest.setPreference("remoteHelpHost", "localhost,localhost"); RemotePreferenceTest.setPreference("remoteHelpPath", "/help,/help"); diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/RemotePreferenceTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/RemotePreferenceTest.java index 2bc431b73..81954be6f 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/RemotePreferenceTest.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/RemotePreferenceTest.java @@ -35,7 +35,7 @@ public class RemotePreferenceTest { @Before public void setUp() throws Exception { - RemotePreferenceStore.savePreferences(); + RemotePreferenceStore.savePreferences(); } @After diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/SearchIndexCreation.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/SearchIndexCreation.java index 55b783d58..2ffbecdab 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/SearchIndexCreation.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/SearchIndexCreation.java @@ -37,8 +37,8 @@ public class SearchIndexCreation { @Before public void setUp() throws Exception { BaseHelpSystem.ensureWebappRunning(); - mode = BaseHelpSystem.getMode(); - RemotePreferenceStore.savePreferences(); + mode = BaseHelpSystem.getMode(); + RemotePreferenceStore.savePreferences(); RemotePreferenceStore.setMockRemoteServer(); RemotePreferenceStore.disableErrorPage(); BaseHelpSystem.setMode(BaseHelpSystem.MODE_INFOCENTER); @@ -103,7 +103,7 @@ public class SearchIndexCreation { if (status.getException() != null) { throw status.getException(); } - fail(doc + " status = " + status.getMessage()); + fail(doc + " status = " + status.getMessage()); } } diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/SearchUsingRemoteHelp.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/SearchUsingRemoteHelp.java index ec56f4c41..2c5c3b650 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/SearchUsingRemoteHelp.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/SearchUsingRemoteHelp.java @@ -26,8 +26,8 @@ public class SearchUsingRemoteHelp { @Before public void setUp() throws Exception { - RemotePreferenceStore.savePreferences(); - mode = BaseHelpSystem.getMode(); + RemotePreferenceStore.savePreferences(); + mode = BaseHelpSystem.getMode(); } @After @@ -42,8 +42,8 @@ public class SearchUsingRemoteHelp { RemotePreferenceStore.setMockRemoteServer(); SearchTestUtils.searchOneLocale("endfdsadsads", new String[] { "http://www.eclipse.org" }, "en"); - RemotePreferenceStore.disableRemoteHelp(); - SearchTestUtils.searchOneLocale("endfdsadsads", new String[0], "en"); + RemotePreferenceStore.disableRemoteHelp(); + SearchTestUtils.searchOneLocale("endfdsadsads", new String[0], "en"); } @Test @@ -52,8 +52,8 @@ public class SearchUsingRemoteHelp { RemotePreferenceStore.setTwoMockRemoteServers(); SearchTestUtils.searchOneLocale("endfdsadsads", new String[] { "http://www.eclipse.org" }, "en"); - RemotePreferenceStore.disableRemoteHelp(); - SearchTestUtils.searchOneLocale("endfdsadsads", new String[0], "en"); + RemotePreferenceStore.disableRemoteHelp(); + SearchTestUtils.searchOneLocale("endfdsadsads", new String[0], "en"); } @Test @@ -61,24 +61,24 @@ public class SearchUsingRemoteHelp { BaseHelpSystem.setMode(BaseHelpSystem.MODE_INFOCENTER); RemotePreferenceStore.setMockRemoteServer(); SearchTestUtils.searchOneLocale("dedfdsadsads", new String[] { "http://www.eclipse.org" }, "de"); - RemotePreferenceStore.disableRemoteHelp(); - SearchTestUtils.searchOneLocale("dedfdsadsads", new String[0], "de"); + RemotePreferenceStore.disableRemoteHelp(); + SearchTestUtils.searchOneLocale("dedfdsadsads", new String[0], "de"); } @Test public void testSearchEnWordInDeLocale() throws Exception { BaseHelpSystem.setMode(BaseHelpSystem.MODE_INFOCENTER); RemotePreferenceStore.setMockRemoteServer(); - SearchTestUtils.searchOneLocale("endfdsadsads", new String[0], "de"); - RemotePreferenceStore.disableRemoteHelp(); + SearchTestUtils.searchOneLocale("endfdsadsads", new String[0], "de"); + RemotePreferenceStore.disableRemoteHelp(); } @Test public void testSearchDeWordInEnLocale() throws Exception { BaseHelpSystem.setMode(BaseHelpSystem.MODE_INFOCENTER); RemotePreferenceStore.setMockRemoteServer(); - SearchTestUtils.searchOneLocale("dedfdsadsads", new String[0], "en"); - RemotePreferenceStore.disableRemoteHelp(); + SearchTestUtils.searchOneLocale("dedfdsadsads", new String[0], "en"); + RemotePreferenceStore.disableRemoteHelp(); } } diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/TestServerManager.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/TestServerManager.java index 1238f983a..2157f06f2 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/TestServerManager.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/TestServerManager.java @@ -41,8 +41,8 @@ public class TestServerManager { public static void stop(String webappName, int index) throws CoreException { if (serverRunning[index]) { - getHelpServer(index).stop(webappName); - serverRunning[index] = false; + getHelpServer(index).stop(webappName); + serverRunning[index] = false; } } @@ -51,7 +51,7 @@ public class TestServerManager { } public static String getHost(int index) { - return getHelpServer(index).getHost(); + return getHelpServer(index).getHost(); } } diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/TocServletTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/TocServletTest.java index 90f53d0b4..b7b094b14 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/TocServletTest.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/TocServletTest.java @@ -56,51 +56,51 @@ public class TocServletTest { public void testTocServletContainsUAToc() throws Exception { Node root = getTocContributions("en"); Element[] UARoot = findContributionById(root, "/org.eclipse.ua.tests/data/help/toc/root.xml"); - assertEquals(1, UARoot.length); + assertEquals(1, UARoot.length); } @Test public void testTocServletContainsFilteredToc() throws Exception { Node root = getTocContributions("en"); Element[] UARoot = findContributionById(root, "/org.eclipse.ua.tests/data/help/toc/filteredToc/toc.xml"); - assertEquals(1, UARoot.length); + assertEquals(1, UARoot.length); } @Test public void testTocServletContainsUnlinkedToc() throws Exception { Node root = getTocContributions("en"); Element[] UARoot = findContributionById(root, "/org.eclipse.ua.tests/data/help/toc/filteredToc/nonPrimaryToc.xml"); - assertEquals(1, UARoot.length); + assertEquals(1, UARoot.length); } @Test public void testReadEnToc() throws Exception { Node root = getTocContributions("en"); Element[] uaRoot = findContributionById(root, "/org.eclipse.ua.tests/data/help/search/toc.xml"); - assertEquals(1, uaRoot.length); - Element[] toc = findChildren(uaRoot[0], "toc", "label", "search"); - assertEquals(1, toc.length); - Element[] topicSearch = findChildren(toc[0], "topic", "label", "search"); - assertEquals(1, topicSearch.length); - Element[] topicEn = findChildren(topicSearch[0], "topic", "label", "testen.html"); - assertEquals(1, topicEn.length); - Element[] topicDe = findChildren(topicSearch[0], "topic", "label", "testde.html"); - assertEquals(0, topicDe.length); + assertEquals(1, uaRoot.length); + Element[] toc = findChildren(uaRoot[0], "toc", "label", "search"); + assertEquals(1, toc.length); + Element[] topicSearch = findChildren(toc[0], "topic", "label", "search"); + assertEquals(1, topicSearch.length); + Element[] topicEn = findChildren(topicSearch[0], "topic", "label", "testen.html"); + assertEquals(1, topicEn.length); + Element[] topicDe = findChildren(topicSearch[0], "topic", "label", "testde.html"); + assertEquals(0, topicDe.length); } @Test public void testReadDeToc() throws Exception { Node root = getTocContributions("de"); Element[] uaRoot = findContributionById(root, "/org.eclipse.ua.tests/data/help/search/toc.xml"); - assertEquals(1, uaRoot.length); - Element[] toc = findChildren(uaRoot[0], "toc", "label", "search"); - assertEquals(1, toc.length); - Element[] topicSearch = findChildren(toc[0], "topic", "label", "search"); - assertEquals(1, topicSearch.length); - Element[] topicEn = findChildren(topicSearch[0], "topic", "label", "testen.html"); - assertEquals(0, topicEn.length); - Element[] topicDe = findChildren(topicSearch[0], "topic", "label", "testde.html"); - assertEquals(1, topicDe.length); + assertEquals(1, uaRoot.length); + Element[] toc = findChildren(uaRoot[0], "toc", "label", "search"); + assertEquals(1, toc.length); + Element[] topicSearch = findChildren(toc[0], "topic", "label", "search"); + assertEquals(1, topicSearch.length); + Element[] topicEn = findChildren(topicSearch[0], "topic", "label", "testen.html"); + assertEquals(0, topicEn.length); + Element[] topicDe = findChildren(topicSearch[0], "topic", "label", "testde.html"); + assertEquals(1, topicDe.length); } private Element[] findContributionById(Node root, String id) { @@ -116,7 +116,7 @@ public class TocServletTest { Element nextElement = (Element)next; if ( childKind.equals(nextElement.getTagName()) && attributeValue.equals(nextElement.getAttribute(attributeName))) { - results.add(next); + results.add(next); } } } diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/scope/IntersectionTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/scope/IntersectionTest.java index c4e406d19..53400feaf 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/scope/IntersectionTest.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/scope/IntersectionTest.java @@ -26,7 +26,7 @@ public class IntersectionTest { private AbstractHelpScope createScope(char char1, char char2) { AbstractHelpScope result = new IntersectionScope( new AbstractHelpScope[]{new MockScope(char1, true), - new MockScope(char2, true)}); + new MockScope(char2, true)}); return result; } diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/scope/UnionTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/scope/UnionTest.java index 592a131c7..b5b5ae746 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/scope/UnionTest.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/scope/UnionTest.java @@ -26,7 +26,7 @@ public class UnionTest { private AbstractHelpScope createScope(char char1, char char2) { AbstractHelpScope result = new UnionScope( new AbstractHelpScope[]{new MockScope(char1, true), - new MockScope(char2, true)}); + new MockScope(char2, true)}); return result; } diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/AnalyzerTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/AnalyzerTest.java index 71b83b208..def6b987c 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/AnalyzerTest.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/AnalyzerTest.java @@ -24,90 +24,90 @@ public class AnalyzerTest { private final String[] supportedLanguages = { "en", "pt", "ja", "zh", "cs", "de", "el", "fr", "nl", "ru", "ar" }; @Test - public void testEnglishAnalyzer() { - checkAnalyzer("en", "en"); - } + public void testEnglishAnalyzer() { + checkAnalyzer("en", "en"); + } @Test - public void testEnglishUsAnalyzer() { - checkAnalyzer("en_us", "en"); - } + public void testEnglishUsAnalyzer() { + checkAnalyzer("en_us", "en"); + } @Test - public void testGermanAnalyzer_de() { - checkAnalyzer("de", "de"); - } + public void testGermanAnalyzer_de() { + checkAnalyzer("de", "de"); + } @Test - public void testGermanAnalyzer_de_DE() { - checkAnalyzer("de_DE", "de"); - } + public void testGermanAnalyzer_de_DE() { + checkAnalyzer("de_DE", "de"); + } @Test - public void testJapaneseAnalyzer() { - checkAnalyzer("ja", "ja"); - } + public void testJapaneseAnalyzer() { + checkAnalyzer("ja", "ja"); + } @Test - public void testFrenchAnalyzer() { - checkAnalyzer("fr", "fr"); - } + public void testFrenchAnalyzer() { + checkAnalyzer("fr", "fr"); + } @Test - public void testChineseAnalyzer() { - checkAnalyzer("zh", "zh"); - } + public void testChineseAnalyzer() { + checkAnalyzer("zh", "zh"); + } - // Korean and japanese share an analyzer + // Korean and japanese share an analyzer @Test - public void testKoreanAnalyzer() { - checkAnalyzer("ko", "ja"); - } + public void testKoreanAnalyzer() { + checkAnalyzer("ko", "ja"); + } @Test - public void testRussianAnalyzer() { - checkAnalyzer("ru", "ru"); - } + public void testRussianAnalyzer() { + checkAnalyzer("ru", "ru"); + } @Test - public void testGreekAnalyzer() { - checkAnalyzer("el", "el"); - } + public void testGreekAnalyzer() { + checkAnalyzer("el", "el"); + } - // Uses default + // Uses default @Test - public void testSpanishAnalyzer() { - checkAnalyzer("es", "ar"); - } + public void testSpanishAnalyzer() { + checkAnalyzer("es", "ar"); + } @Test - public void testPortugueseAnalyzer() { - checkAnalyzer("pt", "pt"); - } + public void testPortugueseAnalyzer() { + checkAnalyzer("pt", "pt"); + } @Test - public void testDutchAnalyzer() { - checkAnalyzer("nl", "nl"); - } + public void testDutchAnalyzer() { + checkAnalyzer("nl", "nl"); + } @Test - public void testCzechAnalyzer() { - checkAnalyzer("cs", "cs"); - } + public void testCzechAnalyzer() { + checkAnalyzer("cs", "cs"); + } - // Uses default + // Uses default @Test - public void testArabicAnalyzer() { - checkAnalyzer("ar", "ar"); - } + public void testArabicAnalyzer() { + checkAnalyzer("ar", "ar"); + } - // Use default + // Use default @Test - public void testHebrewAnalyzer() { - checkAnalyzer("il", "ar"); - } + public void testHebrewAnalyzer() { + checkAnalyzer("il", "ar"); + } - private void checkAnalyzer(String language, String analyzerKind) { + private void checkAnalyzer(String language, String analyzerKind) { AnalyzerDescriptor an = new AnalyzerDescriptor(language); for (String nextLocale : supportedLanguages) { diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/BasicTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/BasicTest.java index 45d8ec7ba..3c3f6aab3 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/BasicTest.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/BasicTest.java @@ -24,8 +24,8 @@ public class BasicTest { // appears in both filtered and unfiltered parts of test1.xhtml @Test public void testSearchFilteredAndUnfiltered() { - SearchTestUtils.searchAllLocales ("vkrhjewiwh", new String[] { "/org.eclipse.ua.tests/data/help/search/test1.xhtml"}); - } + SearchTestUtils.searchAllLocales ("vkrhjewiwh", new String[] { "/org.eclipse.ua.tests/data/help/search/test1.xhtml"}); + } // try OR'ing with a word that does't exist.. should find same result @Test @@ -60,70 +60,70 @@ public class BasicTest { // word is in test3.xhtml and also included by test4.xhtml, contributed // into test5.xhtml as an extension, and replaces a paragraph in test6.xhtml. @Test - public void testSearchInclusionAndExtension() { + public void testSearchInclusionAndExtension() { SearchTestUtils.searchAllLocales("fuejnghqjs", new String[] {"/org.eclipse.ua.tests/data/help/search/test3.xhtml", "/org.eclipse.ua.tests/data/help/search/test4.xhtml", "/org.eclipse.ua.tests/data/help/search/test5.xhtml", "/org.eclipse.ua.tests/data/help/search/test6.xhtml" }); } // only exists in paragraph in test6.xhtml that's replaced by another one @Test - public void testSearchInReplacedOut() { + public void testSearchInReplacedOut() { SearchTestUtils.searchAllLocales("bheufnjefa", new String[0] /* no hits*/ ); } - // Test replacement using ExtensionProvider + // Test replacement using ExtensionProvider @Test - public void testSearchInReplaceOutUsingProvider() { - SearchTestUtils.searchAllLocales("ausjduehf", new String[] {"/org.eclipse.ua.tests/data/help/search/test6.xhtml" } ); - } + public void testSearchInReplaceOutUsingProvider() { + SearchTestUtils.searchAllLocales("ausjduehf", new String[] {"/org.eclipse.ua.tests/data/help/search/test6.xhtml" } ); + } - // Test replacement using ExtensionProvider + // Test replacement using ExtensionProvider @Test - public void testSearchInReplacemenTextUsingProvider() { - SearchTestUtils.searchAllLocales("bheufnjefb", new String[0] /* no hits*/ ); - } + public void testSearchInReplacemenTextUsingProvider() { + SearchTestUtils.searchAllLocales("bheufnjefb", new String[0] /* no hits*/ ); + } // sanity test to make sure it finds things in XHTML content in .html file @Test - public void testSearchXhtmlInHtml() { + public void testSearchXhtmlInHtml() { SearchTestUtils.searchAllLocales("kejehrgaqm", new String[] {"/org.eclipse.ua.tests/data/help/search/test7.html" }); - } + } // same as above, but in a section that should never be filtered @Test - public void testSearchXhtmlNeverFiltered() { + public void testSearchXhtmlNeverFiltered() { SearchTestUtils.searchAllLocales("opqmenhfjs", new String[] {"/org.eclipse.ua.tests/data/help/search/test7.html" }); - } + } // only exists in a paragraph in test7.html that should be filtered out // make sure this works for XHTML content inside .html file @Test - public void testSearchFilteredXhtmlInHtml() { + public void testSearchFilteredXhtmlInHtml() { SearchTestUtils.searchAllLocales("hugftnhdtg", new String[] {"/org.eclipse.ua.tests/data/help/search/test7.html" }); - } + } // this doc is listed in TOC several times, using slightly different paths @Test - public void testSearchMultipleTocReference() { + public void testSearchMultipleTocReference() { SearchTestUtils.searchAllLocales("rqfedajhtg", new String[] {"/org.eclipse.ua.tests/data/help/search/test9.htm" }); - } + } @Test - public void testSearchMultipleNonadjacentWords() { - SearchTestUtils.searchAllLocales("gsdduvfqnh riehguanil", new String[] { "/org.eclipse.ua.tests/data/help/search/test1.xhtml" } ); - } + public void testSearchMultipleNonadjacentWords() { + SearchTestUtils.searchAllLocales("gsdduvfqnh riehguanil", new String[] { "/org.eclipse.ua.tests/data/help/search/test1.xhtml" } ); + } @Test - public void testSearchMultipleNonadjacentExactMatch() { - SearchTestUtils.searchAllLocales("\"gsdduvfqnh riehguanil\"", new String[0]); - } + public void testSearchMultipleNonadjacentExactMatch() { + SearchTestUtils.searchAllLocales("\"gsdduvfqnh riehguanil\"", new String[0]); + } @Test - public void testSearchMultipleAdjacentExactMatch() { - SearchTestUtils.searchAllLocales("\"vkrhjewiwh riehguanil\"", new String[] { "/org.eclipse.ua.tests/data/help/search/test1.xhtml"}); - } + public void testSearchMultipleAdjacentExactMatch() { + SearchTestUtils.searchAllLocales("\"vkrhjewiwh riehguanil\"", new String[] { "/org.eclipse.ua.tests/data/help/search/test1.xhtml"}); + } @Test - public void testSearchContentProducer() { - SearchTestUtils.searchAllLocales("egrology", new String[] { "/org.eclipse.ua.tests/generated/Generated+Parent/Parent+page+with+searchable+word+egrology+.html"}); - } + public void testSearchContentProducer() { + SearchTestUtils.searchAllLocales("egrology", new String[] { "/org.eclipse.ua.tests/generated/Generated+Parent/Parent+page+with+searchable+word+egrology+.html"}); + } } diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/EncodedCharacterSearch.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/EncodedCharacterSearch.java index 31398d5c3..a2b550832 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/EncodedCharacterSearch.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/EncodedCharacterSearch.java @@ -17,30 +17,30 @@ import org.junit.Test; public class EncodedCharacterSearch { @Test - public void testIso8859() { - SearchTestUtils.searchOneLocale("\u00E1guilaxaxcs", new String[] {"/org.eclipse.ua.tests/data/help/search/testnl8859.htm" }, "en"); - } + public void testIso8859() { + SearchTestUtils.searchOneLocale("\u00E1guilaxaxcs", new String[] {"/org.eclipse.ua.tests/data/help/search/testnl8859.htm" }, "en"); + } @Test - public void testIso8859AccentNotIgnored() { - SearchTestUtils.searchOneLocale("aguilaxaxcs", new String[0], "en"); - } + public void testIso8859AccentNotIgnored() { + SearchTestUtils.searchOneLocale("aguilaxaxcs", new String[0], "en"); + } @Test - public void testUtf8Accented() { - SearchTestUtils.searchOneLocale("acfele\u00F3n", new String[] {"/org.eclipse.ua.tests/data/help/search/testnlUTF8.htm" }, "en"); - } + public void testUtf8Accented() { + SearchTestUtils.searchOneLocale("acfele\u00F3n", new String[] {"/org.eclipse.ua.tests/data/help/search/testnlUTF8.htm" }, "en"); + } @Test - public void testUtf8Chinese() { - SearchTestUtils.searchOneLocale("\u8FB2\u66C6\u65B0\u5E74", new String[] {"/org.eclipse.ua.tests/data/help/search/testnlUTF8.htm" }, "en"); - } + public void testUtf8Chinese() { + SearchTestUtils.searchOneLocale("\u8FB2\u66C6\u65B0\u5E74", new String[] {"/org.eclipse.ua.tests/data/help/search/testnlUTF8.htm" }, "en"); + } @Test - public void testUtf8Hebrew() { - SearchTestUtils.searchOneLocale("\u05D0\u05B7\u05E1\u05B0\u05D8\u05B0\u05E8\u05D5\u05B9\u05E0\u05D5\u05B9\u05DE" - + "\u05B0\u05D9\u05B8\u05D4) \u05DC\u05B4\u05E7\u05BC\u05D5\u05BC\u05D9 (\u05D9\u05E8\u05D7 \u05D0\u05D5 \u05E9\u05DE\u05E9", new String[] {"/org.eclipse.ua.tests/data/help/search/testnlUTF8.htm" }, "en"); - } + public void testUtf8Hebrew() { + SearchTestUtils.searchOneLocale("\u05D0\u05B7\u05E1\u05B0\u05D8\u05B0\u05E8\u05D5\u05B9\u05E0\u05D5\u05B9\u05DE" + + "\u05B0\u05D9\u05B8\u05D4) \u05DC\u05B4\u05E7\u05BC\u05D5\u05BC\u05D9 (\u05D9\u05E8\u05D7 \u05D0\u05D5 \u05E9\u05DE\u05E9", new String[] {"/org.eclipse.ua.tests/data/help/search/testnlUTF8.htm" }, "en"); + } } diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/ExtraDirTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/ExtraDirTest.java index c5e239838..254e991b6 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/ExtraDirTest.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/ExtraDirTest.java @@ -47,8 +47,8 @@ public class ExtraDirTest { @Test public void testContainingScope() { - performSearch("iusazemhdv", "/org.eclipse.ua.tests/data/help/toc/root.xml", "/org.eclipse.ua.tests/data/help/search/test8.htm" ); - } + performSearch("iusazemhdv", "/org.eclipse.ua.tests/data/help/toc/root.xml", "/org.eclipse.ua.tests/data/help/search/test8.htm" ); + } // try with another toc's search scope; shouldn't find it @Test diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/InfocenterWorkingSetManagerTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/InfocenterWorkingSetManagerTest.java index 62b604396..86495e7a6 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/InfocenterWorkingSetManagerTest.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/InfocenterWorkingSetManagerTest.java @@ -39,7 +39,7 @@ public class InfocenterWorkingSetManagerTest { @Test public void testIWSMWithToc() throws IOException { InfocenterWorkingSetManager mgr = new InfocenterWorkingSetManager - (new MockServletRequest(), new MockServletResponse(), "en"); + (new MockServletRequest(), new MockServletResponse(), "en"); WorkingSet wset = new WorkingSet("test"); AdaptableToc toc = mgr.getAdaptableToc("/org.eclipse.ua.tests/data/help/toc/root.xml"); assertNotNull(toc); @@ -90,7 +90,7 @@ public class InfocenterWorkingSetManagerTest { assertEquals(1, resources.length); Set<AdaptableTopic> topics = new HashSet<>(); topics.add(topic1); - assertTrue(topics.contains(resources[0])); + assertTrue(topics.contains(resources[0])); checkCookies(resp); } @@ -113,8 +113,8 @@ public class InfocenterWorkingSetManagerTest { Set<AdaptableTopic> topics = new HashSet<>(); topics.add(topic1); topics.add(topic3); - assertTrue(topics.contains(resources[0])); - assertTrue(topics.contains(resources[1])); + assertTrue(topics.contains(resources[0])); + assertTrue(topics.contains(resources[1])); checkCookies(resp); } @@ -141,9 +141,9 @@ public class InfocenterWorkingSetManagerTest { topics.add(topic1); topics.add(topic3); topics.add(topic5); - assertTrue(topics.contains(resources[0])); - assertTrue(topics.contains(resources[1])); - assertTrue(topics.contains(resources[2])); + assertTrue(topics.contains(resources[0])); + assertTrue(topics.contains(resources[1])); + assertTrue(topics.contains(resources[2])); checkCookies(resp); } @@ -169,7 +169,7 @@ public class InfocenterWorkingSetManagerTest { assertEquals(1, resources.length); Set<AdaptableTopic> topics = new HashSet<>(); topics.add(topic1); - assertTrue(topics.contains(resources[0])); + assertTrue(topics.contains(resources[0])); checkCookies(resp); checkCookies(resp2); } @@ -198,8 +198,8 @@ public class InfocenterWorkingSetManagerTest { Set<AdaptableTopic> topics = new HashSet<>(); topics.add(topic1); topics.add(topic3); - assertTrue(topics.contains(resources[0])); - assertTrue(topics.contains(resources[1])); + assertTrue(topics.contains(resources[0])); + assertTrue(topics.contains(resources[1])); checkCookies(resp); checkCookies(resp2); } @@ -231,9 +231,9 @@ public class InfocenterWorkingSetManagerTest { topics.add(topic1); topics.add(topic3); topics.add(topic5); - assertTrue(topics.contains(resources[0])); - assertTrue(topics.contains(resources[1])); - assertTrue(topics.contains(resources[2])); + assertTrue(topics.contains(resources[0])); + assertTrue(topics.contains(resources[1])); + assertTrue(topics.contains(resources[2])); checkCookies(resp); checkCookies(resp2); } @@ -287,7 +287,7 @@ public class InfocenterWorkingSetManagerTest { int length1 = cookieLength(resp1.getCookies()); int length2 = cookieLength(resp2.getCookies()); - assertEquals(length1 + 4, length2); + assertEquals(length1 + 4, length2); checkCookies(resp1); checkCookies(resp2); } @@ -414,7 +414,7 @@ public class InfocenterWorkingSetManagerTest { CriterionResource[] criteria = createResourceWithTwoCriteria(); wset.setCriteria(criteria); mgr.addWorkingSet(wset); - MockServletRequest req2 = new MockServletRequest(); + MockServletRequest req2 = new MockServletRequest(); MockServletResponse resp2 = new MockServletResponse(); req2.setCookies(resp.getCookies()); InfocenterWorkingSetManager mgr2 = new InfocenterWorkingSetManager(req2, resp2, "en"); @@ -462,7 +462,7 @@ public class InfocenterWorkingSetManagerTest { String illegalChars = resp.getIllegalCharatersFound(); if (illegalChars.equals("") || illegalChars.equals("<")) { return; - } + } fail("Cookie contains these illegal characters " + illegalChars + '"'); } diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/LocaleTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/LocaleTest.java index 0476daa6d..fa0cc5faf 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/LocaleTest.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/LocaleTest.java @@ -19,113 +19,113 @@ import org.junit.Test; public class LocaleTest { @Test - public void testSearchWordInDefaultOnly() { - SearchTestUtils.searchOneLocale("duejrnfjudshebn", new String[] { "/org.eclipse.ua.tests/data/help/search/testnl1.xhtml"}, "en"); - SearchTestUtils.searchOneLocale("duejrnfjudshebn", new String[0], "de"); - } + public void testSearchWordInDefaultOnly() { + SearchTestUtils.searchOneLocale("duejrnfjudshebn", new String[] { "/org.eclipse.ua.tests/data/help/search/testnl1.xhtml"}, "en"); + SearchTestUtils.searchOneLocale("duejrnfjudshebn", new String[0], "de"); + } @Test - public void testSearchWordInNonDefaultOnly() { - SearchTestUtils.searchOneLocale("dkdskadksak", new String[] { "/org.eclipse.ua.tests/data/help/search/testnl1.xhtml"}, "de"); - SearchTestUtils.searchOneLocale("dkdskadksak", new String[0], "en"); - } + public void testSearchWordInNonDefaultOnly() { + SearchTestUtils.searchOneLocale("dkdskadksak", new String[] { "/org.eclipse.ua.tests/data/help/search/testnl1.xhtml"}, "de"); + SearchTestUtils.searchOneLocale("dkdskadksak", new String[0], "en"); + } @Test - public void testSearchExactMatchInDefaultOnly() { - SearchTestUtils.searchOneLocale("\"fesaggresgf duejrnfjudshebn\"", new String[] { "/org.eclipse.ua.tests/data/help/search/testnl1.xhtml"}, "en"); - SearchTestUtils.searchOneLocale("\"fesaggresgf duejrnfjudshebn\"", new String[0], "de"); - } + public void testSearchExactMatchInDefaultOnly() { + SearchTestUtils.searchOneLocale("\"fesaggresgf duejrnfjudshebn\"", new String[] { "/org.eclipse.ua.tests/data/help/search/testnl1.xhtml"}, "en"); + SearchTestUtils.searchOneLocale("\"fesaggresgf duejrnfjudshebn\"", new String[0], "de"); + } @Test - public void testSearchExactMatchInNonDefaultOnly() { - SearchTestUtils.searchOneLocale("\"dkdskadksak redfrewfdsa\"", new String[] { "/org.eclipse.ua.tests/data/help/search/testnl1.xhtml"}, "de"); - SearchTestUtils.searchOneLocale("\"dkdskadksak redfrewfdsa\"", new String[0], "en"); - } + public void testSearchExactMatchInNonDefaultOnly() { + SearchTestUtils.searchOneLocale("\"dkdskadksak redfrewfdsa\"", new String[] { "/org.eclipse.ua.tests/data/help/search/testnl1.xhtml"}, "de"); + SearchTestUtils.searchOneLocale("\"dkdskadksak redfrewfdsa\"", new String[0], "en"); + } @Test - public void testSearchWithWildcardInDefaultOnly() { - SearchTestUtils.searchOneLocale("duejrnf?udshebn", new String[] { "/org.eclipse.ua.tests/data/help/search/testnl1.xhtml"}, "en"); - SearchTestUtils.searchOneLocale("duejrnf?udshebn", new String[0], "de"); - } + public void testSearchWithWildcardInDefaultOnly() { + SearchTestUtils.searchOneLocale("duejrnf?udshebn", new String[] { "/org.eclipse.ua.tests/data/help/search/testnl1.xhtml"}, "en"); + SearchTestUtils.searchOneLocale("duejrnf?udshebn", new String[0], "de"); + } @Test - public void testSearchWithWildcardInNonDefaultOnly() { - SearchTestUtils.searchOneLocale("dkd?kadksak", new String[] { "/org.eclipse.ua.tests/data/help/search/testnl1.xhtml"}, "de"); - SearchTestUtils.searchOneLocale("dkd?kadksak", new String[0], "en"); - } + public void testSearchWithWildcardInNonDefaultOnly() { + SearchTestUtils.searchOneLocale("dkd?kadksak", new String[] { "/org.eclipse.ua.tests/data/help/search/testnl1.xhtml"}, "de"); + SearchTestUtils.searchOneLocale("dkd?kadksak", new String[0], "en"); + } @Test - public void testSearchPageNotInTocForLocale() { - SearchTestUtils.searchOneLocale("undefgfdsgfds", new String[0], "de"); - SearchTestUtils.searchOneLocale("undefgfdsgfds", new String[0], "en"); - } + public void testSearchPageNotInTocForLocale() { + SearchTestUtils.searchOneLocale("undefgfdsgfds", new String[0], "de"); + SearchTestUtils.searchOneLocale("undefgfdsgfds", new String[0], "en"); + } @Test - public void testSearchPageOnlyInDefaultToc() { - SearchTestUtils.searchOneLocale("idskrekfuej", new String[0], "de"); - SearchTestUtils.searchOneLocale("idskrekfuej", new String[] { "/org.eclipse.ua.tests/data/help/search/test_en.html"}, "en"); - } + public void testSearchPageOnlyInDefaultToc() { + SearchTestUtils.searchOneLocale("idskrekfuej", new String[0], "de"); + SearchTestUtils.searchOneLocale("idskrekfuej", new String[] { "/org.eclipse.ua.tests/data/help/search/test_en.html"}, "en"); + } @Test - public void testSearchPageOnlyInLocalToc() { - SearchTestUtils.searchOneLocale("deuufjfu", new String[0], "en"); - SearchTestUtils.searchOneLocale("deuufjfu", new String[] { "/org.eclipse.ua.tests/data/help/search/test_de.html"}, "de"); - } + public void testSearchPageOnlyInLocalToc() { + SearchTestUtils.searchOneLocale("deuufjfu", new String[0], "en"); + SearchTestUtils.searchOneLocale("deuufjfu", new String[] { "/org.eclipse.ua.tests/data/help/search/test_de.html"}, "de"); + } @Test - public void testSearchEnglishStemming_ed() { - SearchTestUtils.searchOneLocale("udjerufdjd", new String[0], "de"); - SearchTestUtils.searchOneLocale("udjerufdjd", new String[] { "/org.eclipse.ua.tests/data/help/search/test10.xhtml"}, "en"); - } + public void testSearchEnglishStemming_ed() { + SearchTestUtils.searchOneLocale("udjerufdjd", new String[0], "de"); + SearchTestUtils.searchOneLocale("udjerufdjd", new String[] { "/org.eclipse.ua.tests/data/help/search/test10.xhtml"}, "en"); + } @Test - public void testSearchEnglishStemming_ing() { - SearchTestUtils.searchOneLocale("kjfdskajdfska", new String[0], "de"); - SearchTestUtils.searchOneLocale("kjfdskajdfska", new String[] { "/org.eclipse.ua.tests/data/help/search/test10.xhtml"}, "en"); - } + public void testSearchEnglishStemming_ing() { + SearchTestUtils.searchOneLocale("kjfdskajdfska", new String[0], "de"); + SearchTestUtils.searchOneLocale("kjfdskajdfska", new String[] { "/org.eclipse.ua.tests/data/help/search/test10.xhtml"}, "en"); + } - // Prefixes are not matched by stemming + // Prefixes are not matched by stemming @Test - public void testSearchEnglishStemming_re() { - SearchTestUtils.searchOneLocale("dhdsahkdshakjd", new String[0], "de"); - SearchTestUtils.searchOneLocale("dhdsahkdshakjd", new String[0], "en"); - } - - /** - * Tests that the stemmer properly removes the German "e" suffix. - */ + public void testSearchEnglishStemming_re() { + SearchTestUtils.searchOneLocale("dhdsahkdshakjd", new String[0], "de"); + SearchTestUtils.searchOneLocale("dhdsahkdshakjd", new String[0], "en"); + } + + /** + * Tests that the stemmer properly removes the German "e" suffix. + */ @Test - public void testSearchGermanStemming_e() { - SearchTestUtils.searchOneLocale("dfskajkfsafaisch", new String[] { "/org.eclipse.ua.tests/data/help/search/test10.xhtml"}, "de"); - } + public void testSearchGermanStemming_e() { + SearchTestUtils.searchOneLocale("dfskajkfsafaisch", new String[] { "/org.eclipse.ua.tests/data/help/search/test10.xhtml"}, "de"); + } - /** - * Tests that the stemmer properly removes the German "en" suffix. - */ + /** + * Tests that the stemmer properly removes the German "en" suffix. + */ @Test - public void testSearchGermanStemming_en() { - SearchTestUtils.searchOneLocale("kirch", new String[] { "/org.eclipse.ua.tests/data/help/search/test10.xhtml"}, "de"); - SearchTestUtils.searchOneLocale("kirch", new String[0], "en"); - } + public void testSearchGermanStemming_en() { + SearchTestUtils.searchOneLocale("kirch", new String[] { "/org.eclipse.ua.tests/data/help/search/test10.xhtml"}, "de"); + SearchTestUtils.searchOneLocale("kirch", new String[0], "en"); + } @Test - public void testSearchQualifiedNames_en() { - SearchTestUtils.searchOneLocale("usjenfdj.udjeudj.uejdhehj", new String[] { "/org.eclipse.ua.tests/data/help/search/test10.xhtml" }, - "en" ); - SearchTestUtils.searchOneLocale("uejdhehj", new String[] { "/org.eclipse.ua.tests/data/help/search/test10.xhtml" }, - "en" ); - } - - /* - * FAILS - see bug Bug 219928 - public void testSearchQualifiedNames_de() { - SearchTestUtils.searchOneLocale("usjenfdj.udjeudj.uejdhehj", new String[] { "/org.eclipse.ua.tests/data/help/search/test10.xhtml" }, - "de" ); - SearchTestUtils.searchOneLocale("uejdhehj", new String[] { "/org.eclipse.ua.tests/data/help/search/test10.xhtml" }, - "de" ); - } - - */ + public void testSearchQualifiedNames_en() { + SearchTestUtils.searchOneLocale("usjenfdj.udjeudj.uejdhehj", new String[] { "/org.eclipse.ua.tests/data/help/search/test10.xhtml" }, + "en" ); + SearchTestUtils.searchOneLocale("uejdhehj", new String[] { "/org.eclipse.ua.tests/data/help/search/test10.xhtml" }, + "en" ); + } + + /* + * FAILS - see bug Bug 219928 + public void testSearchQualifiedNames_de() { + SearchTestUtils.searchOneLocale("usjenfdj.udjeudj.uejdhehj", new String[] { "/org.eclipse.ua.tests/data/help/search/test10.xhtml" }, + "de" ); + SearchTestUtils.searchOneLocale("uejdhehj", new String[] { "/org.eclipse.ua.tests/data/help/search/test10.xhtml" }, + "de" ); + } + + */ } diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/MockSearchParticipant.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/MockSearchParticipant.java index 6eb7f8a50..ea1ffaca9 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/MockSearchParticipant.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/MockSearchParticipant.java @@ -45,7 +45,7 @@ public class MockSearchParticipant extends SearchParticipant { String summary = isDoc1? "Summary1" : "Summary2"; String contents = isDoc1? "jkijkijkk frgeded" : "olhoykk lgktihku"; doc.setTitle(title); - doc.setSummary(summary); + doc.setSummary(summary); doc.addContents(contents); return Status.OK_STATUS; } diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/MockSearchParticipantXML.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/MockSearchParticipantXML.java index bdc013688..ccbc8276e 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/MockSearchParticipantXML.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/MockSearchParticipantXML.java @@ -48,7 +48,7 @@ public class MockSearchParticipantXML extends SearchParticipantXML { } String summary = attributes.getValue("summary"); if (summary != null) { - data.addToSummary(summary); + data.addToSummary(summary); } } diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/PrebuiltIndexCompatibility.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/PrebuiltIndexCompatibility.java index 94b828a3f..01323cc4b 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/PrebuiltIndexCompatibility.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/PrebuiltIndexCompatibility.java @@ -223,9 +223,9 @@ public class PrebuiltIndexCompatibility { assertFalse(index1.equals(index2)); } - /* - * Verifies that a prebuilt index can be searched - */ + /* + * Verifies that a prebuilt index can be searched + */ private void checkReadable(String indexPath) throws IOException, CorruptIndexException { Path path = new Path(indexPath); diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/WildcardTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/WildcardTest.java index 5bd5da776..02d0a41b0 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/WildcardTest.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/WildcardTest.java @@ -17,54 +17,54 @@ import org.junit.Test; public class WildcardTest { @Test - public void testSearchWithStar() { - SearchTestUtils.searchAllLocales("jehc*qpfjs", new String[] { "/org.eclipse.ua.tests/data/help/search/test1.xhtml" }); - } + public void testSearchWithStar() { + SearchTestUtils.searchAllLocales("jehc*qpfjs", new String[] { "/org.eclipse.ua.tests/data/help/search/test1.xhtml" }); + } @Test - public void testSearchWithTwoStars() { - SearchTestUtils.searchAllLocales("jehc*qp*js", new String[] { "/org.eclipse.ua.tests/data/help/search/test1.xhtml" }); - } + public void testSearchWithTwoStars() { + SearchTestUtils.searchAllLocales("jehc*qp*js", new String[] { "/org.eclipse.ua.tests/data/help/search/test1.xhtml" }); + } @Test - public void testSearchWithStarReplacingThreeChars() { - SearchTestUtils.searchAllLocales("jehc*fjs", new String[] { "/org.eclipse.ua.tests/data/help/search/test1.xhtml" }); - } + public void testSearchWithStarReplacingThreeChars() { + SearchTestUtils.searchAllLocales("jehc*fjs", new String[] { "/org.eclipse.ua.tests/data/help/search/test1.xhtml" }); + } - // Test that a star does not match spaces + // Test that a star does not match spaces @Test - public void testSearchWithStarReplacingSpace() { - SearchTestUtils.searchAllLocales("jehcyqpfjs*vkrhjewiwh", new String[0]); - } + public void testSearchWithStarReplacingSpace() { + SearchTestUtils.searchAllLocales("jehcyqpfjs*vkrhjewiwh", new String[0]); + } @Test - public void testSearchWithQuestionMark() { - SearchTestUtils.searchAllLocales("jehc?qpfjs", new String[] { "/org.eclipse.ua.tests/data/help/search/test1.xhtml" }); - } + public void testSearchWithQuestionMark() { + SearchTestUtils.searchAllLocales("jehc?qpfjs", new String[] { "/org.eclipse.ua.tests/data/help/search/test1.xhtml" }); + } @Test - public void testSearchWithTwoQuestionMarks() { - SearchTestUtils.searchAllLocales("j?hc?qpfjs", new String[] { "/org.eclipse.ua.tests/data/help/search/test1.xhtml" }); - } + public void testSearchWithTwoQuestionMarks() { + SearchTestUtils.searchAllLocales("j?hc?qpfjs", new String[] { "/org.eclipse.ua.tests/data/help/search/test1.xhtml" }); + } @Test - public void testSearchQuestionMarkCannotReplaceTwoChars() { - SearchTestUtils.searchAllLocales("jehc?pfjs", new String[0] ); - } + public void testSearchQuestionMarkCannotReplaceTwoChars() { + SearchTestUtils.searchAllLocales("jehc?pfjs", new String[0] ); + } @Test - public void testSearchSuccessiveQuestionMarks() { - SearchTestUtils.searchAllLocales("jehc??pfjs", new String[] { "/org.eclipse.ua.tests/data/help/search/test1.xhtml" } ); - } + public void testSearchSuccessiveQuestionMarks() { + SearchTestUtils.searchAllLocales("jehc??pfjs", new String[] { "/org.eclipse.ua.tests/data/help/search/test1.xhtml" } ); + } @Test - public void testSearchLeadingStar() { - SearchTestUtils.searchAllLocales("*hcyqpfjs", new String[] { "/org.eclipse.ua.tests/data/help/search/test1.xhtml" }); - } + public void testSearchLeadingStar() { + SearchTestUtils.searchAllLocales("*hcyqpfjs", new String[] { "/org.eclipse.ua.tests/data/help/search/test1.xhtml" }); + } @Test - public void testSearchLeadingQuestionMark() { - SearchTestUtils.searchAllLocales("?ehcyqpfjs", new String[] { "/org.eclipse.ua.tests/data/help/search/test1.xhtml" }); - } + public void testSearchLeadingQuestionMark() { + SearchTestUtils.searchAllLocales("?ehcyqpfjs", new String[] { "/org.eclipse.ua.tests/data/help/search/test1.xhtml" }); + } } diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/WorkingSetManagerTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/WorkingSetManagerTest.java index 90e4ec34f..61a726c86 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/WorkingSetManagerTest.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/WorkingSetManagerTest.java @@ -61,7 +61,7 @@ public class WorkingSetManagerTest { manager.removeWorkingSet(element); } for (WorkingSet workingSet : workingSets) { - manager.addWorkingSet(workingSet); + manager.addWorkingSet(workingSet); } manager.saveState(); } @@ -114,7 +114,7 @@ public class WorkingSetManagerTest { mgr.addWorkingSet(wset); WorkingSetScope scope = new WorkingSetScope("test", mgr, "scope"); for (int i = 1; i < tocs.length; i++) { - assertFalse(scope.inScope(tocs[i])); + assertFalse(scope.inScope(tocs[i])); } } @@ -130,9 +130,9 @@ public class WorkingSetManagerTest { WorkingSetScope scope = new WorkingSetScope("test", mgr, "scope"); for (int i = 1; i < tocs.length; i++) { ITopic[] topics = tocs[i].getTopics(); - for (ITopic topic : topics) { - assertFalse(scope.inScope(topic)); - } + for (ITopic topic : topics) { + assertFalse(scope.inScope(topic)); + } } } @@ -190,7 +190,7 @@ public class WorkingSetManagerTest { WorkingSetScope scope = new WorkingSetScope("test1", mgr, "scope"); Toc[] tocs = HelpPlugin.getTocManager().getTocs(Platform.getNL()); for (Toc toc : tocs) { - assertTrue(scope.inScope(toc)); + assertTrue(scope.inScope(toc)); } } @@ -203,7 +203,7 @@ public class WorkingSetManagerTest { for (Toc toc : tocs) {; ITopic[] topics = toc.getTopics(); for (ITopic topic : topics) { - assertTrue(scope.inScope(topic)); + assertTrue(scope.inScope(topic)); } } } @@ -219,7 +219,7 @@ public class WorkingSetManagerTest { for (ITopic topic : topics) { ITopic[] subtopics = topic.getSubtopics(); for (ITopic subtopic : subtopics) { - assertTrue(scope.inScope(subtopic)); + assertTrue(scope.inScope(subtopic)); } } } @@ -402,7 +402,7 @@ public class WorkingSetManagerTest { CriterionResource[] criteria = createResourceWithTwoCriteria(); wset.setCriteria(criteria); mgr.addWorkingSet(wset); - mgr.saveState(); + mgr.saveState(); WorkingSetManager mgr2 = new WorkingSetManager(); WorkingSet[] readWsets = mgr2.getWorkingSets(); diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/toc/EnabledTopicTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/toc/EnabledTopicTest.java index 2e3756d9d..39de08579 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/toc/EnabledTopicTest.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/toc/EnabledTopicTest.java @@ -136,41 +136,41 @@ public class EnabledTopicTest { @Test public void testEnabledTopicsEmptyArray() throws Exception { - ITopic[] enabled = EnabledTopicUtils.getEnabled(new ITopic[0]); - assertTrue(enabled.length == 0); + ITopic[] enabled = EnabledTopicUtils.getEnabled(new ITopic[0]); + assertTrue(enabled.length == 0); } @Test public void testEnabledTopicsAllEnabled() throws Exception { - ITopic[] topics = new ITopic[2]; - topics[0] = new ETopic("T1", true); - topics[1] = new ETopic("T2", true); + ITopic[] topics = new ITopic[2]; + topics[0] = new ETopic("T1", true); + topics[1] = new ETopic("T2", true); ITopic[] enabled = EnabledTopicUtils.getEnabled(topics); - assertTrue(enabled.length == 2); - assertTrue(topics[0].getLabel().equals("T1")); - assertTrue(topics[1].getLabel().equals("T2")); + assertTrue(enabled.length == 2); + assertTrue(topics[0].getLabel().equals("T1")); + assertTrue(topics[1].getLabel().equals("T2")); } @Test public void testEnabledTopicsAllDisabled() throws Exception { ITopic[] topics = new ITopic[2]; - topics[0] = new ETopic("T1", false); - topics[1] = new ETopic("T2", false); + topics[0] = new ETopic("T1", false); + topics[1] = new ETopic("T2", false); ITopic[] enabled = EnabledTopicUtils.getEnabled(topics); - assertTrue(enabled.length == 0); + assertTrue(enabled.length == 0); } @Test public void testEnabledTopicsMix() throws Exception { ITopic[] topics = new ITopic[4]; - topics[0] = new ETopic("T1", true); - topics[1] = new ETopic("T2", false); - topics[2] = new ETopic("T3", true); - topics[3] = new ETopic("T4", false); + topics[0] = new ETopic("T1", true); + topics[1] = new ETopic("T2", false); + topics[2] = new ETopic("T3", true); + topics[3] = new ETopic("T4", false); ITopic[] enabled = EnabledTopicUtils.getEnabled(topics); - assertEquals(2, enabled.length); - assertEquals("T1", enabled[0].getLabel()); - assertEquals("T3", enabled[1].getLabel()); + assertEquals(2, enabled.length); + assertEquals("T1", enabled[0].getLabel()); + assertEquals("T3", enabled[1].getLabel()); } @Test diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/toc/HelpData.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/toc/HelpData.java index 86b1afcb6..525d19b8c 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/toc/HelpData.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/toc/HelpData.java @@ -24,33 +24,33 @@ public class HelpData { @Test public void testHelpDataInPlugin() { List<String> result = ProductPreferences.getTocOrdering("org.eclipse.ua.tests", "data/help/toc/helpData.xml", ""); - assertEquals(2, result.size()); - assertEquals("/org.eclipse.platform.doc.user/toc.xml", result.get(0)); - assertEquals("/org.eclipse.platform.doc.isv/toc.xml", result.get(1)); + assertEquals(2, result.size()); + assertEquals("/org.eclipse.platform.doc.user/toc.xml", result.get(0)); + assertEquals("/org.eclipse.platform.doc.isv/toc.xml", result.get(1)); } @Test public void testPluginsRoot() { List<String> result = ProductPreferences.getTocOrdering("org.eclipse.sdk", "PLUGINS_ROOT/org.eclipse.ua.tests/data/help/toc/helpData.xml", ""); - assertEquals(2, result.size()); - assertEquals("/org.eclipse.platform.doc.user/toc.xml", result.get(0)); - assertEquals("/org.eclipse.platform.doc.isv/toc.xml", result.get(1)); + assertEquals(2, result.size()); + assertEquals("/org.eclipse.platform.doc.user/toc.xml", result.get(0)); + assertEquals("/org.eclipse.platform.doc.isv/toc.xml", result.get(1)); } @Test public void testHelpDataOverridesBaseTocs() { List<String> result = ProductPreferences.getTocOrdering("org.eclipse.ua.tests", "data/help/toc/helpData.xml", "org.eclipse.help"); - assertEquals(2, result.size()); - assertEquals("/org.eclipse.platform.doc.user/toc.xml", result.get(0)); - assertEquals("/org.eclipse.platform.doc.isv/toc.xml", result.get(1)); + assertEquals(2, result.size()); + assertEquals("/org.eclipse.platform.doc.user/toc.xml", result.get(0)); + assertEquals("/org.eclipse.platform.doc.isv/toc.xml", result.get(1)); } @Test public void testBaseTocs() { List<String> result = ProductPreferences.getTocOrdering("", "", "/org.eclipse.help/toc.xml,/org.eclipse.test/toc.xml"); - assertEquals(2, result.size()); - assertEquals("/org.eclipse.help/toc.xml", result.get(0)); - assertEquals("/org.eclipse.test/toc.xml", result.get(1)); + assertEquals(2, result.size()); + assertEquals("/org.eclipse.help/toc.xml", result.get(0)); + assertEquals("/org.eclipse.test/toc.xml", result.get(1)); } } diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/toc/TocSortingTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/toc/TocSortingTest.java index 62d95e6c1..03ce7cb34 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/toc/TocSortingTest.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/toc/TocSortingTest.java @@ -61,7 +61,7 @@ public class TocSortingTest { @Override public ITopic[] getTopics() { - return new ITopic[0]; + return new ITopic[0]; } @Override @@ -142,9 +142,9 @@ public class TocSortingTest { @Before public void setUp() throws Exception { helpDataPreference = Platform.getPreferencesService().getString - (HelpPlugin.HELP_DATA_KEY, HelpPlugin.HELP_DATA_KEY, "", null); + (HelpPlugin.HELP_DATA_KEY, HelpPlugin.HELP_DATA_KEY, "", null); baseTocsPreference = Platform.getPreferencesService().getString - (HelpPlugin.HELP_DATA_KEY, BASE_TOCS, "", null); + (HelpPlugin.HELP_DATA_KEY, BASE_TOCS, "", null); HelpData.clearProductHelpData(); ProductPreferences.resetPrimaryTocOrdering(); setHelpData(EMPTY_XML); @@ -165,8 +165,8 @@ public class TocSortingTest { } private void setBaseTocs(String value) { - IEclipsePreferences prefs = InstanceScope.INSTANCE.getNode(HelpPlugin.PLUGIN_ID); - prefs.put(BASE_TOCS, value); + IEclipsePreferences prefs = InstanceScope.INSTANCE.getNode(HelpPlugin.PLUGIN_ID); + prefs.put(BASE_TOCS, value); } private String toString(ITocContribution[] tocs) { diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/toc/TopicFinderTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/toc/TopicFinderTest.java index 080df51ef..9fdee391b 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/toc/TopicFinderTest.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/toc/TopicFinderTest.java @@ -158,7 +158,7 @@ public class TopicFinderTest { TopicFinder finder = new TopicFinder(topic, tocs, new UniversalScope()); int selectedToc = finder.getSelectedToc(); String navPath = "http://127.0.0.1:1936/help/nav/" + selectedToc + - '_' + index1 + '_' + index2; + '_' + index1 + '_' + index2; TopicFinder finder2 = new TopicFinder(navPath, tocs, new UniversalScope()); assertEquals(selectedToc, finder2.getSelectedToc()); ITopic[] topicPath = finder2.getTopicPath(); diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/util/DocumentCreator.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/util/DocumentCreator.java index 72d33252f..325c21330 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/util/DocumentCreator.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/util/DocumentCreator.java @@ -30,10 +30,10 @@ public class DocumentCreator { StringReader reader = new StringReader(input); InputSource source = new InputSource(reader); - DocumentBuilder documentBuilder = CheatSheetPlugin.getPlugin() + DocumentBuilder documentBuilder = CheatSheetPlugin.getPlugin() .getDocumentBuilder(); - return documentBuilder.parse(source); + return documentBuilder.parse(source); } } diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/util/LoadTestServlet.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/util/LoadTestServlet.java index a7125072c..7916491da 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/util/LoadTestServlet.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/util/LoadTestServlet.java @@ -40,7 +40,7 @@ public class LoadTestServlet extends HttpServlet { String repeatParam = req.getParameter("repeat"); int repetitions = 200; - try { + try { repetitions = Integer.parseInt(repeatParam); } catch (NumberFormatException e) { } diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/util/ParallelTestSupport.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/util/ParallelTestSupport.java index 07e57a2ac..cd1d81307 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/util/ParallelTestSupport.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/util/ParallelTestSupport.java @@ -84,7 +84,7 @@ public class ParallelTestSupport { this.repetitions = repetitions; } - public String failureReason = null; + public String failureReason = null; @Override public void run() { diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/ChildLinkInsertion.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/ChildLinkInsertion.java index 09cd5759e..c5deb0b5a 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/ChildLinkInsertion.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/ChildLinkInsertion.java @@ -52,120 +52,120 @@ public class ChildLinkInsertion { @Test public void testEmpty() { - final String input = ""; + final String input = ""; checkFilter(input, input); } @Test public void testNoMatch() { - final String input = "<HEAD><HEAD/>"; + final String input = "<HEAD><HEAD/>"; checkFilter(input, input); } @Test public void testPartialMatch1() { - final String input = "<A href = \"PLUGINS\"><!--INSTRUCT-->"; + final String input = "<A href = \"PLUGINS\"><!--INSTRUCT-->"; checkFilter(input, input); } @Test public void testPartialMatch2() { - final String input = "<A href = \"PLUGINS\"><!A -->"; + final String input = "<A href = \"PLUGINS\"><!A -->"; checkFilter(input, input); } @Test public void testPartialMatch3() { - final String input = "<A href = \"PLUGINS\"><!-A -->"; + final String input = "<A href = \"PLUGINS\"><!-A -->"; checkFilter(input, input); } @Test public void testPartialMatch4() { - final String input = "<A href = \"PLUGINS\"><!--A-->"; + final String input = "<A href = \"PLUGINS\"><!--A-->"; checkFilter(input, input); } @Test public void testEndsUnmatched() { - final String input = "<A><!--INSTR"; + final String input = "<A><!--INSTR"; checkFilter(input, input); } @Test public void testNotAtStart() { - final String input = "<A><!-- INSERT_CHILD_LINKS-->"; + final String input = "<A><!-- INSERT_CHILD_LINKS-->"; checkFilter(input, input); } @Test public void testSpaceBeforeEnd() { - final String input = "<A><!-- INSERT_CHILD_LINKS -->"; + final String input = "<A><!-- INSERT_CHILD_LINKS -->"; checkFilter(input, input); } @Test public void testTooManyCharacters_1() { - final String input = "<A><!--INSERT_CHILD_LINKSS-->"; + final String input = "<A><!--INSERT_CHILD_LINKSS-->"; checkFilter(input, input); } @Test public void testTooManyCharacters_2() { - final String input = "<A><!--INSERT_CHILD_LINKS_STYLES-->"; + final String input = "<A><!--INSERT_CHILD_LINKS_STYLES-->"; checkFilter(input, input); } @Test public void testAtStart() { - final String input = "<!--INSERT_CHILD_LINKS--><A>"; - final String expected = "<LINKS><A>"; + final String input = "<!--INSERT_CHILD_LINKS--><A>"; + final String expected = "<LINKS><A>"; checkFilter(input, expected); } @Test public void testChildStyle() { - final String input = "<!--INSERT_CHILD_LINK_STYLE--><A>"; - final String expected = "<STYLE><A>"; + final String input = "<!--INSERT_CHILD_LINK_STYLE--><A>"; + final String expected = "<STYLE><A>"; checkFilter(input, expected); } @Test public void testDefaultEncoding() { - final String input = ""; + final String input = ""; checkEncoding(input, null); } @Test public void testEncodingUtf8() { - final String input = - "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">"; + final String input = + "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">"; checkEncoding(input, "utf-8"); } @Test public void testMetaNoEncoding() { - final String input = - "<meta http-equiv=\"Content-Type\" content=\"text/html\">"; + final String input = + "<meta http-equiv=\"Content-Type\" content=\"text/html\">"; checkEncoding(input, null); } @Test public void testMultiMeta() { - final String input = - "<meta name=\"test\" content=\"test\">" + - "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">" + - "<meta name=\"test\" content=\"test\">"; + final String input = + "<meta name=\"test\" content=\"test\">" + + "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">" + + "<meta name=\"test\" content=\"test\">"; checkEncoding(input, "utf-8"); } @Test public void testMetaAndInsert() { - final String metaInfo = "<meta name=\"test\" content=\"test\">" + - "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">"; + final String metaInfo = "<meta name=\"test\" content=\"test\">" + + "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">"; final String input = - metaInfo + "<!--INSERT_CHILD_LINK_STYLE--><A>"; - final String expected = metaInfo + "<STYLE><A>"; + metaInfo + "<!--INSERT_CHILD_LINK_STYLE--><A>"; + final String expected = metaInfo + "<STYLE><A>"; checkFilter(input, expected); checkEncoding(input, "utf-8"); } diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/CommentFilterOne.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/CommentFilterOne.java index 834dc655b..b8509f0a0 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/CommentFilterOne.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/CommentFilterOne.java @@ -19,8 +19,8 @@ package org.eclipse.ua.tests.help.webapp; */ public class CommentFilterOne extends CommentFilter { - @Override + @Override protected String getCommentText() { - return "1"; - } + return "1"; + } } diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/CommentFilterThree.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/CommentFilterThree.java index 2f1fbfe1e..cad31060d 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/CommentFilterThree.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/CommentFilterThree.java @@ -20,8 +20,8 @@ package org.eclipse.ua.tests.help.webapp; public class CommentFilterThree extends CommentFilter { - @Override + @Override protected String getCommentText() { - return "3"; - } + return "3"; + } } diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/CommentFilterTwo.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/CommentFilterTwo.java index 1f39e2be2..c220c32e8 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/CommentFilterTwo.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/CommentFilterTwo.java @@ -20,8 +20,8 @@ package org.eclipse.ua.tests.help.webapp; public class CommentFilterTwo extends CommentFilter { - @Override + @Override protected String getCommentText() { - return "2"; - } + return "2"; + } } diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/FilterExtensionTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/FilterExtensionTest.java index 707c08ee9..df05d8bcf 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/FilterExtensionTest.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/FilterExtensionTest.java @@ -32,7 +32,7 @@ public class FilterExtensionTest { @After public void tearDown() throws Exception { - ExtraFilters.setFilters(new PrioritizedFilter[0]); + ExtraFilters.setFilters(new PrioritizedFilter[0]); } @Test diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/FilterTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/FilterTest.java index ef7444356..42aa1e9d3 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/FilterTest.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/FilterTest.java @@ -186,13 +186,13 @@ public class FilterTest { @Test public void testCharsetUtf8Upper() { InputStream is = new ByteArrayInputStream(CONTENT_TYPE_UTF8UC.getBytes()); - assertEquals("UTF-8", HTMLDocParser.getCharsetFromHTML(is)); + assertEquals("UTF-8", HTMLDocParser.getCharsetFromHTML(is)); } @Test public void testCharsetISO_8859_UCUpper() { InputStream is = new ByteArrayInputStream(CONTENT_TYPE_ISO_8859_1_UC.getBytes()); - assertEquals("ISO-8859-1", HTMLDocParser.getCharsetFromHTML(is)); + assertEquals("ISO-8859-1", HTMLDocParser.getCharsetFromHTML(is)); } } diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/HelpServerBinding.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/HelpServerBinding.java index 5d1c7d7bb..509fa5ea2 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/HelpServerBinding.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/HelpServerBinding.java @@ -52,14 +52,14 @@ public class HelpServerBinding { } private String getHostIP() throws UnknownHostException { - InetAddress host = InetAddress.getLocalHost(); - byte[] ipAddr = host.getAddress(); - String result = "" + ipAddr[0]; - for (int i = 1; i < ipAddr.length; i++) { - result += '.'; - result += ipAddr[i]; - } - return result; + InetAddress host = InetAddress.getLocalHost(); + byte[] ipAddr = host.getAddress(); + String result = "" + ipAddr[0]; + for (int i = 1; i < ipAddr.length; i++) { + result += '.'; + result += ipAddr[i]; + } + return result; } @Test @@ -80,7 +80,7 @@ public class HelpServerBinding { WebappManager.start("help"); assertTrue(canAccessServer("127.0.0.1")); if (testUsingIP) { - assertFalse(canAccessServer(getHostIP())); + assertFalse(canAccessServer(getHostIP())); } } @@ -91,7 +91,7 @@ public class HelpServerBinding { WebappManager.start("help"); assertTrue(canAccessServer("127.0.0.1")); if (testUsingIP) { - assertTrue(canAccessServer(getHostIP())); + assertTrue(canAccessServer(getHostIP())); } } diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/HelpServerInterrupt.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/HelpServerInterrupt.java index 3a438e0cc..9cff567b3 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/HelpServerInterrupt.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/HelpServerInterrupt.java @@ -78,7 +78,7 @@ public class HelpServerInterrupt { fail("Test did not complete within 10 seconds"); } Thread.sleep(sleepTime); - } while (starter.isAlive()); + } while (starter.isAlive()); Exception exception = starter.getException(); if (exception != null) { throw exception; @@ -97,7 +97,7 @@ public class HelpServerInterrupt { } starter.interrupt(); Thread.sleep(sleepTime); - } while (starter.isAlive()); + } while (starter.isAlive()); Exception exception = starter.getException(); if (exception != null) { throw exception; diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/ParallelServerAccessTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/ParallelServerAccessTest.java index 20dcc8879..4c0fe904a 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/ParallelServerAccessTest.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/ParallelServerAccessTest.java @@ -65,8 +65,8 @@ public class ParallelServerAccessTest { } for (int i = 0; i < numberOfThreads && complete; i++) { if (readers[i].isAlive()) { - complete = false; - try { + complete = false; + try { Thread.sleep(100); } catch (InterruptedException e) { fail("Interrupted Exception"); @@ -140,9 +140,9 @@ public class ParallelServerAccessTest { } } while (nextChar != '$'); } - if (uniqueId != value) { - throw new UnexpectedValueException(uniqueId, value); - } + if (uniqueId != value) { + throw new UnexpectedValueException(uniqueId, value); + } } private synchronized long getReadOperations() { diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/PluginsRootReplacement.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/PluginsRootReplacement.java index 123dac3ad..46e2b2870 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/PluginsRootReplacement.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/PluginsRootReplacement.java @@ -36,52 +36,52 @@ import org.junit.Test; public class PluginsRootReplacement { @Test public void testEmpty() { - final String input = ""; + final String input = ""; checkFilter(input, input); } @Test public void testNoMatch() { - final String input = "<HEAD><HEAD/>"; + final String input = "<HEAD><HEAD/>"; checkFilter(input, input); } @Test public void testPartialMatch() { - final String input = "<A href = \"PLUGINS\">"; + final String input = "<A href = \"PLUGINS\">"; checkFilter(input, input); } @Test public void testEndsUnmatched() { - final String input = "<A href = \"PLUGIN"; + final String input = "<A href = \"PLUGIN"; checkFilter(input, input); } @Test public void testNotAtStart() { - final String input = "<A href = \"../PLUGINS_ROOT/plugin/a.html\">"; + final String input = "<A href = \"../PLUGINS_ROOT/plugin/a.html\">"; checkFilter(input, input); } @Test public void testAtStart() { - final String input = "<A href = \"PLUGINS_ROOT/plugin/a.html\">"; - final String expected = "<A href = \"../plugin/a.html\">"; + final String input = "<A href = \"PLUGINS_ROOT/plugin/a.html\">"; + final String expected = "<A href = \"../plugin/a.html\">"; checkFilter(input, expected); } @Test public void testSecondArg() { - final String input = "<A alt=\"alt\" href = \"PLUGINS_ROOT/plugin/a.html\">"; - final String expected = "<A alt=\"alt\" href = \"../plugin/a.html\">"; + final String input = "<A alt=\"alt\" href = \"PLUGINS_ROOT/plugin/a.html\">"; + final String expected = "<A alt=\"alt\" href = \"../plugin/a.html\">"; checkFilter(input, expected); } @Test public void testMultipleMatches() { - final String input = "<A href = \"PLUGINS_ROOT/plugin/a.html\"><A href = \"PLUGINS_ROOT/plugin/b.html\">"; - final String expected = "<A href = \"../plugin/a.html\"><A href = \"../plugin/b.html\">"; + final String input = "<A href = \"PLUGINS_ROOT/plugin/a.html\"><A href = \"PLUGINS_ROOT/plugin/b.html\">"; + final String expected = "<A href = \"../plugin/a.html\"><A href = \"../plugin/b.html\">"; checkFilter(input, expected); } diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/RestrictedTopicParameter.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/RestrictedTopicParameter.java index 0c5665e04..a40f671aa 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/RestrictedTopicParameter.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/RestrictedTopicParameter.java @@ -40,8 +40,8 @@ public class RestrictedTopicParameter { @Before public void setUp() throws Exception { restrictTopic = Platform.getPreferencesService().getBoolean - (HelpBasePlugin.PLUGIN_ID, RESTRICT_TOPIC, - false, null); + (HelpBasePlugin.PLUGIN_ID, RESTRICT_TOPIC, + false, null); helpMode = BaseHelpSystem.getMode(); } diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/UrlCoderTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/UrlCoderTest.java index 2aef8fb22..8546900c8 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/UrlCoderTest.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/UrlCoderTest.java @@ -43,7 +43,7 @@ public class UrlCoderTest { private boolean compactEncodingIsShorter(String value) { String compactEncoded = URLCoder.compactEncode(value); String encoded = URLCoder.encode(value); - return compactEncoded.length() < encoded.length(); + return compactEncoded.length() < encoded.length(); } @Test diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/UrlUtilsTests.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/UrlUtilsTests.java index 5d053b204..8a7e6cd12 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/UrlUtilsTests.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/UrlUtilsTests.java @@ -58,7 +58,7 @@ public class UrlUtilsTests { assertEquals(23, path[0]); assertEquals(4, path[1]); assertEquals(5, path[2]); - } + } @Test public void testRelativePathUnrelated() { diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/service/ContentServiceTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/service/ContentServiceTest.java index 2d9666bfc..83f88932a 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/service/ContentServiceTest.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/service/ContentServiceTest.java @@ -31,7 +31,7 @@ public class ContentServiceTest extends ContentServletTest { final String path = "/data/help/index/topic1.html"; String remoteContent = ServicesTestUtils.getRemoteContent(UA_TESTS, path, "en"); String localContent = ServicesTestUtils.getLocalContent(UA_TESTS, path); - assertEquals(remoteContent, localContent); + assertEquals(remoteContent, localContent); } @Override @@ -40,7 +40,7 @@ public class ContentServiceTest extends ContentServletTest { final String path = "/data/help/manual/filter.xhtml"; String remoteContent = ServicesTestUtils.getRemoteContent(UA_TESTS, path, "en"); String localContent = ServicesTestUtils.getLocalContent(UA_TESTS, path); - assertEquals(remoteContent, localContent); + assertEquals(remoteContent, localContent); } @Override @@ -49,7 +49,7 @@ public class ContentServiceTest extends ContentServletTest { final String path = "/data/help/search/testnl1.xhtml"; String remoteContent = ServicesTestUtils.getRemoteContent(UA_TESTS, path, "en"); String localContent = ServicesTestUtils.getLocalContent(UA_TESTS, path); - assertEquals(remoteContent, localContent); + assertEquals(remoteContent, localContent); } @Override @@ -59,8 +59,8 @@ public class ContentServiceTest extends ContentServletTest { String remoteContent = ServicesTestUtils.getRemoteContent(UA_TESTS, path, "de"); String enLocalContent = ServicesTestUtils.getLocalContent(UA_TESTS, path); String deLocalContent = ServicesTestUtils.getLocalContent(UA_TESTS, "/nl/de" + path); - assertEquals(remoteContent, deLocalContent); - assertFalse(remoteContent.equals(enLocalContent)); + assertEquals(remoteContent, deLocalContent); + assertFalse(remoteContent.equals(enLocalContent)); } @Override diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/service/ExtensionServiceTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/service/ExtensionServiceTest.java index d2fadaca8..eab218672 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/service/ExtensionServiceTest.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/service/ExtensionServiceTest.java @@ -57,7 +57,7 @@ public class ExtensionServiceTest { Node root = getContentExtensions("en"); Element[] UARoot = findContributionByContent(root, "/org.eclipse.ua.tests/data/help/dynamic/shared/doc2.xml#element.1"); - assertEquals(1, UARoot.length); + assertEquals(1, UARoot.length); } @Test @@ -65,7 +65,7 @@ public class ExtensionServiceTest { Node root = getContentExtensions("en"); Element[] UARoot = findContributionByContent(root, "/org.eclipse.ua.tests/data/help/dynamic/shared/doc2.xml#element.3"); - assertEquals(1, UARoot.length); + assertEquals(1, UARoot.length); } @Test @@ -73,7 +73,7 @@ public class ExtensionServiceTest { Node root = getContentExtensions("en"); Element[] UARoot = findContributionByContent(root, "/org.eclipse.ua.tests/data/help/dynamic/shared/doc2.xml#element.4"); - assertEquals(0, UARoot.length); + assertEquals(0, UARoot.length); } @Test @@ -89,7 +89,7 @@ public class ExtensionServiceTest { Node root = getContentExtensions("en"); Element[] UARoot = findReplacementByContent(root, "/org.eclipse.ua.tests/data/help/dynamic/shared/doc2.xml#element.1"); - assertEquals(1, UARoot.length); + assertEquals(1, UARoot.length); } @Test @@ -134,7 +134,7 @@ public class ExtensionServiceTest { Element nextElement = (Element)next; if ( childKind.equals(nextElement.getTagName()) && attributeValue.equals(nextElement.getAttribute(attributeName))) { - results.add(next); + results.add(next); } } } diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/service/TocFragmentServiceTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/service/TocFragmentServiceTest.java index 3ce8db5a8..bb79011ac 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/service/TocFragmentServiceTest.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/service/TocFragmentServiceTest.java @@ -63,7 +63,7 @@ public class TocFragmentServiceTest { Node root = getTreeData(url); Element[] UARoot = findNodeById(root, "/org.eclipse.ua.tests/data/help/toc/root.xml"); - assertEquals(1, UARoot.length); + assertEquals(1, UARoot.length); } @Test @@ -161,7 +161,7 @@ public class TocFragmentServiceTest { if ( childKind.equals(nextElement.getTagName()) && attributeValue.equals(nextElement.getAttribute(attributeName))) { - results.add(next); + results.add(next); } } } @@ -182,13 +182,13 @@ public class TocFragmentServiceTest { if ( childKind.equals(nextElement.getTagName()) ) { String href = nextElement.getAttribute("href"); if (href != null) { - int query = href.indexOf('?'); - if (query >= 0) { - href = href.substring(0, query); - } - if (href.equals (attributeValue)) { - results.add(next); - } + int query = href.indexOf('?'); + if (query >= 0) { + href = href.substring(0, query); + } + if (href.equals (attributeValue)) { + results.add(next); + } } } } diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webextension/TestFrame.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webextension/TestFrame.java index 37648f319..581538f8f 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webextension/TestFrame.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webextension/TestFrame.java @@ -43,7 +43,7 @@ public class TestFrame extends AbstractFrame { @Override public boolean isVisible() { return Platform.getPreferencesService().getBoolean - (UserAssistanceTestPlugin.getPluginId(), "extraFrame", false, null); + (UserAssistanceTestPlugin.getPluginId(), "extraFrame", false, null); } } diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webextension/TestHelpToolbarFrame.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webextension/TestHelpToolbarFrame.java index 1cacb65cb..917d352b3 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webextension/TestHelpToolbarFrame.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webextension/TestHelpToolbarFrame.java @@ -40,15 +40,15 @@ public class TestHelpToolbarFrame extends AbstractFrame { return "*"; } - @Override + @Override public String getFrameAttributes() { - return "\"marginwidth=\"0\" marginheight=\"0\" frameborder=\"0\" scrolling=\"no\""; //$NON-NLS-1$ - } + return "\"marginwidth=\"0\" marginheight=\"0\" frameborder=\"0\" scrolling=\"no\""; //$NON-NLS-1$ + } @Override public boolean isVisible() { return Platform.getPreferencesService().getBoolean - (UserAssistanceTestPlugin.getPluginId(), "extraFrame", false, null); + (UserAssistanceTestPlugin.getPluginId(), "extraFrame", false, null); } } diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webextension/TitleSearchButton.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webextension/TitleSearchButton.java index 6e3d69f3f..aed494884 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webextension/TitleSearchButton.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webextension/TitleSearchButton.java @@ -53,7 +53,7 @@ public class TitleSearchButton extends AbstractButton { @Override public boolean isAddedToToolbar(String toolbarName) { boolean addButton = Platform.getPreferencesService().getBoolean - (UserAssistanceTestPlugin.getPluginId(), "extraButton", false, null); + (UserAssistanceTestPlugin.getPluginId(), "extraButton", false, null); return (addButton & toolbarName.equals(AbstractButton.CONTENT_TOOLBAR)); } diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webextension/TitleSearchView.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webextension/TitleSearchView.java index 042023dd2..c3af179a1 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webextension/TitleSearchView.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webextension/TitleSearchView.java @@ -58,13 +58,13 @@ public class TitleSearchView extends AbstractView { @Override public boolean isVisible() { return Platform.getPreferencesService().getBoolean - (UserAssistanceTestPlugin.getPluginId(), "extraView", false, null); + (UserAssistanceTestPlugin.getPluginId(), "extraView", false, null); } @Override public boolean isVisibleBasic() { return Platform.getPreferencesService().getBoolean - (UserAssistanceTestPlugin.getPluginId(), "extraView", false, null); + (UserAssistanceTestPlugin.getPluginId(), "extraView", false, null); } } |