Skip to content

Commit 3d29724

Browse files
kaibocaikaibocai
authored
Migrate from junit4 to junit5 (#692)
* migrate to junit5 * update pom.xml file * remove lenient stub - correct assertions order * move java version log to function load request handler
1 parent 86e4db1 commit 3d29724

22 files changed

+385
-423
lines changed

‎pom.xml

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
<azure.functions.java.core.library.version>1.2.0</azure.functions.java.core.library.version>
2424
<azure.functions.java.spi>1.0.0</azure.functions.java.spi>
2525
<azure.functions.java.library.version>2.2.0</azure.functions.java.library.version>
26+
<jupiter.version>5.9.1</jupiter.version>
27+
<mockito-core.version>4.11.0</mockito-core.version>
2628
</properties>
2729
<licenses>
2830
<license>
@@ -67,12 +69,6 @@
6769
<artifactId>azure-functions-java-spi</artifactId>
6870
<version>${azure.functions.java.spi}</version>
6971
</dependency>
70-
<dependency>
71-
<groupId>com.microsoft.azure.functions</groupId>
72-
<artifactId>azure-functions-java-library</artifactId>
73-
<version>${azure.functions.java.library.version}</version>
74-
<scope>test</scope>
75-
</dependency>
7672
<dependency>
7773
<groupId>com.google.protobuf</groupId>
7874
<artifactId>protobuf-java</artifactId>
@@ -114,15 +110,21 @@
114110
<version>1.3.2</version>
115111
</dependency>
116112
<dependency>
117-
<groupId>junit</groupId>
118-
<artifactId>junit</artifactId>
119-
<version>4.13.1</version>
113+
<groupId>com.microsoft.azure.functions</groupId>
114+
<artifactId>azure-functions-java-library</artifactId>
115+
<version>${azure.functions.java.library.version}</version>
116+
<scope>test</scope>
117+
</dependency>
118+
<dependency>
119+
<groupId>org.junit.jupiter</groupId>
120+
<artifactId>junit-jupiter</artifactId>
121+
<version>${jupiter.version}</version>
120122
<scope>test</scope>
121123
</dependency>
122124
<dependency>
123125
<groupId>org.mockito</groupId>
124-
<artifactId>mockito-core</artifactId>
125-
<version>4.6.1</version>
126+
<artifactId>mockito-junit-jupiter</artifactId>
127+
<version>${mockito-core.version}</version>
126128
<scope>test</scope>
127129
</dependency>
128130
</dependencies>

‎src/main/java/com/microsoft/azure/functions/worker/handler/FunctionLoadRequestHandler.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@
33
import java.util.*;
44
import java.util.logging.Level;
55

6+
import com.microsoft.azure.functions.worker.Util;
67
import com.microsoft.azure.functions.worker.WorkerLogManager;
78
import com.microsoft.azure.functions.worker.broker.*;
89
import com.microsoft.azure.functions.worker.description.*;
910
import com.microsoft.azure.functions.rpc.messages.*;
1011

12+
1113
public class FunctionLoadRequestHandler extends MessageHandler<FunctionLoadRequest, FunctionLoadResponse.Builder> {
1214
public FunctionLoadRequestHandler(JavaFunctionBroker broker) {
1315
super(StreamingMessage::getFunctionLoadRequest,
@@ -20,7 +22,7 @@ public FunctionLoadRequestHandler(JavaFunctionBroker broker) {
2022

2123
@Override
2224
String execute(FunctionLoadRequest request, FunctionLoadResponse.Builder response) throws Exception {
23-
WorkerLogManager.getSystemLogger().log(Level.INFO, "FunctionLoadRequest received by the Java worker");
25+
WorkerLogManager.getSystemLogger().log(Level.INFO, "FunctionLoadRequest received by the Java worker, Java version - " + Util.getJavaVersion());
2426
final RpcFunctionMetadata metadata = request.getMetadata();
2527
final FunctionMethodDescriptor descriptor = createFunctionDescriptor(request.getFunctionId(), metadata);
2628

‎src/main/java/com/microsoft/azure/functions/worker/handler/InvocationRequestHandler.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
import com.microsoft.azure.functions.worker.broker.*;
88
import com.microsoft.azure.functions.rpc.messages.*;
99

10-
import static com.microsoft.azure.functions.worker.Util.getJavaVersion;
11-
1210
public class InvocationRequestHandler extends MessageHandler<InvocationRequest, InvocationResponse.Builder> {
1311
public InvocationRequestHandler(JavaFunctionBroker broker) {
1412
super(StreamingMessage::getInvocationRequest,
@@ -25,7 +23,6 @@ public InvocationRequestHandler(JavaFunctionBroker broker) {
2523

2624
@Override
2725
String execute(InvocationRequest request, InvocationResponse.Builder response) throws Exception {
28-
WorkerLogManager.getSystemLogger().log(Level.INFO, "Java version - " + getJavaVersion());
2926
WorkerLogManager.getSystemLogger().log(Level.INFO, "InvocationRequest received by the Java worker");
3027
final String functionId = request.getFunctionId();
3128
final String invocationId = request.getInvocationId();

‎src/main/java/com/microsoft/azure/functions/worker/reflect/DefaultClassLoaderProvider.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,6 @@ public void addWorkerUrl(URL url) throws IOException {
5151
addUrlToSystemClassLoader(url);
5252
}
5353

54-
public static boolean isUrlPointingToAFile(URL url) throws UnsupportedEncodingException {
55-
String decodedPath = URLDecoder.decode(url.getPath(), "UTF-8");
56-
File file = new File(decodedPath);
57-
return file.exists();
58-
}
59-
6054
private void addUrlToSystemClassLoader(URL url) throws IOException {
6155
URLClassLoader sysloader = (URLClassLoader) ClassLoader.getSystemClassLoader();
6256
Class<?> sysclass = URLClassLoader.class;

‎src/test/java/com/microsoft/azure/functions/worker/UtilTests.java renamed to ‎src/test/java/com/microsoft/azure/functions/worker/UtilTest.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
package com.microsoft.azure.functions.worker;
22

3-
import org.junit.Test;
43

5-
import static org.junit.Assert.assertFalse;
6-
import static org.junit.Assert.assertTrue;
4+
import org.junit.jupiter.api.Test;
75

8-
public class UtilTests {
6+
import static org.junit.jupiter.api.Assertions.assertFalse;
7+
import static org.junit.jupiter.api.Assertions.assertTrue;
8+
9+
public class UtilTest {
910

1011
@Test
1112
public void isTrueNull() {

‎src/test/java/com/microsoft/azure/functions/worker/binding/tests/RpcByteArrayDataSourceTests.java renamed to ‎src/test/java/com/microsoft/azure/functions/worker/binding/tests/RpcByteArrayDataSourceTest.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
package com.microsoft.azure.functions.worker.binding.tests;
22

3-
import static org.junit.Assert.assertEquals;
43

54
import java.lang.invoke.WrongMethodTypeException;
65
import java.util.Optional;
76

87
import org.apache.commons.lang3.ArrayUtils;
9-
import org.junit.Test;
108

119
import com.google.protobuf.ByteString;
1210
import com.microsoft.azure.functions.worker.binding.BindingData;
1311
import com.microsoft.azure.functions.worker.binding.RpcByteArrayDataSource;
12+
import org.junit.jupiter.api.Test;
13+
import static org.junit.jupiter.api.Assertions.assertEquals;
1414

15-
public class RpcByteArrayDataSourceTests {
15+
public class RpcByteArrayDataSourceTest {
1616

1717
@Test
1818
public void rpcByteArrayDataSource_To_byteArray() {
@@ -26,7 +26,7 @@ public void rpcByteArrayDataSource_To_byteArray() {
2626
BindingData actualArg = actualBindingData.orElseThrow(WrongMethodTypeException::new);
2727
byte[] actualBytes = (byte[]) actualArg.getValue();
2828
String actualString = new String(actualBytes);
29-
assertEquals(actualString, expectedString);
29+
assertEquals(expectedString, actualString);
3030
}
3131

3232
@Test
@@ -41,7 +41,7 @@ public void rpcByteArrayDataSource_To_ByteArray() {
4141
BindingData actualArg = actualBindingData.orElseThrow(WrongMethodTypeException::new);
4242
Byte[] actualBytes = (Byte[]) actualArg.getValue();
4343
String actualString = new String(ArrayUtils.toPrimitive(actualBytes));
44-
assertEquals(actualString, expectedString);
44+
assertEquals(expectedString, actualString);
4545
}
4646

4747
@Test
@@ -58,7 +58,7 @@ public void rpcByteArrayDataSource_To_POJO() {
5858
TestBlobData.class);
5959
BindingData actualArg = actualBindingData.orElseThrow(WrongMethodTypeException::new);
6060
TestBlobData actualBlobData = (TestBlobData) actualArg.getValue();
61-
assertEquals(actualBlobData.blobText, testBlobData.blobText);
61+
assertEquals(testBlobData.blobText, actualBlobData.blobText);
6262
}
6363

6464
@Test
@@ -73,7 +73,7 @@ public void rpcByteArrayDataSource_To_String() {
7373
String.class);
7474
BindingData actualArg = actualBindingData.orElseThrow(WrongMethodTypeException::new);
7575
String actualBlobData = (String) actualArg.getValue();
76-
assertEquals(actualBlobData, expectedString);
76+
assertEquals(expectedString, actualBlobData);
7777
}
7878

7979
public static class TestBlobData {

‎src/test/java/com/microsoft/azure/functions/worker/binding/tests/RpcCollectionByteArrayDataSourceTest.java

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,14 @@
88

99
import org.apache.commons.lang3.ArrayUtils;
1010
import org.apache.commons.lang3.reflect.TypeUtils;
11-
import org.junit.Test;
11+
import org.junit.jupiter.api.Test;
1212

1313
import java.lang.invoke.WrongMethodTypeException;
14-
import java.lang.reflect.ParameterizedType;
15-
import java.lang.reflect.Type;
1614
import java.util.ArrayList;
1715
import java.util.List;
1816
import java.util.Optional;
1917

20-
import static org.junit.Assert.assertEquals;
18+
import static org.junit.jupiter.api.Assertions.assertEquals;
2119

2220
public class RpcCollectionByteArrayDataSourceTest {
2321
@Test
@@ -41,7 +39,7 @@ public void rpcByteArrayDataSource_To_byte_Array() {
4139
BindingData actualArg = actualBindingData.orElseThrow(WrongMethodTypeException::new);
4240
byte[][] actualBytes = (byte[][]) actualArg.getValue();
4341
String actualString = new String(actualBytes[0]);
44-
assertEquals(actualString, expectedString);
42+
assertEquals(expectedString, actualString);
4543
}
4644

4745
@Test
@@ -65,7 +63,7 @@ public void rpcByteArrayDataSource_To_Byte_Array() {
6563
BindingData actualArg = actualBindingData.orElseThrow(WrongMethodTypeException::new);
6664
Byte[][] actualBytes = (Byte[][]) actualArg.getValue();
6765
String actualString = new String(ArrayUtils.toPrimitive(actualBytes[0]));
68-
assertEquals(actualString, expectedString);
66+
assertEquals(expectedString, actualString);
6967
}
7068

7169
@Test
@@ -89,7 +87,7 @@ public void rpcByteArrayDataSource_default_To_List_byte() {
8987
BindingData actualArg = actualBindingData.orElseThrow(WrongMethodTypeException::new);
9088
List<byte[]> actualBytes = (List) actualArg.getValue();
9189
String actualString = new String(actualBytes.get(0));
92-
assertEquals(actualString, expectedString);
90+
assertEquals(expectedString, actualString);
9391
}
9492

9593
@Test
@@ -113,7 +111,7 @@ public void rpcByteArrayDataSource_To_List_byte() {
113111
BindingData actualArg = actualBindingData.orElseThrow(WrongMethodTypeException::new);
114112
List<byte[]> actualBytes = (List) actualArg.getValue();
115113
String actualString = new String(actualBytes.get(0));
116-
assertEquals(actualString, expectedString);
114+
assertEquals(expectedString, actualString);
117115
}
118116

119117
@Test
@@ -137,7 +135,7 @@ public void rpcByteArrayDataSource_To_List_Byte() {
137135
BindingData actualArg = actualBindingData.orElseThrow(WrongMethodTypeException::new);
138136
List<Byte[]> actualBytes = (List) actualArg.getValue();
139137
String actualString = new String(ArrayUtils.toPrimitive(actualBytes.get(0)));
140-
assertEquals(actualString, expectedString);
138+
assertEquals(expectedString, actualString);
141139
}
142140

143141
@Test
@@ -161,7 +159,7 @@ public void rpcByteArrayDataSource_No_Generic_To_List_byte() {
161159
BindingData actualArg = actualBindingData.orElseThrow(WrongMethodTypeException::new);
162160
List<byte[]> actualBytes = (List) actualArg.getValue();
163161
String actualString = new String(actualBytes.get(0));
164-
assertEquals(actualString, expectedString);
162+
assertEquals(expectedString, actualString);
165163
}
166164

167165

‎src/test/java/com/microsoft/azure/functions/worker/binding/tests/RpcCollectionDoubleDataSourceTest.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
import com.microsoft.azure.functions.worker.binding.BindingData;
66
import com.microsoft.azure.functions.worker.binding.RpcCollectionDoubleDataSource;
77
import org.apache.commons.lang3.reflect.TypeUtils;
8-
import org.junit.Test;
8+
import org.junit.jupiter.api.Test;
99

1010
import java.lang.invoke.WrongMethodTypeException;
1111
import java.util.ArrayList;
1212
import java.util.List;
1313
import java.util.Optional;
1414

15-
import static org.junit.Assert.assertEquals;
15+
import static org.junit.jupiter.api.Assertions.assertEquals;
1616

1717
public class RpcCollectionDoubleDataSourceTest {
1818
@Test
@@ -34,7 +34,7 @@ public void rpcCollectionDoubleDataSource_To_Double_Object_Array() {
3434
BindingData actualArg = actualBindingData.orElseThrow(WrongMethodTypeException::new);
3535
Double[] actualDoublegArray = (Double[]) actualArg.getValue();
3636
Double actualDouble = actualDoublegArray[0];
37-
assertEquals(actualDouble, expectedDouble);
37+
assertEquals(expectedDouble, actualDouble);
3838
}
3939

4040
@Test
@@ -56,7 +56,7 @@ public void rpcCollectionDoubleDataSource_To_double_Array() {
5656
BindingData actualArg = actualBindingData.orElseThrow(WrongMethodTypeException::new);
5757
double[] actualDoubleArray = (double[]) actualArg.getValue();
5858
double actualDouble = actualDoubleArray[0];
59-
assertEquals("" + actualDouble, "" + expectedDouble);
59+
assertEquals(expectedDouble, actualDouble);
6060
}
6161

6262
@Test
@@ -78,7 +78,7 @@ public void rpcCollectionDoubleDataSource_default_To_List_Double() {
7878
BindingData actualArg = actualBindingData.orElseThrow(WrongMethodTypeException::new);
7979
List<Double> actualDoubleList = (List) actualArg.getValue();
8080
Double actualLong = actualDoubleList.get(0);
81-
assertEquals(actualLong, expectedDouble);
81+
assertEquals(expectedDouble, actualLong);
8282
}
8383

8484
@Test
@@ -100,7 +100,7 @@ public void rpcCollectionDoubleDataSource_To_List_Double() {
100100
BindingData actualArg = actualBindingData.orElseThrow(WrongMethodTypeException::new);
101101
List<Double> actualDoubleList = (List) actualArg.getValue();
102102
Double actualLong = actualDoubleList.get(0);
103-
assertEquals(actualLong, expectedDouble);
103+
assertEquals(expectedDouble, actualLong);
104104
}
105105

106106
@Test
@@ -122,7 +122,7 @@ public void rpcCollectionDoubleDataSource_No_Generic_To_List_Long() {
122122
BindingData actualArg = actualBindingData.orElseThrow(WrongMethodTypeException::new);
123123
List<Double> actualDoubleList = (List) actualArg.getValue();
124124
Double actualLong = actualDoubleList.get(0);
125-
assertEquals(actualLong, expectedDouble);
125+
assertEquals(expectedDouble, actualLong);
126126
}
127127
}
128128

‎src/test/java/com/microsoft/azure/functions/worker/binding/tests/RpcCollectionLongDataSourceTest.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
import com.microsoft.azure.functions.worker.binding.BindingData;
66
import com.microsoft.azure.functions.worker.binding.RpcCollectionLongDataSource;
77
import org.apache.commons.lang3.reflect.TypeUtils;
8-
import org.junit.Test;
8+
import org.junit.jupiter.api.Test;
99

1010
import java.lang.invoke.WrongMethodTypeException;
1111
import java.util.ArrayList;
1212
import java.util.List;
1313
import java.util.Optional;
1414

15-
import static org.junit.Assert.assertEquals;
15+
import static org.junit.jupiter.api.Assertions.assertEquals;
1616

1717
public class RpcCollectionLongDataSourceTest{
1818
@Test
@@ -34,7 +34,7 @@ public void rpcCollectionSInt64DataSource_To_Long_Object_Array() {
3434
BindingData actualArg = actualBindingData.orElseThrow(WrongMethodTypeException::new);
3535
Long[] actualLongArray = (Long[]) actualArg.getValue();
3636
Long actualLong = actualLongArray[0];
37-
assertEquals(actualLong, expectedLong);
37+
assertEquals(expectedLong, actualLong);
3838
}
3939

4040
@Test
@@ -56,7 +56,7 @@ public void rpcCollectionDoubleDataSource_To_long_Array() {
5656
BindingData actualArg = actualBindingData.orElseThrow(WrongMethodTypeException::new);
5757
long[] actualLongArray = (long[]) actualArg.getValue();
5858
Long actualLong = actualLongArray[0];
59-
assertEquals(actualLong, expectedLong);
59+
assertEquals(expectedLong, actualLong);
6060
}
6161

6262
@Test
@@ -78,7 +78,7 @@ public void rpcCollectionSInt64DataSource_default_To_List_Long() {
7878
BindingData actualArg = actualBindingData.orElseThrow(WrongMethodTypeException::new);
7979
List<Long> actualLongList = (List) actualArg.getValue();
8080
Long actualLong = actualLongList.get(0);
81-
assertEquals(actualLong, expectedLong);
81+
assertEquals(expectedLong, actualLong);
8282
}
8383

8484
@Test
@@ -101,7 +101,7 @@ public void rpcCollectionSInt64DataSource_To_List_Long() {
101101
BindingData actualArg = actualBindingData.orElseThrow(WrongMethodTypeException::new);
102102
List<Long> actualLongList = (List) actualArg.getValue();
103103
Long actualLong = actualLongList.get(0);
104-
assertEquals(actualLong, expectedLong);
104+
assertEquals(expectedLong, actualLong);
105105
}
106106

107107
@Test
@@ -124,6 +124,6 @@ public void rpcCollectionSInt64DataSource_No_Generic_To_List_Long() {
124124
BindingData actualArg = actualBindingData.orElseThrow(WrongMethodTypeException::new);
125125
List<Long> actualLongList = (List) actualArg.getValue();
126126
Long actualLong = actualLongList.get(0);
127-
assertEquals(actualLong, expectedLong);
127+
assertEquals(expectedLong, actualLong);
128128
}
129129
}

0 commit comments

Comments
 (0)