Skip to content

Commit

Permalink
Migrating tests to JUnit5 (#784)
Browse files Browse the repository at this point in the history
Signed-off-by: Jeroen van Erp <jeroen@hierynomus.com>
  • Loading branch information
hierynomus committed Aug 22, 2023
1 parent 8b921f0 commit 7b3a423
Show file tree
Hide file tree
Showing 24 changed files with 550 additions and 695 deletions.
1 change: 1 addition & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ testing {
runtimeOnly OBJENESIS
implementation SPOCK_CORE
implementation COMMONS_IO
implementation "org.mockito:mockito-core:5.4.0"
runtimeOnly LOGBACK_CLASSIC
}

Expand Down
2 changes: 0 additions & 2 deletions src/it/java/com/hierynomus/smbj/testing/TestingUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
*/
package com.hierynomus.smbj.testing;

import java.util.function.Consumer;

import com.hierynomus.smbj.SMBClient;
import com.hierynomus.smbj.SmbConfig;
import com.hierynomus.smbj.connection.Connection;
Expand Down
10 changes: 9 additions & 1 deletion src/main/java/com/hierynomus/msdfsc/ReferralCache.java
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ public String toString() {

}

private static class ReferralCacheNode {
static class ReferralCacheNode {
static final AtomicReferenceFieldUpdater<ReferralCacheNode, ReferralCacheEntry> ENTRY_UPDATER = AtomicReferenceFieldUpdater.newUpdater(ReferralCacheNode.class, ReferralCacheEntry.class, "entry");

private final String pathComponent;
Expand Down Expand Up @@ -250,5 +250,13 @@ void clear() {
this.childNodes.clear();
ENTRY_UPDATER.set(this, null);
}

String getPathComponent() {
return pathComponent;
}

Map<String, ReferralCacheNode> getChildNodes() {
return childNodes;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
* The SMB2 TRANSFORM_HEADER is only valid for the SMB 3.x dialect family.
*/
public class SMB2TransformHeader implements SMBHeader {
private static final byte[] ENCRYPTED_PROTOCOL_ID = {(byte) 0xFD, 'S', 'M', 'B'};
public static final byte[] ENCRYPTED_PROTOCOL_ID = {(byte) 0xFD, 'S', 'M', 'B'};
private int headerStartPosition;
private byte[] signature;
private byte[] nonce;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -137,4 +137,8 @@ private void putCapabilities(SMBBuffer buffer) {
buffer.putReserved4(); // Capabilities (4 bytes)
}
}

public List<SMB2NegotiateContext> getNegotiateContextList() {
return negotiateContextList;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,10 @@ byte[] getNewNonce() {
return b.getCompactData();
}

public void setCipher(SMB3EncryptionCipher cipher) {
this.cipher = cipher;
}

public class EncryptedPacketWrapper extends SMB2Packet {
private final SMB2Packet packet;
private final SecretKey encryptionKey;
Expand Down
125 changes: 0 additions & 125 deletions src/test/groovy/com/hierynomus/msdfsc/DFSPathTest.groovy

This file was deleted.

79 changes: 0 additions & 79 deletions src/test/groovy/com/hierynomus/msdfsc/ReferralCacheNodeTest.groovy

This file was deleted.

35 changes: 0 additions & 35 deletions src/test/groovy/com/hierynomus/msdtyp/MsDataTypesSpec.groovy

This file was deleted.

51 changes: 0 additions & 51 deletions src/test/groovy/com/hierynomus/msdtyp/SIDSpec.groovy

This file was deleted.

Loading

0 comments on commit 7b3a423

Please sign in to comment.