You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ha...@apache.org on 2015/01/30 03:34:20 UTC
directory-kerberos git commit: DIRKRB-153 Switching to AssertJ
framework for unit tests in kerby-kerb
Repository: directory-kerberos
Updated Branches:
refs/heads/master dfc250909 -> 4a65c583d
DIRKRB-153 Switching to AssertJ framework for unit tests in kerby-kerb
Project: http://git-wip-us.apache.org/repos/asf/directory-kerberos/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerberos/commit/4a65c583
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerberos/tree/4a65c583
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerberos/diff/4a65c583
Branch: refs/heads/master
Commit: 4a65c583d0c96b134d362bb8b13d7a41cd35670a
Parents: dfc2509
Author: chenlin1 <li...@intel.com>
Authored: Fri Jan 30 10:33:45 2015 +0800
Committer: chenlin1 <li...@intel.com>
Committed: Fri Jan 30 10:33:45 2015 +0800
----------------------------------------------------------------------
.../kerberos/kerb/client/TestKrbConfigLoad.java | 40 +++++-----
.../kerberos/kerb/codec/test/CodecTest.java | 11 ++-
.../kerb/codec/test/TestAsRepCodec.java | 33 ++++----
.../kerb/codec/test/TestAsReqCodec.java | 57 +++++++-------
.../kerberos/kerb/codec/test/TestKerberos.java | 66 ++++++++--------
.../kerberos/kerb/codec/test/TestSpnego.java | 80 ++++++++++----------
.../kerb/codec/test/TestTgsRepCodec.java | 31 ++++----
.../kerb/codec/test/TestTgsReqCodec.java | 44 +++++------
.../kerberos/kerb/crypto/CamelliaEncTest.java | 6 +-
.../kerberos/kerb/crypto/CheckSumsTest.java | 2 +-
.../kerby/kerberos/kerb/crypto/CmacTest.java | 11 +--
.../kerby/kerberos/kerb/crypto/Crc32Test.java | 5 +-
.../kerberos/kerb/crypto/DecryptionTest.java | 9 ++-
.../kerberos/kerb/crypto/DesKeyMakerTest.java | 9 ++-
.../kerberos/kerb/crypto/KeyDeriveTest.java | 5 +-
.../kerberos/kerb/crypto/String2keyTest.java | 8 +-
.../kerby/kerberos/kerb/server/KdcTest.java | 9 ++-
.../kerberos/kerb/server/WithCertKdcTest.java | 13 ++--
.../kerberos/kerb/server/WithTokenKdcTest.java | 11 +--
.../kerberos/kerb/server/TestKdcConfigLoad.java | 25 +++---
.../kerby/kerberos/kerb/util/CcacheTest.java | 9 ++-
.../kerberos/kerb/util/EncryptionTest.java | 7 +-
.../kerby/kerberos/kerb/util/KeysTest.java | 5 +-
.../kerby/kerberos/kerb/util/KeytabTest.java | 7 +-
kerby-kerb/pom.xml | 6 ++
25 files changed, 265 insertions(+), 244 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4a65c583/kerby-kerb/kerb-client/src/test/java/org/apache/kerby/kerberos/kerb/client/TestKrbConfigLoad.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-client/src/test/java/org/apache/kerby/kerberos/kerb/client/TestKrbConfigLoad.java b/kerby-kerb/kerb-client/src/test/java/org/apache/kerby/kerberos/kerb/client/TestKrbConfigLoad.java
index ae7ded5..26fb38e 100644
--- a/kerby-kerb/kerb-client/src/test/java/org/apache/kerby/kerberos/kerb/client/TestKrbConfigLoad.java
+++ b/kerby-kerb/kerb-client/src/test/java/org/apache/kerby/kerberos/kerb/client/TestKrbConfigLoad.java
@@ -21,7 +21,6 @@ package org.apache.kerby.kerberos.kerb.client;
import org.apache.kerby.config.Conf;
import org.apache.kerby.kerberos.kerb.spec.common.EncryptionType;
-import org.junit.Assert;
import org.junit.Test;
import java.io.File;
@@ -29,6 +28,8 @@ import java.io.IOException;
import java.net.URISyntaxException;
import java.net.URL;
+import static org.assertj.core.api.Assertions.assertThat;
+
/**
* Test for loading configurations form krb5.conf.
* krb5.conf is the configuration file in MIT Kerberos.
@@ -44,26 +45,25 @@ public class TestKrbConfigLoad {
Conf conf = krbConfig.getConf();
conf.addIniConfig(confFile);
- Assert.assertEquals("KRB.COM", krbConfig.getDefaultRealm());
- Assert.assertFalse(krbConfig.getDnsLookUpKdc());
- Assert.assertFalse(krbConfig.getDnsLookUpRealm());
- Assert.assertTrue(krbConfig.getAllowWeakCrypto());
- Assert.assertEquals(24 * 3600, krbConfig.getTicketLifetime());
- Assert.assertEquals(7 * 24 * 3600, krbConfig.getRenewLifetime());
- Assert.assertTrue(krbConfig.isForwardableAllowed());
- Assert.assertEquals(2, krbConfig.getEncryptionTypes().size());
- Assert.assertEquals(EncryptionType.DES_CBC_CRC, krbConfig.getEncryptionTypes().get(0));
- Assert.assertEquals(EncryptionType.AES128_CTS_HMAC_SHA1_96, krbConfig.getEncryptionTypes().get(1));
- Assert.assertEquals(300, krbConfig.getAllowableClockSkew());
- Assert.assertTrue(krbConfig.isProxiableAllowed());
- Assert.assertEquals(1, krbConfig.getDefaultTgsEnctypes().size());
- Assert.assertEquals(EncryptionType.DES_CBC_CRC, krbConfig.getDefaultTgsEnctypes().get(0));
- Assert.assertEquals(1, krbConfig.getDefaultTktEnctypes().size());
- Assert.assertEquals(EncryptionType.DES_CBC_CRC, krbConfig.getDefaultTktEnctypes().get(0));
+ assertThat(krbConfig.getDefaultRealm()).isEqualTo("KRB.COM");
+ assertThat(krbConfig.getDnsLookUpKdc()).isFalse();
+ assertThat(krbConfig.getDnsLookUpRealm()).isFalse();
+ assertThat(krbConfig.getAllowWeakCrypto()).isTrue();
+ assertThat(krbConfig.getTicketLifetime()).isEqualTo(24 * 3600);
+ assertThat(krbConfig.getRenewLifetime()).isEqualTo(7 * 24 * 3600);
+ assertThat(krbConfig.isForwardableAllowed()).isTrue();
+ assertThat(krbConfig.getEncryptionTypes()).hasSize(2)
+ .contains(EncryptionType.DES_CBC_CRC, EncryptionType.AES128_CTS_HMAC_SHA1_96);
+ assertThat(krbConfig.getAllowableClockSkew()).isEqualTo(300);
+ assertThat(krbConfig.isProxiableAllowed()).isTrue();
+ assertThat(krbConfig.getDefaultTgsEnctypes()).hasSize(1)
+ .contains(EncryptionType.DES_CBC_CRC);
+ assertThat(krbConfig.getDefaultTktEnctypes()).hasSize(1)
+ .contains(EncryptionType.DES_CBC_CRC);
- Assert.assertEquals("FILE:/var/log/krb5libs.log", krbConfig.getDefaultLoggingLocation());
- Assert.assertEquals("FILE:/var/log/krb5kdc.log", krbConfig.getKdcLoggingLocation());
- Assert.assertEquals("FILE:/var/log/kadmind.log", krbConfig.getAdminLoggingLocation());
+ assertThat(krbConfig.getDefaultLoggingLocation()).isEqualTo("FILE:/var/log/krb5libs.log");
+ assertThat(krbConfig.getKdcLoggingLocation()).isEqualTo("FILE:/var/log/krb5kdc.log");
+ assertThat(krbConfig.getAdminLoggingLocation()).isEqualTo("FILE:/var/log/kadmind.log");
}
}
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4a65c583/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/test/CodecTest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/test/CodecTest.java b/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/test/CodecTest.java
index 58a57e4..d3c3201 100644
--- a/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/test/CodecTest.java
+++ b/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/test/CodecTest.java
@@ -23,10 +23,9 @@ import org.apache.kerby.kerberos.kerb.KrbException;
import org.apache.kerby.kerberos.kerb.codec.KrbCodec;
import org.apache.kerby.kerberos.kerb.spec.common.CheckSum;
import org.apache.kerby.kerberos.kerb.spec.common.CheckSumType;
-import org.junit.Assert;
import org.junit.Test;
-import java.util.Arrays;
+import static org.assertj.core.api.Assertions.assertThat;
public class CodecTest {
@@ -36,11 +35,11 @@ public class CodecTest {
mcs.setCksumtype(CheckSumType.CRC32);
mcs.setChecksum(new byte[] {0x10});
byte[] bytes = KrbCodec.encode(mcs);
- Assert.assertNotNull(bytes);
+ assertThat(bytes).isNotNull();
CheckSum restored = KrbCodec.decode(bytes, CheckSum.class);
- Assert.assertNotNull(restored);
- Assert.assertEquals(mcs.getCksumtype(), restored.getCksumtype());
- Assert.assertTrue(Arrays.equals(mcs.getChecksum(), restored.getChecksum()));
+ assertThat(restored).isNotNull();
+ assertThat(restored.getCksumtype()).isEqualTo(mcs.getCksumtype());
+ assertThat(mcs.getChecksum()).isEqualTo(restored.getChecksum());
}
}
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4a65c583/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/test/TestAsRepCodec.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/test/TestAsRepCodec.java b/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/test/TestAsRepCodec.java
index b00c408..a4592cd 100644
--- a/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/test/TestAsRepCodec.java
+++ b/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/test/TestAsRepCodec.java
@@ -24,12 +24,13 @@ import org.apache.kerby.kerberos.kerb.spec.common.NameType;
import org.apache.kerby.kerberos.kerb.spec.common.PrincipalName;
import org.apache.kerby.kerberos.kerb.spec.kdc.AsRep;
import org.apache.kerby.kerberos.kerb.spec.ticket.Ticket;
-import org.junit.Assert;
import org.junit.Test;
import java.io.IOException;
import java.nio.ByteBuffer;
+import static org.assertj.core.api.Assertions.assertThat;
+
/**
* Test AsRep message using a real 'correct' network packet captured from MS-AD to detective programming errors
* and compatibility issues particularly regarding Kerberos crypto.
@@ -44,30 +45,28 @@ public class TestAsRepCodec {
AsRep asRep = new AsRep();
asRep.decode(asRepToken);
- Assert.assertEquals(5, asRep.getPvno());
- Assert.assertEquals(KrbMessageType.AS_REP, asRep.getMsgType());
- Assert.assertEquals("DENYDC.COM", asRep.getCrealm());
+ assertThat(asRep.getPvno()).isEqualTo(5);
+ assertThat(asRep.getMsgType()).isEqualTo(KrbMessageType.AS_REP);
+ assertThat(asRep.getCrealm()).isEqualTo("DENYDC.COM");
PrincipalName cName = asRep.getCname();
- Assert.assertEquals(NameType.NT_PRINCIPAL, cName.getNameType());
- Assert.assertEquals(1, cName.getNameStrings().size());
- Assert.assertEquals("u5", cName.getNameStrings().get(0));
+ assertThat(cName.getNameType()).isEqualTo(NameType.NT_PRINCIPAL);
+ assertThat(cName.getNameStrings()).hasSize(1).contains("u5");
Ticket ticket = asRep.getTicket();
- Assert.assertEquals(5, ticket.getTktvno());
- Assert.assertEquals("DENYDC.COM", ticket.getRealm());
+ assertThat(ticket.getTktvno()).isEqualTo(5);
+ assertThat(ticket.getRealm()).isEqualTo("DENYDC.COM");
PrincipalName sName = ticket.getSname();
- Assert.assertEquals(NameType.NT_SRV_INST, sName.getNameType());
- Assert.assertEquals(2, sName.getNameStrings().size());
- Assert.assertEquals("krbtgt", sName.getNameStrings().get(0));
- Assert.assertEquals("DENYDC.COM", sName.getNameStrings().get(1));
+ assertThat(sName.getNameType()).isEqualTo(NameType.NT_SRV_INST);
+ assertThat(sName.getNameStrings()).hasSize(2)
+ .contains("krbtgt", "DENYDC.COM");
//FIXME
//EncTicketPart encTicketPart = ticket.getEncPart();
- //Assert.assertEquals(2, encTicketPart.getKey().getKvno());
- //Assert.assertEquals(0x0017, encTicketPart.getKey().getKeyType().getValue());
+ //assertThat(encTicketPart.getKey().getKvno()).isEqualTo(2);
+ //assertThat(encTicketPart.getKey().getKeyType().getValue()).isEqualTo(0x0017);
//EncKdcRepPart encKdcRepPart = asRep.getEncPart();
- //Assert.assertEquals(0x0017, encKdcRepPart.getKey().getKeyType().getValue());
- //Assert.assertEquals(7, encKdcRepPart.getKey().getKvno());
+ //assertThat(encKdcRepPart.getKey().getKeyType().getValue()).isEqualTo(0x0017);
+ //assertThat(encKdcRepPart.getKey().getKvno()).isEqualTo(7);
}
}
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4a65c583/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/test/TestAsReqCodec.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/test/TestAsReqCodec.java b/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/test/TestAsReqCodec.java
index 40427ec..3ed67e7 100644
--- a/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/test/TestAsReqCodec.java
+++ b/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/test/TestAsReqCodec.java
@@ -25,7 +25,6 @@ import org.apache.kerby.kerberos.kerb.spec.kdc.KdcReqBody;
import org.apache.kerby.kerberos.kerb.spec.pa.PaData;
import org.apache.kerby.kerberos.kerb.spec.pa.PaDataEntry;
import org.apache.kerby.kerberos.kerb.spec.pa.PaDataType;
-import org.junit.Assert;
import org.junit.Test;
import java.io.IOException;
@@ -37,6 +36,8 @@ import java.util.Date;
import java.util.List;
import java.util.SimpleTimeZone;
+import static org.assertj.core.api.Assertions.assertThat;
+
/**
* Test AsReq message using a real 'correct' network packet captured from MS-AD to detective programming errors
* and compatibility issues particularly regarding Kerberos crypto.
@@ -51,49 +52,49 @@ public class TestAsReqCodec {
AsReq asReq = new AsReq();
asReq.decode(asReqToken);
- Assert.assertEquals(5, asReq.getPvno());
- Assert.assertEquals(KrbMessageType.AS_REQ, asReq.getMsgType());
+ assertThat(asReq.getPvno()).isEqualTo(5);
+ assertThat(asReq.getMsgType()).isEqualTo(KrbMessageType.AS_REQ);
PaData paData = asReq.getPaData();
PaDataEntry encTimestampEntry = paData.findEntry(PaDataType.ENC_TIMESTAMP);
- Assert.assertEquals(PaDataType.ENC_TIMESTAMP, encTimestampEntry.getPaDataType());
- Assert.assertArrayEquals(Arrays.copyOfRange(bytes, 33, 96), encTimestampEntry.getPaDataValue());
+ assertThat(encTimestampEntry.getPaDataType()).isEqualTo(PaDataType.ENC_TIMESTAMP);
+ assertThat(encTimestampEntry.getPaDataValue()).isEqualTo(Arrays.copyOfRange(bytes, 33, 96));
PaDataEntry pacRequestEntry = paData.findEntry(PaDataType.PAC_REQUEST);
- Assert.assertEquals(PaDataType.PAC_REQUEST, pacRequestEntry.getPaDataType());
- Assert.assertArrayEquals(Arrays.copyOfRange(bytes, 108, 115), pacRequestEntry.getPaDataValue());
+ assertThat(pacRequestEntry.getPaDataType()).isEqualTo(PaDataType.PAC_REQUEST);
+ assertThat(pacRequestEntry.getPaDataValue()).isEqualTo(Arrays.copyOfRange(bytes, 108, 115));
KdcReqBody body = asReq.getReqBody();
- Assert.assertEquals(0, body.getKdcOptions().getPadding());
- Assert.assertArrayEquals(Arrays.copyOfRange(bytes, 126, 130), body.getKdcOptions().getValue());
+ assertThat(body.getKdcOptions().getPadding()).isEqualTo(0);
+ assertThat(body.getKdcOptions().getValue()).isEqualTo(Arrays.copyOfRange(bytes, 126, 130));
PrincipalName cName = body.getCname();
- Assert.assertEquals(NameType.NT_PRINCIPAL, cName.getNameType());
- Assert.assertEquals("des", cName.getName());
- Assert.assertEquals("DENYDC", body.getRealm());
+ assertThat(cName.getNameType()).isEqualTo(NameType.NT_PRINCIPAL);
+ assertThat(cName.getName()).isEqualTo("des");
+ assertThat(body.getRealm()).isEqualTo("DENYDC");
PrincipalName sName = body.getSname();
- Assert.assertEquals(NameType.NT_SRV_INST, sName.getNameType());
- Assert.assertEquals(2, sName.getNameStrings().size());
- Assert.assertEquals("krbtgt", sName.getNameStrings().get(0));
- Assert.assertEquals("DENYDC", sName.getNameStrings().get(1));
+ assertThat(sName.getNameType()).isEqualTo(NameType.NT_SRV_INST);
+ assertThat(sName.getNameStrings()).hasSize(2)
+ .contains("krbtgt", "DENYDC");
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
sdf.setTimeZone(new SimpleTimeZone(0, "Z"));
Date date = sdf.parse("20370913024805");
- Assert.assertEquals(date.getTime(), body.getTill().getTime());
- Assert.assertEquals(date.getTime(), body.getRtime().getTime());
+ assertThat(body.getTill().getTime()).isEqualTo(date.getTime());
+ assertThat(body.getRtime().getTime()).isEqualTo(date.getTime());
- Assert.assertEquals(197451134, body.getNonce());
+ assertThat(body.getNonce()).isEqualTo(197451134);
List<EncryptionType> types = body.getEtypes();
- Assert.assertEquals(0x0017, types.get(0).getValue());
- //Assert.assertEquals(0xff7b, types.get(1).getValue());//FIXME
- //Assert.assertEquals(0x0080, types.get(2).getValue());//FIXME
- Assert.assertEquals(0x0003, types.get(3).getValue());
- Assert.assertEquals(0x0001, types.get(4).getValue());
- Assert.assertEquals(0x0018, types.get(5).getValue());
- //Assert.assertEquals(0xff79, types.get(6).getValue());//FIXME
+ assertThat(types).hasSize(7);
+ assertThat(types.get(0).getValue()).isEqualTo(0x0017);
+ //assertThat(types.get(1).getValue()).isEqualTo(0xff7b);//FIXME
+ //assertThat(types.get(2).getValue()).isEqualTo(0x0080);//FIXME
+ assertThat(types.get(3).getValue()).isEqualTo(0x0003);
+ assertThat(types.get(4).getValue()).isEqualTo(0x0001);
+ assertThat(types.get(5).getValue()).isEqualTo(0x0018);
+ //assertThat(types.get(6).getValue()).isEqualTo(0xff79);//FIXME
List<HostAddress> hostAddress = body.getAddresses().getElements();
- Assert.assertEquals(1, hostAddress.size());
- Assert.assertEquals(HostAddrType.ADDRTYPE_NETBIOS, hostAddress.get(0).getAddrType());
+ assertThat(hostAddress).hasSize(1);
+ assertThat(hostAddress.get(0).getAddrType()).isEqualTo(HostAddrType.ADDRTYPE_NETBIOS);
}
}
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4a65c583/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/test/TestKerberos.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/test/TestKerberos.java b/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/test/TestKerberos.java
index 0a1338c..900186f 100644
--- a/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/test/TestKerberos.java
+++ b/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/test/TestKerberos.java
@@ -22,13 +22,15 @@ package org.apache.kerby.kerberos.kerb.codec.test;
import org.apache.kerby.kerberos.kerb.codec.kerberos.KerberosTicket;
import org.apache.kerby.kerberos.kerb.codec.kerberos.KerberosToken;
import org.apache.kerby.kerberos.kerb.spec.common.EncryptionKey;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import java.io.IOException;
import java.io.InputStream;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
+
public class TestKerberos {
private byte[] rc4Token;
@@ -94,30 +96,30 @@ public class TestKerberos {
public void testRc4Ticket() throws Exception {
KerberosToken token = new KerberosToken(rc4Token, rc4Key);
- Assert.assertNotNull(token);
- Assert.assertNotNull(token.getApRequest());
+ assertThat(token).isNotNull();
+ assertThat(token.getApRequest()).isNotNull();
KerberosTicket ticket = token.getApRequest().getTicket();
- Assert.assertNotNull(ticket);
- Assert.assertEquals("HTTP/server.test.domain.com", ticket.getServerPrincipalName());
- Assert.assertEquals("DOMAIN.COM", ticket.getServerRealm());
- Assert.assertEquals("user.test", ticket.getUserPrincipalName());
- Assert.assertEquals("DOMAIN.COM", ticket.getUserRealm());
+ assertThat(ticket).isNotNull();
+ assertThat(ticket.getServerPrincipalName()).isEqualTo("HTTP/server.test.domain.com");
+ assertThat(ticket.getServerRealm()).isEqualTo("DOMAIN.COM");
+ assertThat(ticket.getUserPrincipalName()).isEqualTo("user.test");
+ assertThat(ticket.getUserRealm()).isEqualTo("DOMAIN.COM");
}
//@Test
public void testDesTicket() throws Exception {
KerberosToken token = new KerberosToken(desToken, desKey);
- Assert.assertNotNull(token);
- Assert.assertNotNull(token.getApRequest());
+ assertThat(token).isNotNull();
+ assertThat(token.getApRequest()).isNotNull();
KerberosTicket ticket = token.getApRequest().getTicket();
- Assert.assertNotNull(ticket);
- Assert.assertEquals("HTTP/server.test.domain.com", ticket.getServerPrincipalName());
- Assert.assertEquals("DOMAIN.COM", ticket.getServerRealm());
- Assert.assertEquals("user.test@domain.com", ticket.getUserPrincipalName());
- Assert.assertEquals("DOMAIN.COM", ticket.getUserRealm());
+ assertThat(ticket).isNotNull();
+ assertThat(ticket.getServerPrincipalName()).isEqualTo("HTTP/server.test.domain.com");
+ assertThat(ticket.getServerRealm()).isEqualTo("DOMAIN.COM");
+ assertThat(ticket.getUserPrincipalName()).isEqualTo("user.test@domain.com");
+ assertThat(ticket.getUserRealm()).isEqualTo("DOMAIN.COM");
}
@Test
@@ -125,15 +127,15 @@ public class TestKerberos {
KerberosToken token = null;
token = new KerberosToken(aes128Token, aes128Key);
- Assert.assertNotNull(token);
- Assert.assertNotNull(token.getApRequest());
+ assertThat(token).isNotNull();
+ assertThat(token.getApRequest()).isNotNull();
KerberosTicket ticket = token.getApRequest().getTicket();
- Assert.assertNotNull(ticket);
- Assert.assertEquals("HTTP/server.test.domain.com", ticket.getServerPrincipalName());
- Assert.assertEquals("DOMAIN.COM", ticket.getServerRealm());
- Assert.assertEquals("user.test", ticket.getUserPrincipalName());
- Assert.assertEquals("DOMAIN.COM", ticket.getUserRealm());
+ assertThat(ticket).isNotNull();
+ assertThat(ticket.getServerPrincipalName()).isEqualTo("HTTP/server.test.domain.com");
+ assertThat(ticket.getServerRealm()).isEqualTo("DOMAIN.COM");
+ assertThat(ticket.getUserPrincipalName()).isEqualTo("user.test");
+ assertThat(ticket.getUserRealm()).isEqualTo("DOMAIN.COM");
}
@Test
@@ -141,15 +143,15 @@ public class TestKerberos {
KerberosToken token = null;
token = new KerberosToken(aes256Token, aes256Key);
- Assert.assertNotNull(token);
- Assert.assertNotNull(token.getApRequest());
+ assertThat(token).isNotNull();
+ assertThat(token.getApRequest()).isNotNull();
KerberosTicket ticket = token.getApRequest().getTicket();
- Assert.assertNotNull(ticket);
- Assert.assertEquals("HTTP/server.test.domain.com", ticket.getServerPrincipalName());
- Assert.assertEquals("DOMAIN.COM", ticket.getServerRealm());
- Assert.assertEquals("user.test", ticket.getUserPrincipalName());
- Assert.assertEquals("DOMAIN.COM", ticket.getUserRealm());
+ assertThat(ticket).isNotNull();
+ assertThat(ticket.getServerPrincipalName()).isEqualTo("HTTP/server.test.domain.com");
+ assertThat(ticket.getServerRealm()).isEqualTo("DOMAIN.COM");
+ assertThat(ticket.getUserPrincipalName()).isEqualTo("user.test");
+ assertThat(ticket.getUserRealm()).isEqualTo("DOMAIN.COM");
}
@Test
@@ -157,10 +159,10 @@ public class TestKerberos {
KerberosToken token = null;
try {
token = new KerberosToken(rc4Token, desKey);
- Assert.fail("Should have thrown Exception.");
+ fail("Should have thrown Exception.");
} catch(Exception e) {
- Assert.assertNotNull(e);
- Assert.assertNull(token);
+ assertThat(e).isNotNull();
+ assertThat(token).isNull();
}
}
}
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4a65c583/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/test/TestSpnego.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/test/TestSpnego.java b/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/test/TestSpnego.java
index b3c0019..8c53d3a 100644
--- a/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/test/TestSpnego.java
+++ b/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/test/TestSpnego.java
@@ -22,11 +22,13 @@ package org.apache.kerby.kerberos.kerb.codec.test;
import org.apache.kerby.kerberos.kerb.codec.spnego.SpnegoConstants;
import org.apache.kerby.kerberos.kerb.codec.spnego.SpnegoInitToken;
import org.apache.kerby.kerberos.kerb.codec.spnego.SpnegoToken;
-import org.junit.Assert;
import java.io.IOException;
import java.io.InputStream;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Fail.fail;
+
public class TestSpnego {
private byte[] rc4Token;
@@ -67,15 +69,15 @@ public class TestSpnego {
try {
SpnegoToken spnegoToken = SpnegoToken.parse(rc4Token);
- Assert.assertNotNull(spnegoToken);
- Assert.assertTrue(spnegoToken instanceof SpnegoInitToken);
- Assert.assertNotNull(spnegoToken.getMechanismToken());
- Assert.assertTrue(spnegoToken.getMechanismToken().length < rc4Token.length);
- Assert.assertNotNull(spnegoToken.getMechanism());
- Assert.assertEquals(SpnegoConstants.LEGACY_KERBEROS_MECHANISM, spnegoToken.getMechanism());
+ assertThat(spnegoToken).isNotNull();
+ assertThat(spnegoToken instanceof SpnegoInitToken).isTrue();
+ assertThat(spnegoToken.getMechanismToken()).isNotNull();
+ assertThat(spnegoToken.getMechanismToken().length < rc4Token.length).isTrue();
+ assertThat(spnegoToken.getMechanism()).isNotNull();
+ assertThat(spnegoToken.getMechanism()).isEqualTo(SpnegoConstants.LEGACY_KERBEROS_MECHANISM);
} catch(IOException e) {
e.printStackTrace();
- Assert.fail(e.getMessage());
+ fail(e.getMessage());
}
}
@@ -84,15 +86,15 @@ public class TestSpnego {
try {
SpnegoToken spnegoToken = SpnegoToken.parse(desToken);
- Assert.assertNotNull(spnegoToken);
- Assert.assertTrue(spnegoToken instanceof SpnegoInitToken);
- Assert.assertNotNull(spnegoToken.getMechanismToken());
- Assert.assertTrue(spnegoToken.getMechanismToken().length < desToken.length);
- Assert.assertNotNull(spnegoToken.getMechanism());
- Assert.assertEquals(SpnegoConstants.LEGACY_KERBEROS_MECHANISM, spnegoToken.getMechanism());
+ assertThat(spnegoToken).isNotNull();
+ assertThat(spnegoToken instanceof SpnegoInitToken).isTrue();
+ assertThat(spnegoToken.getMechanismToken()).isNotNull();
+ assertThat(spnegoToken.getMechanismToken().length < desToken.length).isTrue();
+ assertThat(spnegoToken.getMechanism()).isNotNull();
+ assertThat(spnegoToken.getMechanism()).isEqualTo(SpnegoConstants.LEGACY_KERBEROS_MECHANISM);
} catch(IOException e) {
e.printStackTrace();
- Assert.fail(e.getMessage());
+ fail(e.getMessage());
}
}
@@ -101,15 +103,15 @@ public class TestSpnego {
try {
SpnegoToken spnegoToken = SpnegoToken.parse(aes128Token);
- Assert.assertNotNull(spnegoToken);
- Assert.assertTrue(spnegoToken instanceof SpnegoInitToken);
- Assert.assertNotNull(spnegoToken.getMechanismToken());
- Assert.assertTrue(spnegoToken.getMechanismToken().length < aes128Token.length);
- Assert.assertNotNull(spnegoToken.getMechanism());
- Assert.assertEquals(SpnegoConstants.LEGACY_KERBEROS_MECHANISM, spnegoToken.getMechanism());
+ assertThat(spnegoToken).isNotNull();
+ assertThat(spnegoToken instanceof SpnegoInitToken).isTrue();
+ assertThat(spnegoToken.getMechanismToken()).isNotNull();
+ assertThat(spnegoToken.getMechanismToken().length < aes128Token.length).isTrue();
+ assertThat(spnegoToken.getMechanism()).isNotNull();
+ assertThat(spnegoToken.getMechanism()).isEqualTo(SpnegoConstants.LEGACY_KERBEROS_MECHANISM);
} catch(IOException e) {
e.printStackTrace();
- Assert.fail(e.getMessage());
+ fail(e.getMessage());
}
}
@@ -118,15 +120,15 @@ public class TestSpnego {
try {
SpnegoToken spnegoToken = SpnegoToken.parse(aes256Token);
- Assert.assertNotNull(spnegoToken);
- Assert.assertTrue(spnegoToken instanceof SpnegoInitToken);
- Assert.assertNotNull(spnegoToken.getMechanismToken());
- Assert.assertTrue(spnegoToken.getMechanismToken().length < aes256Token.length);
- Assert.assertNotNull(spnegoToken.getMechanism());
- Assert.assertEquals(SpnegoConstants.LEGACY_KERBEROS_MECHANISM, spnegoToken.getMechanism());
+ assertThat(spnegoToken).isNotNull();
+ assertThat(spnegoToken instanceof SpnegoInitToken).isTrue();
+ assertThat(spnegoToken.getMechanismToken()).isNotNull();
+ assertThat(spnegoToken.getMechanismToken().length < aes256Token.length).isTrue();
+ assertThat(spnegoToken.getMechanism()).isNotNull();
+ assertThat(spnegoToken.getMechanism()).isEqualTo(SpnegoConstants.LEGACY_KERBEROS_MECHANISM);
} catch(IOException e) {
e.printStackTrace();
- Assert.fail(e.getMessage());
+ fail(e.getMessage());
}
}
@@ -135,10 +137,10 @@ public class TestSpnego {
SpnegoToken spnegoToken = null;
try {
spnegoToken = SpnegoToken.parse(new byte[0]);
- Assert.fail("Should have thrown DecodingException.");
+ fail("Should have thrown DecodingException.");
} catch(IOException e) {
- Assert.assertNotNull(e);
- Assert.assertNull(spnegoToken);
+ assertThat(e).isNotNull();
+ assertThat(spnegoToken).isNull();
}
}
@@ -147,10 +149,10 @@ public class TestSpnego {
SpnegoToken spnegoToken = null;
try {
spnegoToken = SpnegoToken.parse(corruptToken);
- Assert.fail("Should have thrown DecodingException.");
+ fail("Should have thrown DecodingException.");
} catch(IOException e) {
- Assert.assertNotNull(e);
- Assert.assertNull(spnegoToken);
+ assertThat(e).isNotNull();
+ assertThat(spnegoToken).isNull();
}
}
@@ -159,13 +161,13 @@ public class TestSpnego {
SpnegoToken spnegoToken = null;
try {
spnegoToken = SpnegoToken.parse(null);
- Assert.fail("Should have thrown NullPointerException.");
+ fail("Should have thrown NullPointerException.");
} catch(IOException e) {
e.printStackTrace();
- Assert.fail(e.getMessage());
+ fail(e.getMessage());
} catch(NullPointerException e) {
- Assert.assertNotNull(e);
- Assert.assertNull(spnegoToken);
+ assertThat(e).isNotNull();
+ assertThat(spnegoToken).isNull();
}
}
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4a65c583/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/test/TestTgsRepCodec.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/test/TestTgsRepCodec.java b/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/test/TestTgsRepCodec.java
index 50cf0ab..57eaec0 100644
--- a/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/test/TestTgsRepCodec.java
+++ b/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/test/TestTgsRepCodec.java
@@ -24,11 +24,12 @@ import org.apache.kerby.kerberos.kerb.spec.common.NameType;
import org.apache.kerby.kerberos.kerb.spec.common.PrincipalName;
import org.apache.kerby.kerberos.kerb.spec.kdc.TgsRep;
import org.apache.kerby.kerberos.kerb.spec.ticket.Ticket;
-import org.junit.Assert;
import org.junit.Test;
import java.io.IOException;
+import static org.assertj.core.api.Assertions.assertThat;
+
/**
* Test TgsRep message using a real 'correct' network packet captured from MS-AD to detective programming errors
* and compatibility issues particularly regarding Kerberos crypto.
@@ -41,29 +42,27 @@ public class TestTgsRepCodec {
TgsRep tgsRep = new TgsRep();
tgsRep.decode(bytes);
- Assert.assertEquals(5, tgsRep.getPvno());
- Assert.assertEquals(KrbMessageType.TGS_REP, tgsRep.getMsgType());
- Assert.assertEquals("DENYDC.COM", tgsRep.getCrealm());
+ assertThat(tgsRep.getPvno()).isEqualTo(5);
+ assertThat(tgsRep.getMsgType()).isEqualTo(KrbMessageType.TGS_REP);
+ assertThat(tgsRep.getCrealm()).isEqualTo("DENYDC.COM");
PrincipalName cName = tgsRep.getCname();
- Assert.assertEquals(NameType.NT_PRINCIPAL, cName.getNameType());
- Assert.assertEquals(1, cName.getNameStrings().size());
- Assert.assertEquals("des", cName.getNameStrings().get(0));
+ assertThat(cName.getNameType()).isEqualTo(NameType.NT_PRINCIPAL);
+ assertThat(cName.getNameStrings()).hasSize(1).contains("des");
Ticket ticket = tgsRep.getTicket();
- Assert.assertEquals(5, ticket.getTktvno());
- Assert.assertEquals("DENYDC.COM", ticket.getRealm());
+ assertThat(ticket.getTktvno()).isEqualTo(5);
+ assertThat(ticket.getRealm()).isEqualTo("DENYDC.COM");
PrincipalName sName = ticket.getSname();
- Assert.assertEquals(NameType.NT_SRV_HST, sName.getNameType());
- Assert.assertEquals(2, sName.getNameStrings().size());
- Assert.assertEquals("host", sName.getNameStrings().get(0));
- Assert.assertEquals("xp1.denydc.com", sName.getNameStrings().get(1));
+ assertThat(sName.getNameType()).isEqualTo(NameType.NT_SRV_HST);
+ assertThat(sName.getNameStrings()).hasSize(2)
+ .contains("host", "xp1.denydc.com");
//FIXME
//EncTicketPart encTicketPart = ticket.getEncPart();
- //Assert.assertEquals(23, encTicketPart.getKey().getKeyType().getValue());
- //Assert.assertEquals(2, encTicketPart.getKey().getKvno());
+ //assertThat(encTicketPart.getKey().getKeyType().getValue()).isEqualTo(23);
+ //assertThat(encTicketPart.getKey().getKvno()).isEqualTo(2);
//EncKdcRepPart encKdcRepPart = tgsRep.getEncPart();
- //Assert.assertEquals(3, encKdcRepPart.getKey().getKeyType().getValue());
+ //assertThat(encKdcRepPart.getKey().getKeyType().getValue()).isEqualTo(3);
}
}
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4a65c583/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/test/TestTgsReqCodec.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/test/TestTgsReqCodec.java b/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/test/TestTgsReqCodec.java
index 02ee590..5334eb5 100644
--- a/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/test/TestTgsReqCodec.java
+++ b/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/test/TestTgsReqCodec.java
@@ -28,7 +28,6 @@ import org.apache.kerby.kerberos.kerb.spec.kdc.TgsReq;
import org.apache.kerby.kerberos.kerb.spec.pa.PaData;
import org.apache.kerby.kerberos.kerb.spec.pa.PaDataEntry;
import org.apache.kerby.kerberos.kerb.spec.pa.PaDataType;
-import org.junit.Assert;
import org.junit.Test;
import java.io.IOException;
@@ -38,6 +37,8 @@ import java.util.Date;
import java.util.List;
import java.util.SimpleTimeZone;
+import static org.assertj.core.api.Assertions.assertThat;
+
/**
* Test TgsReq message using a real 'correct' network packet captured from MS-AD to detective programming errors
* and compatibility issues particularly regarding Kerberos crypto.
@@ -50,43 +51,42 @@ public class TestTgsReqCodec {
TgsReq tgsReq = new TgsReq();
tgsReq.decode(bytes);
- Assert.assertEquals(5, tgsReq.getPvno());
- Assert.assertEquals(KrbMessageType.TGS_REQ, tgsReq.getMsgType());
+ assertThat(tgsReq.getPvno()).isEqualTo(5);
+ assertThat(tgsReq.getMsgType()).isEqualTo(KrbMessageType.TGS_REQ);
PaData paData = tgsReq.getPaData();
- Assert.assertEquals(1, paData.getElements().size());
+ assertThat(paData.getElements()).hasSize(1);
PaDataEntry entry = paData.getElements().iterator().next();
- Assert.assertEquals(PaDataType.TGS_REQ, entry.getPaDataType());
+ assertThat(entry.getPaDataType()).isEqualTo(PaDataType.TGS_REQ);
//request body
KdcReqBody body = tgsReq.getReqBody();
- Assert.assertEquals(0, body.getKdcOptions().getPadding());
+ assertThat(body.getKdcOptions().getPadding()).isEqualTo(0);
byte[] kdcOptionsValue = {64, (byte) 128, 0, 0};
- Assert.assertArrayEquals(kdcOptionsValue, body.getKdcOptions().getValue());
+ assertThat(body.getKdcOptions().getValue()).isEqualTo(kdcOptionsValue);
- Assert.assertEquals("DENYDC.COM", body.getRealm());
+ assertThat(body.getRealm()).isEqualTo("DENYDC.COM");
PrincipalName sName = body.getSname();
- Assert.assertEquals(NameType.NT_SRV_HST, sName.getNameType());
- Assert.assertEquals(2, sName.getNameStrings().size());
- Assert.assertEquals("host", sName.getNameStrings().get(0));
- Assert.assertEquals("xp1.denydc.com", sName.getNameStrings().get(1));
+ assertThat(sName.getNameType()).isEqualTo(NameType.NT_SRV_HST);
+ assertThat(sName.getNameStrings()).hasSize(2)
+ .contains("host", "xp1.denydc.com");
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
sdf.setTimeZone(new SimpleTimeZone(0, "Z"));
Date date = sdf.parse("20370913024805");
- Assert.assertEquals(date.getTime(), body.getTill().getTime());
+ assertThat(body.getTill().getTime()).isEqualTo(date.getTime());
- Assert.assertEquals(197296424, body.getNonce());
+ assertThat(body.getNonce()).isEqualTo(197296424);
List<EncryptionType> eTypes = body.getEtypes();
- Assert.assertEquals(7, eTypes.size());
- Assert.assertEquals(0x0017, eTypes.get(0).getValue());
- //Assert.assertEquals(-133, eTypes.get(1).getValue());//FIXME
- //Assert.assertEquals(-128, eTypes.get(2).getValue());//FIXME
- Assert.assertEquals(0x0003, eTypes.get(3).getValue());
- Assert.assertEquals(0x0001, eTypes.get(4).getValue());
- Assert.assertEquals(0x0018, eTypes.get(5).getValue());
- //Assert.assertEquals(-135, eTypes.get(6).getValue());//FIXME
+ assertThat(eTypes).hasSize(7);
+ assertThat(eTypes.get(0).getValue()).isEqualTo(0x0017);
+ //assertThat(eTypes.get(1).getValue()).isEqualTo(-133);//FIXME
+ //assertThat(eTypes.get(2).getValue()).isEqualTo(-128);//FIXME
+ assertThat(eTypes.get(3).getValue()).isEqualTo(0x0003);
+ assertThat(eTypes.get(4).getValue()).isEqualTo(0x0001);
+ assertThat(eTypes.get(5).getValue()).isEqualTo(0x0018);
+ //assertThat(eTypes.get(6).getValue()).isEqualTo(-135);//FIXME
}
}
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4a65c583/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/CamelliaEncTest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/CamelliaEncTest.java b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/CamelliaEncTest.java
index 3a7ffe9..a84652d 100644
--- a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/CamelliaEncTest.java
+++ b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/CamelliaEncTest.java
@@ -24,7 +24,6 @@ import org.apache.kerby.kerberos.kerb.crypto.enc.EncryptProvider;
import org.apache.kerby.kerberos.kerb.crypto.enc.provider.Camellia128Provider;
import org.apache.kerby.kerberos.kerb.crypto.enc.provider.Camellia256Provider;
import org.apache.kerby.util.HexUtil;
-import org.junit.Assert;
import org.junit.Test;
import java.io.BufferedReader;
@@ -35,6 +34,8 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import static org.assertj.core.api.Assertions.assertThat;
+
public class CamelliaEncTest {
private List<String> outputs = new ArrayList<String>();
@@ -69,8 +70,7 @@ public class CamelliaEncTest {
outputs.add("==========");
List<String> newLines = expectedLines;
- Assert.assertEquals("Comparing new lines with expected lines",
- expectedLines, outputs);
+ assertThat(expectedLines).as("Comparing new lines with expected lines").isEqualTo(outputs);
}
private void testWith(int keySize) throws KrbException {
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4a65c583/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/CheckSumsTest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/CheckSumsTest.java b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/CheckSumsTest.java
index 3b21e7a..796cc11 100644
--- a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/CheckSumsTest.java
+++ b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/CheckSumsTest.java
@@ -26,7 +26,7 @@ import org.apache.kerby.kerberos.kerb.spec.common.KeyUsage;
import org.apache.kerby.util.HexUtil;
import org.junit.Test;
-import static org.junit.Assert.fail;
+import static org.assertj.core.api.Assertions.fail;
/**
* These are to test the checksums of good answers, and the checksums
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4a65c583/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/CmacTest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/CmacTest.java b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/CmacTest.java
index 049b578..30af03f 100644
--- a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/CmacTest.java
+++ b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/CmacTest.java
@@ -23,9 +23,10 @@ import org.apache.kerby.kerberos.kerb.KrbException;
import org.apache.kerby.kerberos.kerb.crypto.enc.EncryptProvider;
import org.apache.kerby.kerberos.kerb.crypto.enc.provider.Camellia128Provider;
import org.apache.kerby.util.HexUtil;
-import org.junit.Assert;
import org.junit.Test;
+import static org.assertj.core.api.Assertions.assertThat;
+
public class CmacTest {
/* All examples use the following Camellia-128 key. */
@@ -68,18 +69,18 @@ public class CmacTest {
// test 1
result = Cmac.cmac(encProvider, key, input, 0, 0);
- Assert.assertArrayEquals("Test 1", HexUtil.hex2bytes(cmac1), result);
+ assertThat(result).as("Test 1").isEqualTo(HexUtil.hex2bytes(cmac1));
// test 2
result = Cmac.cmac(encProvider, key, input, 0, 16);
- Assert.assertArrayEquals("Test 2", HexUtil.hex2bytes(cmac2), result);
+ assertThat(result).as("Test 2").isEqualTo(HexUtil.hex2bytes(cmac2));
// test 3
result = Cmac.cmac(encProvider, key, input, 0, 40);
- Assert.assertArrayEquals("Test 3", HexUtil.hex2bytes(cmac3), result);
+ assertThat(result).as("Test 3").isEqualTo(HexUtil.hex2bytes(cmac3));
// test 4
result = Cmac.cmac(encProvider, key, input, 0, 64);
- Assert.assertArrayEquals("Test 4", HexUtil.hex2bytes(cmac4), result);
+ assertThat(result).as("Test 4").isEqualTo(HexUtil.hex2bytes(cmac4));
}
}
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4a65c583/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/Crc32Test.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/Crc32Test.java b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/Crc32Test.java
index 59879d7..e8de993 100644
--- a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/Crc32Test.java
+++ b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/Crc32Test.java
@@ -20,9 +20,10 @@
package org.apache.kerby.kerberos.kerb.crypto;
import org.apache.kerby.util.HexUtil;
-import org.junit.Assert;
import org.junit.Test;
+import static org.assertj.core.api.Assertions.assertThat;
+
public class Crc32Test {
static class TestCase {
@@ -108,7 +109,7 @@ public class Crc32Test {
}
}
- Assert.assertTrue(isOk);
+ assertThat(isOk).isTrue();
}
private boolean testWith(TestCase testCase) {
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4a65c583/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/DecryptionTest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/DecryptionTest.java b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/DecryptionTest.java
index 8d0c5ca..6f766ec 100644
--- a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/DecryptionTest.java
+++ b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/DecryptionTest.java
@@ -24,8 +24,9 @@ import org.apache.kerby.kerberos.kerb.spec.common.EncryptionType;
import org.apache.kerby.kerberos.kerb.spec.common.KeyUsage;
import org.apache.kerby.util.HexUtil;
import org.junit.Test;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
/**
* Decryption test with known ciphertexts.
@@ -73,14 +74,14 @@ public class DecryptionTest {
* Perform all the checks for a testcase
*/
private void performTestDecrypt(TestCase testCase) {
- //assertTrue(EncryptionHandler.isImplemented(testCase.encType));
+ //assertThat(EncryptionHandler.isImplemented(testCase.encType)).isTrue();
if (! EncryptionHandler.isImplemented(testCase.encType)) {
System.err.println("Not implemented yet: " + testCase.encType.getDisplayName());
return;
}
try {
- assertTrue(testDecrypt(testCase));
+ assertThat(testDecrypt(testCase)).isTrue();
} catch (Exception e) {
fail(e.getMessage());
}
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4a65c583/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/DesKeyMakerTest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/DesKeyMakerTest.java b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/DesKeyMakerTest.java
index 0c5f9c2..f117fcd 100644
--- a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/DesKeyMakerTest.java
+++ b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/DesKeyMakerTest.java
@@ -2,7 +2,8 @@ package org.apache.kerby.kerberos.kerb.crypto;
import org.apache.kerby.kerberos.kerb.crypto.key.DesKeyMaker;
import org.apache.kerby.util.HexUtil;
-import org.junit.Assert;
+
+import static org.assertj.core.api.Assertions.assertThat;
/**
* This is just for my experimental tweaking, so pleas bear it.
@@ -37,15 +38,15 @@ public class DesKeyMakerTest {
private void test(TestCase tc) {
byte[] expectedValue = HexUtil.hex2bytes(tc.passwdSaltBytes);
byte[] value = DesKeyMaker.makePasswdSalt(tc.passwd, tc.salt);
- Assert.assertArrayEquals("PasswdSalt bytes", expectedValue, value);
+ assertThat(value).as("PasswdSalt bytes").isEqualTo(expectedValue);
expectedValue = HexUtil.hex2bytes(tc.fanFoldedKey);
value = DesKeyMaker.fanFold(tc.passwd, tc.salt, null);
- Assert.assertArrayEquals("FanFold result", expectedValue, value);
+ assertThat(value).as("FanFold result").isEqualTo(expectedValue);
expectedValue = HexUtil.hex2bytes(tc.intermediateKey);
value = DesKeyMaker.intermediateKey(value);
- Assert.assertArrayEquals("IntermediateKey result", expectedValue, value);
+ assertThat(value).as("IntermediateKey result").isEqualTo(expectedValue);
// finalKey check ignored here and it's done in String2keyTest.
}
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4a65c583/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/KeyDeriveTest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/KeyDeriveTest.java b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/KeyDeriveTest.java
index eb04804..e2932b5 100644
--- a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/KeyDeriveTest.java
+++ b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/KeyDeriveTest.java
@@ -26,11 +26,12 @@ import org.apache.kerby.kerberos.kerb.crypto.key.Des3KeyMaker;
import org.apache.kerby.kerberos.kerb.crypto.key.DkKeyMaker;
import org.apache.kerby.kerberos.kerb.spec.common.EncryptionType;
import org.apache.kerby.util.HexUtil;
-import org.junit.Assert;
import org.junit.Test;
import java.util.Arrays;
+import static org.assertj.core.api.Assertions.fail;
+
/**
* Key derivation test with known values.
*/
@@ -205,7 +206,7 @@ public class KeyDeriveTest {
}
if (!overallResult) {
- Assert.fail();
+ fail(null);
}
}
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4a65c583/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/String2keyTest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/String2keyTest.java b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/String2keyTest.java
index 192a614..3fbe38f 100644
--- a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/String2keyTest.java
+++ b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/String2keyTest.java
@@ -27,8 +27,8 @@ import org.junit.Test;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
/**
* By ref. MIT krb5 t_str2key.c and RFC3961 test vectors
@@ -552,14 +552,14 @@ public class String2keyTest {
* Perform all the checks for a testcase
*/
private void performTest(TestCase testCase) {
- //assertTrue(EncryptionHandler.isImplemented(testCase.encType));
+ //assertThat(EncryptionHandler.isImplemented(testCase.encType)).isTrue();
if (! EncryptionHandler.isImplemented(testCase.encType)) {
System.err.println("Not implemented yet: " + testCase.encType.getDisplayName());
return;
}
try {
- assertTrue(testWith(testCase));
+ assertThat(testWith(testCase)).isTrue();
} catch (Exception e) {
fail(e.getMessage());
}
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4a65c583/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/KdcTest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/KdcTest.java b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/KdcTest.java
index 81c0b3a..f16fa08 100644
--- a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/KdcTest.java
+++ b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/KdcTest.java
@@ -21,9 +21,10 @@ package org.apache.kerby.kerberos.kerb.server;
import org.apache.kerby.kerberos.kerb.spec.ticket.ServiceTicket;
import org.apache.kerby.kerberos.kerb.spec.ticket.TgtTicket;
-import org.junit.Assert;
import org.junit.Test;
+import static org.assertj.core.api.Assertions.assertThat;
+
public class KdcTest extends KdcTestBase {
private String password = "123456";
@@ -37,13 +38,13 @@ public class KdcTest extends KdcTestBase {
@Test
public void testKdc() throws Exception {
kdcServer.start();
- Assert.assertTrue(kdcServer.isStarted());
+ assertThat(kdcServer.isStarted()).isTrue();
krbClnt.init();
TgtTicket tgt = krbClnt.requestTgtTicket(clientPrincipal, password, null);
- Assert.assertNotNull(tgt);
+ assertThat(tgt).isNotNull();
ServiceTicket tkt = krbClnt.requestServiceTicket(tgt, serverPrincipal, null);
- Assert.assertNotNull(tkt);
+ assertThat(tkt).isNotNull();
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4a65c583/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/WithCertKdcTest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/WithCertKdcTest.java b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/WithCertKdcTest.java
index cad84e1..cfac9d0 100644
--- a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/WithCertKdcTest.java
+++ b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/WithCertKdcTest.java
@@ -23,7 +23,6 @@ import org.apache.kerby.kerberos.kerb.KrbException;
import org.apache.kerby.kerberos.kerb.spec.ticket.ServiceTicket;
import org.apache.kerby.kerberos.kerb.spec.ticket.TgtTicket;
import org.apache.kerby.pki.Pkix;
-import org.junit.Assert;
import java.io.IOException;
import java.io.InputStream;
@@ -31,6 +30,8 @@ import java.security.GeneralSecurityException;
import java.security.PrivateKey;
import java.security.cert.Certificate;
+import static org.assertj.core.api.Assertions.assertThat;
+
/**
openssl genrsa -out cakey.pem 2048
openssl req -key cakey.pem -new -x509 -out cacert.pem -days 3650
@@ -60,23 +61,23 @@ public class WithCertKdcTest extends KdcTestBase {
//@Test
public void testKdc() throws Exception {
- Assert.assertNotNull(userCert);
+ assertThat(userCert).isNotNull();
kdcServer.start();
- Assert.assertTrue(kdcServer.isStarted());
+ assertThat(kdcServer.isStarted()).isTrue();
krbClnt.init();
TgtTicket tgt = null;
try {
tgt = krbClnt.requestTgtTicket(clientPrincipal, userCert, userKey, null);
} catch (KrbException te) {
- Assert.assertTrue(te.getMessage().contains("timeout"));
+ assertThat(te.getMessage().contains("timeout")).isTrue();
return;
}
- Assert.assertNull(tgt);
+ assertThat(tgt).isNull();
ServiceTicket tkt = krbClnt.requestServiceTicket(tgt, serverPrincipal, null);
- Assert.assertNull(tkt);
+ assertThat(tkt).isNull();
}
private void loadCredentials() throws IOException, GeneralSecurityException {
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4a65c583/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/WithTokenKdcTest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/WithTokenKdcTest.java b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/WithTokenKdcTest.java
index 805d0c7..b0b0489 100644
--- a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/WithTokenKdcTest.java
+++ b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/WithTokenKdcTest.java
@@ -23,7 +23,8 @@ import org.apache.kerby.kerberos.kerb.KrbException;
import org.apache.kerby.kerberos.kerb.spec.ticket.ServiceTicket;
import org.apache.kerby.kerberos.kerb.spec.ticket.TgtTicket;
import org.apache.kerby.token.KerbToken;
-import org.junit.Assert;
+
+import static org.assertj.core.api.Assertions.assertThat;
public class WithTokenKdcTest extends KdcTestBase {
@@ -38,19 +39,19 @@ public class WithTokenKdcTest extends KdcTestBase {
//@Test
public void testKdc() throws Exception {
kdcServer.start();
- Assert.assertTrue(kdcServer.isStarted());
+ assertThat(kdcServer.isStarted()).isTrue();
krbClnt.init();
TgtTicket tgt = null;
try {
tgt = krbClnt.requestTgtTicket(clientPrincipal, token, null);
} catch (KrbException te) {
- Assert.assertTrue(te.getMessage().contains("timeout"));
+ assertThat(te.getMessage().contains("timeout")).isTrue();
return;
}
- Assert.assertNull(tgt);
+ assertThat(tgt).isNull();
ServiceTicket tkt = krbClnt.requestServiceTicket(tgt, serverPrincipal, null);
- Assert.assertNull(tkt);
+ assertThat(tkt).isNull();
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4a65c583/kerby-kerb/kerb-server/src/test/java/org/apache/kerby/kerberos/kerb/server/TestKdcConfigLoad.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-server/src/test/java/org/apache/kerby/kerberos/kerb/server/TestKdcConfigLoad.java b/kerby-kerb/kerb-server/src/test/java/org/apache/kerby/kerberos/kerb/server/TestKdcConfigLoad.java
index ab3da52..7f00a3a 100644
--- a/kerby-kerb/kerb-server/src/test/java/org/apache/kerby/kerberos/kerb/server/TestKdcConfigLoad.java
+++ b/kerby-kerb/kerb-server/src/test/java/org/apache/kerby/kerberos/kerb/server/TestKdcConfigLoad.java
@@ -20,7 +20,6 @@
package org.apache.kerby.kerberos.kerb.server;
import org.apache.kerby.config.Conf;
-import org.junit.Assert;
import org.junit.Test;
import java.io.File;
@@ -28,6 +27,8 @@ import java.io.IOException;
import java.net.URISyntaxException;
import java.net.URL;
+import static org.assertj.core.api.Assertions.assertThat;
+
public class TestKdcConfigLoad {
@Test
@@ -39,21 +40,21 @@ public class TestKdcConfigLoad {
Conf conf = krbConfig.getConf();
conf.addIniConfig(confFile);
- Assert.assertEquals("FILE:/var/log/krb5libs.log", krbConfig.getDefaultLoggingLocation());
- Assert.assertEquals("FILE:/var/log/krb5kdc.log", krbConfig.getKdcLoggingLocation());
- Assert.assertEquals("FILE:/var/log/kadmind.log", krbConfig.getAdminLoggingLocation());
+ assertThat(krbConfig.getDefaultLoggingLocation()).isEqualTo("FILE:/var/log/krb5libs.log");
+ assertThat(krbConfig.getKdcLoggingLocation()).isEqualTo("FILE:/var/log/krb5kdc.log");
+ assertThat(krbConfig.getAdminLoggingLocation()).isEqualTo("FILE:/var/log/kadmind.log");
- Assert.assertEquals(88, krbConfig.getKdcUdpPort());
- Assert.assertEquals(8014, krbConfig.getKdcTcpPort());
- Assert.assertTrue(krbConfig.isRestrictAnonymousToTgt());
- Assert.assertEquals(4096, krbConfig.getKdcMaxDgramReplySize());
+ assertThat(krbConfig.getKdcUdpPort()).isEqualTo(88);
+ assertThat(krbConfig.getKdcTcpPort()).isEqualTo(8014);
+ assertThat(krbConfig.isRestrictAnonymousToTgt()).isTrue();
+ assertThat(krbConfig.getKdcMaxDgramReplySize()).isEqualTo(4096);
/* will be moved to LdapLdentityBackend module
String[] ldapContainerDn = krbConfig.getLdapKerberosContainerDn();
- Assert.assertEquals(3, ldapContainerDn.length);
- Assert.assertEquals("cn=krbcontainer", ldapContainerDn[0]);
- Assert.assertEquals("dc=mit", ldapContainerDn[1]);
- Assert.assertEquals("dc=edu", ldapContainerDn[2]);
+ assertThat(ldapContainerDn.length).isEqualTo(3);
+ assertThat(ldapContainerDn[0]).isEqualTo("cn=krbcontainer");
+ assertThat(ldapContainerDn[1]).isEqualTo("dc=mit");
+ assertThat(ldapContainerDn[2]).isEqualTo("dc=edu");
*/
}
}
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4a65c583/kerby-kerb/kerb-util/src/test/java/org/apache/kerby/kerberos/kerb/util/CcacheTest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-util/src/test/java/org/apache/kerby/kerberos/kerb/util/CcacheTest.java b/kerby-kerb/kerb-util/src/test/java/org/apache/kerby/kerberos/kerb/util/CcacheTest.java
index bd5a685..95c8059 100644
--- a/kerby-kerb/kerb-util/src/test/java/org/apache/kerby/kerberos/kerb/util/CcacheTest.java
+++ b/kerby-kerb/kerb-util/src/test/java/org/apache/kerby/kerberos/kerb/util/CcacheTest.java
@@ -21,13 +21,14 @@ package org.apache.kerby.kerberos.kerb.util;
import org.apache.kerby.kerberos.kerb.ccache.CredentialCache;
import org.apache.kerby.kerberos.kerb.spec.common.PrincipalName;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import java.io.IOException;
import java.io.InputStream;
+import static org.assertj.core.api.Assertions.assertThat;
+
/*
Default principal: drankye@SH.INTEL.COM
@@ -48,10 +49,10 @@ public class CcacheTest {
@Test
public void testCc() {
- Assert.assertNotNull(cc);
+ assertThat(cc).isNotNull();
PrincipalName princ = cc.getPrimaryPrincipal();
- Assert.assertNotNull(princ);
- Assert.assertTrue(princ.getName().equals("drankye@SH.INTEL.COM"));
+ assertThat(princ).isNotNull();
+ assertThat(princ.getName().equals("drankye@SH.INTEL.COM")).isTrue();
}
}
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4a65c583/kerby-kerb/kerb-util/src/test/java/org/apache/kerby/kerberos/kerb/util/EncryptionTest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-util/src/test/java/org/apache/kerby/kerberos/kerb/util/EncryptionTest.java b/kerby-kerb/kerb-util/src/test/java/org/apache/kerby/kerberos/kerb/util/EncryptionTest.java
index e632839..bbf7f93 100644
--- a/kerby-kerb/kerb-util/src/test/java/org/apache/kerby/kerberos/kerb/util/EncryptionTest.java
+++ b/kerby-kerb/kerb-util/src/test/java/org/apache/kerby/kerberos/kerb/util/EncryptionTest.java
@@ -27,7 +27,6 @@ import org.apache.kerby.kerberos.kerb.spec.common.*;
import org.apache.kerby.kerberos.kerb.spec.ticket.EncTicketPart;
import org.apache.kerby.kerberos.kerb.spec.ticket.Ticket;
import org.apache.kerby.kerberos.kerb.codec.KrbCodec;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -36,6 +35,8 @@ import java.io.InputStream;
import java.util.Arrays;
import java.util.List;
+import static org.assertj.core.api.Assertions.assertThat;
+
/*
The principal keys for krbtgt/SH.INTEL.COM@SH.INTEL.COM
@@ -112,10 +113,10 @@ public class EncryptionTest {
byte[] decrypted = EncryptionHandler.decrypt(
ticket.getEncryptedEncPart(), key, KeyUsage.KDC_REP_TICKET);
- Assert.assertNotNull(decrypted);
+ assertThat(decrypted).isNotNull();
EncTicketPart encPart = KrbCodec.decode(decrypted, EncTicketPart.class);
- Assert.assertNotNull(encPart);
+ assertThat(encPart).isNotNull();
ticket.setEncPart(encPart);
EncryptedData encrypted = EncryptionHandler.encrypt(
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4a65c583/kerby-kerb/kerb-util/src/test/java/org/apache/kerby/kerberos/kerb/util/KeysTest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-util/src/test/java/org/apache/kerby/kerberos/kerb/util/KeysTest.java b/kerby-kerb/kerb-util/src/test/java/org/apache/kerby/kerberos/kerb/util/KeysTest.java
index c32854f..52bd024 100644
--- a/kerby-kerb/kerb-util/src/test/java/org/apache/kerby/kerberos/kerb/util/KeysTest.java
+++ b/kerby-kerb/kerb-util/src/test/java/org/apache/kerby/kerberos/kerb/util/KeysTest.java
@@ -26,7 +26,6 @@ import org.apache.kerby.kerberos.kerb.KrbException;
import org.apache.kerby.kerberos.kerb.spec.common.EncryptionKey;
import org.apache.kerby.kerberos.kerb.spec.common.EncryptionType;
import org.apache.kerby.kerberos.kerb.spec.common.PrincipalName;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -34,6 +33,8 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.List;
+import static org.assertj.core.api.Assertions.fail;
+
/*
The principal was created with password '123456'
KVNO Principal
@@ -72,7 +73,7 @@ public class KeysTest {
genKey = EncryptionHandler.string2Key(principal.getName(),
TEST_PASSWORD, keyType);
if(! ke.getKey().equals(genKey)) {
- Assert.fail("str2key failed for key type: " + keyType.getName());
+ fail("str2key failed for key type: " + keyType.getName());
//System.err.println("str2key failed for key type: " + keyType.getName());
}
}
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4a65c583/kerby-kerb/kerb-util/src/test/java/org/apache/kerby/kerberos/kerb/util/KeytabTest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-util/src/test/java/org/apache/kerby/kerberos/kerb/util/KeytabTest.java b/kerby-kerb/kerb-util/src/test/java/org/apache/kerby/kerberos/kerb/util/KeytabTest.java
index 01cdaed..9c48c3b 100644
--- a/kerby-kerb/kerb-util/src/test/java/org/apache/kerby/kerberos/kerb/util/KeytabTest.java
+++ b/kerby-kerb/kerb-util/src/test/java/org/apache/kerby/kerberos/kerb/util/KeytabTest.java
@@ -22,7 +22,6 @@ package org.apache.kerby.kerberos.kerb.util;
import org.apache.kerby.kerberos.kerb.keytab.Keytab;
import org.apache.kerby.kerberos.kerb.keytab.KeytabEntry;
import org.apache.kerby.kerberos.kerb.spec.common.PrincipalName;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -30,6 +29,8 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.List;
+import static org.assertj.core.api.Assertions.assertThat;
+
/*
The principal was created with password '123456'
@@ -57,13 +58,13 @@ public class KeytabTest {
@Test
public void testKeytab() {
- Assert.assertNotNull(keytab);
+ assertThat(keytab).isNotNull();
List<PrincipalName> principals = keytab.getPrincipals();
PrincipalName principal = principals.get(0);
List<KeytabEntry> entries = keytab.getKeytabEntries(principal);
for (KeytabEntry ke : entries) {
- Assert.assertTrue(ke.getKvno() == 1);
+ assertThat(ke.getKvno() == 1).isTrue();
}
}
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4a65c583/kerby-kerb/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-kerb/pom.xml b/kerby-kerb/pom.xml
index 048736b..2ec1b40 100644
--- a/kerby-kerb/pom.xml
+++ b/kerby-kerb/pom.xml
@@ -44,5 +44,11 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <version>${assertj.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>