Skip to content

Commit 78ac515

Browse files
Remove the disabled Powermock-based tests: [ECR-1614] (#1391)
Powermock is not likely to support JUnit 5 soon. Similar tests could be implemented either by abstracting the native API or via the native resource manager (if its operations are made available to Java code).
1 parent 27e29d6 commit 78ac515

File tree

4 files changed

+0
-106
lines changed

4 files changed

+0
-106
lines changed

exonum-java-binding/core/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -127,12 +127,6 @@
127127
<scope>test</scope>
128128
</dependency>
129129

130-
<dependency>
131-
<groupId>org.powermock</groupId>
132-
<artifactId>powermock-api-mockito2</artifactId>
133-
<scope>test</scope>
134-
</dependency>
135-
136130
<dependency>
137131
<groupId>org.apache.logging.log4j</groupId>
138132
<artifactId>log4j-core</artifactId>

exonum-java-binding/core/src/test/java/com/exonum/binding/core/storage/database/ForkTest.java

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -17,54 +17,12 @@
1717
package com.exonum.binding.core.storage.database;
1818

1919
import static org.junit.jupiter.api.Assertions.assertTrue;
20-
import static org.mockito.Mockito.never;
21-
import static org.powermock.api.mockito.PowerMockito.mockStatic;
22-
import static org.powermock.api.mockito.PowerMockito.verifyStatic;
2320

2421
import com.exonum.binding.core.proxy.Cleaner;
25-
import org.junit.jupiter.api.BeforeEach;
26-
import org.junit.jupiter.api.Disabled;
2722
import org.junit.jupiter.api.Test;
28-
import org.powermock.core.classloader.annotations.PrepareForTest;
2923

30-
@PrepareForTest({
31-
Accesses.class,
32-
})
33-
@Disabled
34-
// TODO Won't run on Junit 5 till Powermock is updated [ECR-1614].
3524
class ForkTest {
3625

37-
private Fork fork;
38-
39-
@BeforeEach
40-
void setUp() {
41-
mockStatic(Accesses.class);
42-
}
43-
44-
@Test
45-
void disposeInternal_OwningProxy() throws Exception {
46-
int nativeHandle = 0x0A;
47-
try (Cleaner cleaner = new Cleaner()) {
48-
fork = Fork.newInstance(nativeHandle, true, cleaner);
49-
}
50-
51-
verifyStatic(Accesses.class);
52-
Accesses.nativeFree(nativeHandle);
53-
}
54-
55-
@Test
56-
void disposeInternal_NotOwningProxy() throws Exception {
57-
int nativeHandle = 0x0A;
58-
59-
try (Cleaner cleaner = new Cleaner()) {
60-
fork = Fork.newInstance(nativeHandle, false, cleaner);
61-
}
62-
63-
verifyStatic(Accesses.class, never());
64-
Accesses.nativeFree(nativeHandle);
65-
}
66-
67-
6826
@Test
6927
void canModify() {
7028
Fork fork = Fork.newInstance(0x0A, false, new Cleaner());

exonum-java-binding/core/src/test/java/com/exonum/binding/core/storage/database/SnapshotTest.java

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -17,55 +17,12 @@
1717
package com.exonum.binding.core.storage.database;
1818

1919
import static org.junit.jupiter.api.Assertions.assertFalse;
20-
import static org.mockito.ArgumentMatchers.anyLong;
21-
import static org.mockito.Mockito.never;
22-
import static org.powermock.api.mockito.PowerMockito.mockStatic;
23-
import static org.powermock.api.mockito.PowerMockito.verifyStatic;
2420

2521
import com.exonum.binding.core.proxy.Cleaner;
26-
import org.junit.jupiter.api.BeforeEach;
27-
import org.junit.jupiter.api.Disabled;
28-
import org.junit.jupiter.api.Nested;
2922
import org.junit.jupiter.api.Test;
30-
import org.powermock.core.classloader.annotations.PrepareForTest;
3123

32-
@PrepareForTest({
33-
Accesses.class,
34-
})
3524
class SnapshotTest {
3625

37-
@Nested
38-
@Disabled
39-
// TODO Won't run with JUnit 5 till Powermock is updated [ECR-1614] (downgrade to 4?)
40-
class DestroysPeersIfNeeded {
41-
@BeforeEach
42-
void setUp() {
43-
mockStatic(Accesses.class);
44-
}
45-
46-
@Test
47-
void destroy_NotOwning() throws Exception {
48-
try (Cleaner cleaner = new Cleaner()) {
49-
Snapshot.newInstance(0x0A, false, cleaner);
50-
}
51-
52-
verifyStatic(Accesses.class, never());
53-
Accesses.nativeFree(anyLong());
54-
}
55-
56-
@Test
57-
void destroy_Owning() throws Exception {
58-
int nativeHandle = 0x0A;
59-
60-
try (Cleaner cleaner = new Cleaner()) {
61-
Snapshot.newInstance(nativeHandle, true, cleaner);
62-
}
63-
64-
verifyStatic(Accesses.class);
65-
Accesses.nativeFree(nativeHandle);
66-
}
67-
}
68-
6926
@Test
7027
void cannotModify() {
7128
Snapshot s = Snapshot.newInstance(0x0A, false, new Cleaner());

exonum-java-binding/pom.xml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@
115115
<hamcrest.version>2.2</hamcrest.version>
116116
<junit.version>4.13</junit.version>
117117
<junit.jupiter.version>5.6.0</junit.jupiter.version>
118-
<powermock.version>2.0.4</powermock.version>
119118
<protobuf.version>3.11.0</protobuf.version>
120119
<mockito.version>3.2.4</mockito.version>
121120
<guava.version>28.2-jre</guava.version>
@@ -248,20 +247,6 @@
248247
<scope>test</scope>
249248
</dependency>
250249

251-
<dependency>
252-
<groupId>org.powermock</groupId>
253-
<artifactId>powermock-module-junit4</artifactId>
254-
<version>${powermock.version}</version>
255-
<scope>test</scope>
256-
</dependency>
257-
258-
<dependency>
259-
<groupId>org.powermock</groupId>
260-
<artifactId>powermock-api-mockito2</artifactId>
261-
<version>${powermock.version}</version>
262-
<scope>test</scope>
263-
</dependency>
264-
265250
<dependency>
266251
<groupId>org.assertj</groupId>
267252
<artifactId>assertj-core</artifactId>

0 commit comments

Comments
 (0)