PandacubeFr/BungeeCord
1
0
Fork 0
Code Releases Activity

Update tests to JUnit 5

Browse Source
This commit is contained in:
md_5
2023-09-23 18:44:14 +10:00
parent 0509303fd3
commit f9b75c4a3a
20 changed files with 377 additions and 409 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
native/src/test/java/net/md_5/bungee/NativeCipherTest.java
View File

@@ -1,5 +1,6 @@
package net.md_5.bungee;
import static org.junit.jupiter.api.Assertions.*;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import java.util.Random;
@@ -9,12 +10,11 @@ import net.md_5.bungee.jni.NativeCode;
import net.md_5.bungee.jni.cipher.BungeeCipher;
import net.md_5.bungee.jni.cipher.JavaCipher;
import net.md_5.bungee.jni.cipher.NativeCipher;
import org.junit.Assert;
import org.junit.FixMethodOrder;
import org.junit.Test;
import org.junit.runners.MethodSorters;
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
@TestMethodOrder(MethodOrderer.MethodName.class)
public class NativeCipherTest
{
@@ -34,7 +34,7 @@ public class NativeCipherTest
if ( NativeCode.isSupported() )
{
boolean loaded = factory.load();
Assert.assertTrue( "Native cipher failed to load!", loaded );
assertTrue( loaded, "Native cipher failed to load!" );
NativeCipher cipher = new NativeCipher();
System.out.println( "Testing native cipher..." );
@@ -48,7 +48,7 @@ public class NativeCipherTest
if ( NativeCode.isSupported() )
{
boolean loaded = factory.load();
Assert.assertTrue( "Native cipher failed to load!", loaded );
assertTrue( loaded, "Native cipher failed to load!" );
NativeCipher cipher = new NativeCipher();
@@ -98,7 +98,7 @@ public class NativeCipherTest
// Encrypt
cipher.init( true, secret );
cipher.cipher( nativePlain, out );
Assert.assertEquals( nativeCiphered, out );
assertEquals( nativeCiphered, out );
out.clear();
@@ -106,7 +106,7 @@ public class NativeCipherTest
cipher.init( false, secret );
cipher.cipher( nativeCiphered, out );
nativePlain.resetReaderIndex();
Assert.assertEquals( nativePlain, out );
assertEquals( nativePlain, out );
System.out.println( "This cipher works correctly!" );
}

8
native/src/test/java/net/md_5/bungee/NativeZlibTest.java
View File

@@ -1,5 +1,6 @@
package net.md_5.bungee;
import static org.junit.jupiter.api.Assertions.*;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import java.util.Arrays;
@@ -9,8 +10,7 @@ import net.md_5.bungee.jni.NativeCode;
import net.md_5.bungee.jni.zlib.BungeeZlib;
import net.md_5.bungee.jni.zlib.JavaZlib;
import net.md_5.bungee.jni.zlib.NativeZlib;
import org.junit.Assert;
import org.junit.Test;
import org.junit.jupiter.api.Test;
public class NativeZlibTest
{
@@ -22,7 +22,7 @@ public class NativeZlibTest
{
if ( NativeCode.isSupported() )
{
Assert.assertTrue( "Native code failed to load!", factory.load() );
assertTrue( factory.load(), "Native code failed to load!" );
test( factory.newInstance() );
}
test( new JavaZlib() );
@@ -64,6 +64,6 @@ public class NativeZlibTest
long elapsed = System.currentTimeMillis() - start;
System.out.println( "Took: " + elapsed + "ms" );
Assert.assertTrue( "Results do not match", Arrays.equals( dataBuf, check ) );
assertTrue( Arrays.equals( dataBuf, check ), "Results do not match" );
}
}