File tree Expand file tree Collapse file tree 4 files changed +9
-9
lines changed
gwtmockito/src/test/java/com/google/gwtmockito Expand file tree Collapse file tree 4 files changed +9
-9
lines changed Original file line number Diff line number Diff line change @@ -282,7 +282,7 @@ to manually install the jars for [Mockito][6] and [Javassist][7].
282
282
* Support for Cobertura coverage tools. (Thanks to mvmn)
283
283
* Try to intelligently return the right value for getTagName when possible.
284
284
* Fixed a classloader delegation issue. (Thanks to paulduffin)
285
- * Add an annotation allowing the blacklist of classes that are always
285
+ * Add an annotation allowing the excludelist of classes that are always
286
286
loaded via the standard classloader to be specified on a per-test bases.
287
287
288
288
### 1.1.3
Original file line number Diff line number Diff line change @@ -30,18 +30,18 @@ public void shouldGarbageCollectGwtClassLoaderWhenThreadLocalIsUsed() throws Ini
30
30
}
31
31
32
32
@ RunWith (JUnit4 .class )
33
- public static class DummyTestClass {
33
+ public static class FakeTestClass {
34
34
35
35
@ Test
36
- public void dummy () {
36
+ public void fake () {
37
37
}
38
38
}
39
39
40
40
@ RunWith (JUnit4 .class )
41
41
@ WithExperimentalGarbageCollection
42
42
public static class TestWithThreadLocal {
43
43
@ Test
44
- public void dummy () {
44
+ public void fake () {
45
45
ThreadLocalUsage threadLocalUsage = new ThreadLocalUsage ();
46
46
}
47
47
}
Original file line number Diff line number Diff line change @@ -547,7 +547,7 @@ public YetAnotherInterface getFake(Class<?> type) {
547
547
548
548
@ Test
549
549
public void assertThatShouldWork () {
550
- // This fails when org.hamcrest isn't added to the package blacklist
550
+ // This fails when org.hamcrest isn't added to the package excludelist
551
551
Assert .assertThat ("123" , CoreMatchers .containsString ("12" ));
552
552
}
553
553
Original file line number Diff line number Diff line change @@ -45,7 +45,7 @@ public void shouldLoadClassFromStandardClassLoaderEvenWhenRequestedByChildClassL
45
45
throws InitializationError , ClassNotFoundException {
46
46
47
47
// Runner should reload the test class in its own ClassLoader.
48
- GwtMockitoTestRunner runner = new GwtMockitoTestRunner (DummyTestClass .class ) {
48
+ GwtMockitoTestRunner runner = new GwtMockitoTestRunner (FakeTestClass .class ) {
49
49
50
50
@ Override
51
51
protected Collection <String > getPackagesToLoadViaStandardClassloader () {
@@ -58,7 +58,7 @@ protected Collection<String> getPackagesToLoadViaStandardClassloader() {
58
58
// Assert that test class is loaded from a different class loader.
59
59
TestClass testClass = runner .getTestClass ();
60
60
Class <?> javaClass = testClass .getJavaClass ();
61
- assertNotEquals (DummyTestClass .class , javaClass );
61
+ assertNotEquals (FakeTestClass .class , javaClass );
62
62
63
63
// Create a child ClassLoader of the one used by Runner.
64
64
ClassLoader gwtMockitoClassLoader = javaClass .getClassLoader ();
@@ -76,10 +76,10 @@ protected Collection<String> getPackagesToLoadViaStandardClassloader() {
76
76
}
77
77
78
78
@ RunWith (JUnit4 .class )
79
- public static class DummyTestClass {
79
+ public static class FakeTestClass {
80
80
81
81
@ Test
82
- public void dummy () {
82
+ public void fake () {
83
83
}
84
84
}
85
85
}
You can’t perform that action at this time.
0 commit comments