diff options
author | Alexander Kurtakov | 2022-04-29 19:22:41 +0000 |
---|---|---|
committer | Alexander Kurtakov | 2022-04-29 19:22:41 +0000 |
commit | a2f44313ee6f70f19ac75549052e9f56db31e46b (patch) | |
tree | 247607b0467b433a5f74b51274ebd2c321f576f7 | |
parent | e452d89265d61026765cf5c1637a2b23a147e67b (diff) | |
download | org.eclipse.mylyn.docs-a2f44313ee6f70f19ac75549052e9f56db31e46b.tar.gz org.eclipse.mylyn.docs-a2f44313ee6f70f19ac75549052e9f56db31e46b.tar.xz org.eclipse.mylyn.docs-a2f44313ee6f70f19ac75549052e9f56db31e46b.zip |
Remove hamcrest test dependency
No longer needed and just complicated assertions in the single file it
was used.
Change-Id: I7a67d7b7674141af072ec11bf2139800d9b3432f
6 files changed, 8 insertions, 24 deletions
diff --git a/epub/ui/targets/epub-development.target b/epub/ui/targets/epub-development.target index 7b22c68a8..25e40442c 100644 --- a/epub/ui/targets/epub-development.target +++ b/epub/ui/targets/epub-development.target @@ -22,8 +22,6 @@ <unit id="org.apache.tika.core" version="1.24.1.v20211101-1915"/> <unit id="org.junit" version="4.13.2.v20211018-1956"/> <unit id="org.junit.source" version="4.13.2.v20211018-1956"/> -<unit id="org.hamcrest" version="2.2.0.v20210711-0821"/> -<unit id="org.hamcrest.source" version="2.2.0.v20210711-0821"/> <unit id="javax.activation" version="1.1.0.v201211130549"/> <unit id="com.google.guava" version="30.1.0.v20210127-2300"/> <unit id="com.google.guava.source" version="30.1.0.v20210127-2300"/> diff --git a/epub/ui/targets/epub.target-template b/epub/ui/targets/epub.target-template index b3bba5e15..d8969fd38 100644 --- a/epub/ui/targets/epub.target-template +++ b/epub/ui/targets/epub.target-template @@ -17,8 +17,6 @@ <unit id="org.apache.tika.core" version="1.24.1.v20211101-1915"/> <unit id="org.junit" version="4.13.2.v20211018-1956"/> <unit id="org.junit.source" version="4.13.2.v20211018-1956"/> -<unit id="org.hamcrest" version="2.2.0.v20210711-0821"/> -<unit id="org.hamcrest.source" version="2.2.0.v20210711-0821"/> <unit id="javax.activation" version="1.1.0.v201211130549"/> <unit id="com.google.guava" version="30.1.0.v20210127-2300"/> <unit id="com.google.guava.source" version="30.1.0.v20210127-2300"/> diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.maven/pom.xml b/wikitext/core/org.eclipse.mylyn.wikitext.maven/pom.xml index eb94b77d4..6eb7a37f4 100644 --- a/wikitext/core/org.eclipse.mylyn.wikitext.maven/pom.xml +++ b/wikitext/core/org.eclipse.mylyn.wikitext.maven/pom.xml @@ -42,12 +42,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-core</artifactId> - <version>2.2</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.objenesis</groupId> <artifactId>objenesis</artifactId> <version>3.2</version> diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/FileRefHyperlinkDetectorTest.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/FileRefHyperlinkDetectorTest.java index d94cca808..849b8b97f 100644 --- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/FileRefHyperlinkDetectorTest.java +++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/FileRefHyperlinkDetectorTest.java @@ -13,10 +13,8 @@ package org.eclipse.mylyn.internal.wikitext.ui; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.nullValue; -import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -64,7 +62,7 @@ public class FileRefHyperlinkDetectorTest extends AbstractTestInWorkspace { IHyperlink[] detectHyperlinks = fileRefHyperlinkDetector.detectHyperlinks(mockTextViewer, new Region(7, 15), false); - assertThat(detectHyperlinks, is(nullValue())); + assertNull(detectHyperlinks); } @Test @@ -78,7 +76,7 @@ public class FileRefHyperlinkDetectorTest extends AbstractTestInWorkspace { IHyperlink[] detectHyperlinks = fileRefHyperlinkDetector.detectHyperlinks(mockTextViewer, new Region(7, 15), false); - assertThat(detectHyperlinks, is(nullValue())); + assertNull(detectHyperlinks); } @Test @@ -98,7 +96,7 @@ public class FileRefHyperlinkDetectorTest extends AbstractTestInWorkspace { IHyperlink[] detectHyperlinks = fileRefHyperlinkDetector.detectHyperlinks(mockTextViewer, new Region(9, 17), false); - assertThat(detectHyperlinks.length, is(1)); + assertEquals(1, detectHyperlinks.length); IHyperlink hyperlink = detectHyperlinks[0]; @@ -113,7 +111,7 @@ public class FileRefHyperlinkDetectorTest extends AbstractTestInWorkspace { if (editorInput instanceof IFileEditorInput) { IFile editorFile = ((IFileEditorInput) editorInput).getFile(); - assertThat(file, equalTo(editorFile)); + assertEquals(file, editorFile); } } @@ -148,7 +146,7 @@ public class FileRefHyperlinkDetectorTest extends AbstractTestInWorkspace { IHyperlink[] detectHyperlinks = fileRefHyperlinkDetector.detectHyperlinks(mockTextViewer, new Region(9, 17), false); - assertThat(detectHyperlinks.length, is(1)); + assertEquals(1, detectHyperlinks.length); IHyperlink hyperlink = detectHyperlinks[0]; @@ -163,7 +161,7 @@ public class FileRefHyperlinkDetectorTest extends AbstractTestInWorkspace { if (editorInput instanceof IFileEditorInput) { IFile editorFile = ((IFileEditorInput) editorInput).getFile(); - assertThat(articleFile, equalTo(editorFile)); + assertEquals(articleFile, editorFile); } } diff --git a/wikitext/ui/targets/wikitext-development.target b/wikitext/ui/targets/wikitext-development.target index b0ed0d084..7eb3ddfbb 100644 --- a/wikitext/ui/targets/wikitext-development.target +++ b/wikitext/ui/targets/wikitext-development.target @@ -9,8 +9,6 @@ <unit id="org.jsoup.source" version="1.14.3.v20211012-1727"/> <unit id="org.junit" version="4.13.2.v20211018-1956"/> <unit id="org.junit.source" version="4.13.2.v20211018-1956"/> -<unit id="org.hamcrest" version="2.2.0.v20210711-0821"/> -<unit id="org.hamcrest.source" version="2.2.0.v20210711-0821"/> <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository"/> </location> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit"> diff --git a/wikitext/ui/targets/wikitext.target-template b/wikitext/ui/targets/wikitext.target-template index 956e3ea43..4ac5d9921 100644 --- a/wikitext/ui/targets/wikitext.target-template +++ b/wikitext/ui/targets/wikitext.target-template @@ -37,8 +37,6 @@ <unit id="org.jsoup.source" version="1.14.3.v20211012-1727"/> <unit id="org.junit" version="4.13.2.v20211018-1956"/> <unit id="org.junit.source" version="4.13.2.v20211018-1956"/> -<unit id="org.hamcrest" version="2.2.0.v20210711-0821"/> -<unit id="org.hamcrest.source" version="2.2.0.v20210711-0821"/> <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository"/> </location> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit"> |