Skip to content

Commit 6ac1a88

Browse files
committed
Use hamcrest CoreMatcher instead of Matcher
Using CoreMatcher instead of Matcher allows us to depend only on hamcrest.core instead of hamcrest. We still need to Require-Bundle hamcrest because of bug 403196. See https://bugs.eclipse.org/bugs/show_bug.cgi?id=403196
1 parent 8ffab2f commit 6ac1a88

File tree

4 files changed

+10
-13
lines changed

4 files changed

+10
-13
lines changed

tests/com.eclipsesource.jshint.test/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ Import-Package: org.junit;version="4.8.2",
99
org.junit.runner;version="4.8.2",
1010
org.junit.runners;version="4.8.2"
1111
Bundle-Vendor: EclipseSource
12-
Require-Bundle: org.hamcrest;bundle-version="1.1.0"
12+
Require-Bundle: org.hamcrest.core;bundle-version="1.1.0"

tests/com.eclipsesource.jshint.test/src/com/eclipsesource/jshint/JSHint_Test.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2012 EclipseSource.
2+
* Copyright (c) 2012, 2013 EclipseSource.
33
* All rights reserved. This program and the accompanying materials
44
* are made available under the terms of the Eclipse Public License v1.0
55
* which accompanies this distribution, and is available at
@@ -21,9 +21,8 @@
2121
import org.mozilla.javascript.EcmaError;
2222
import org.mozilla.javascript.JavaScriptException;
2323

24-
import static org.hamcrest.Matchers.containsString;
25-
import static org.hamcrest.Matchers.startsWith;
26-
24+
import static org.hamcrest.CoreMatchers.containsString;
25+
import static org.hamcrest.CoreMatchers.startsWith;
2726
import static org.junit.Assert.*;
2827

2928

tests/com.eclipsesource.jshint.test/src/com/eclipsesource/jshint/Text_Test.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2012 EclipseSource.
2+
* Copyright (c) 2012, 2013 EclipseSource.
33
* All rights reserved. This program and the accompanying materials
44
* are made available under the terms of the Eclipse Public License v1.0
55
* which accompanies this distribution, and is available at
@@ -16,9 +16,8 @@
1616

1717
import org.junit.Test;
1818

19-
import static org.hamcrest.Matchers.endsWith;
20-
import static org.hamcrest.Matchers.startsWith;
21-
19+
import static org.hamcrest.CoreMatchers.endsWith;
20+
import static org.hamcrest.CoreMatchers.startsWith;
2221
import static org.junit.Assert.assertEquals;
2322
import static org.junit.Assert.assertThat;
2423

tests/com.eclipsesource.jshint.test/src/com/eclipsesource/jshint/internal/JSHintRunner_Test.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2012 EclipseSource.
2+
* Copyright (c) 2012, 2013 EclipseSource.
33
* All rights reserved. This program and the accompanying materials
44
* are made available under the terms of the Eclipse Public License v1.0
55
* which accompanies this distribution, and is available at
@@ -23,9 +23,8 @@
2323
import org.junit.Before;
2424
import org.junit.Test;
2525

26-
import static org.hamcrest.Matchers.containsString;
27-
import static org.hamcrest.Matchers.startsWith;
28-
26+
import static org.hamcrest.CoreMatchers.containsString;
27+
import static org.hamcrest.CoreMatchers.startsWith;
2928
import static org.junit.Assert.assertEquals;
3029
import static org.junit.Assert.assertThat;
3130

0 commit comments

Comments
 (0)