Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update junit to 5.4.0 release version #3441

Merged
merged 19 commits into from
Feb 8, 2019
Merged

Update junit to 5.4.0 release version #3441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
a6247c5
remove not used import
lovepoem Jan 22, 2019
e989044
Merge remote-tracking branch 'dubbo_remote/master'
lovepoem Jan 22, 2019
5e3da9f
remove unused import
lovepoem Jan 22, 2019
14ec387
Merge remote-tracking branch 'dubbo_remote/master'
lovepoem Jan 22, 2019
9543531
Merge remote-tracking branch 'dubbo_remote/master'
lovepoem Jan 23, 2019
8a7eb60
Merge remote-tracking branch 'dubbo_remote/master'
lovepoem Jan 23, 2019
d8f5e9b
Merge remote-tracking branch 'dubbo_remote/master'
lovepoem Jan 24, 2019
eb70589
Merge remote-tracking branch 'dubbo_remote/master'
lovepoem Jan 24, 2019
87467a6
Merge remote-tracking branch 'dubbo_remote/master'
lovepoem Jan 24, 2019
de5712c
Merge remote-tracking branch 'dubbo_remote/master'
lovepoem Jan 24, 2019
735a9ff
Merge remote-tracking branch 'dubbo_remote/master'
lovepoem Jan 25, 2019
a78b635
Merge remote-tracking branch 'dubbo_remote/master'
lovepoem Jan 28, 2019
5e2dc17
Merge remote-tracking branch 'dubbo_remote/master'
lovepoem Jan 28, 2019
93dde74
Merge remote-tracking branch 'dubbo_remote/master'
lovepoem Jan 29, 2019
3d82a07
Merge remote-tracking branch 'dubbo_remote/master'
lovepoem Jan 29, 2019
00392e2
Merge remote-tracking branch 'dubbo_remote/master'
lovepoem Feb 1, 2019
d3a76eb
Merge remote-tracking branch 'dubbo_remote/master'
lovepoem Feb 8, 2019
78d3a7b
update junit to 5.4.0 release version
lovepoem Feb 8, 2019
50dde88
remove uesles config
lovepoem Feb 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions dubbo-common/src/test/java/org/apache/dubbo/common/utils/IOUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.support.io.TempDirectory;
import org.junit.jupiter.api.io.TempDir;

import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
Expand All @@ -38,7 +37,6 @@
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.equalTo;

@ExtendWith(TempDirectory.class)
public class IOUtilsTest {

private static String TEXT = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890";
Expand Down Expand Up @@ -89,7 +87,7 @@ public void testWrite5() throws Exception {
}

@Test
public void testLines(@TempDirectory.TempDir Path tmpDir) throws Exception {
public void testLines(@TempDir Path tmpDir) throws Exception {
File file = tmpDir.getFileName().toAbsolutePath().toFile();
IOUtils.writeLines(file, new String[]{TEXT});
String[] lines = IOUtils.readLines(file);
Expand Down Expand Up @@ -118,7 +116,7 @@ public void testRead() throws Exception {
}

@Test
public void testAppendLines(@TempDirectory.TempDir Path tmpDir) throws Exception {
public void testAppendLines(@TempDir Path tmpDir) throws Exception {
File file = tmpDir.getFileName().toAbsolutePath().toFile();
IOUtils.appendLines(file, new String[]{"a", "b", "c"});
String[] lines = IOUtils.readLines(file);
Expand Down
5 changes: 1 addition & 4 deletions ...g/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractInterfaceConfigTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,7 @@
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.support.io.TempDirectory;
import org.junit.jupiter.api.support.io.TempDirectory.TempDir;
import org.junit.jupiter.api.io.TempDir;

import java.io.BufferedOutputStream;
import java.io.File;
Expand All @@ -48,7 +46,6 @@
import java.util.List;
import java.util.Properties;

@ExtendWith(TempDirectory.class)
public class AbstractInterfaceConfigTest {
private static File dubboProperties;

Expand Down
28 changes: 0 additions & 28 deletions dubbo-config/dubbo-config-spring/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,32 +129,4 @@
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<!-- upload xsd file command line
mvn org.codehaus.mojo:wagon-maven-plugin:1.0-beta-3:upload-single -Dwagon.fromFile=src/main/resources/META-INF/dubbo.xsd -Dwagon.url=dav:http://code.alibabatech.com/schema/dubbo/ -Dwagon.serverId=opensesame.releases.account
-->
<!--
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>wagon-maven-plugin</artifactId>
<version>1.0-beta-3</version>
<executions>
<execution>
<id>upload-schema</id>
<phase>deploy</phase>
<goals>
<goal>upload-single</goal>
</goals>
<configuration>
<fromFile>${basedir}/src/main/resources/META-INF/dubbo.xsd</fromFile>
<url>dav:http://code.alibabatech.com/schema/dubbo/</url>
<serverId>opensesame.releases.account</serverId>
</configuration>
</execution>
</executions>
</plugin>
-->
</plugins>
</build>
</project>
5 changes: 1 addition & 4 deletions ...o-remoting-p2p/src/test/java/org/apache/dubbo/remoting/p2p/support/FileNetworkerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,14 @@
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.support.io.TempDirectory;
import org.junit.jupiter.api.support.io.TempDirectory.TempDir;
import org.junit.jupiter.api.io.TempDir;

import java.nio.file.Path;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;

import static org.mockito.Mockito.mock;

@ExtendWith(TempDirectory.class)
public class FileNetworkerTest {

@BeforeEach
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@

<properties>
<!-- Test libs -->
<junit_jupiter_version>5.4.0-M1</junit_jupiter_version>
<hazelcast_version>3.9-EA</hazelcast_version>
<junit_jupiter_version>5.4.0</junit_jupiter_version>
<hazelcast_version>3.11.1</hazelcast_version>
<hamcrest_version>1.3</hamcrest_version>
<hibernate_validator_version>5.2.4.Final</hibernate_validator_version>
<el_api_version>2.2.4</el_api_version>
Expand Down