You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by dr...@apache.org on 2015/02/09 07:27:43 UTC

[02/30] directory-kerberos git commit: DIRKRB-154 Switching to AssertJ framework for unit tests in lib module

DIRKRB-154 Switching to AssertJ framework for unit tests in lib module


Project: http://git-wip-us.apache.org/repos/asf/directory-kerberos/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerberos/commit/7c8dc370
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerberos/tree/7c8dc370
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerberos/diff/7c8dc370

Branch: refs/heads/installation
Commit: 7c8dc370e5765165f53fcf44659fe9db6a977a91
Parents: 4a65c58
Author: hazel <li...@foxmail.com>
Authored: Fri Jan 30 10:46:12 2015 +0800
Committer: hazel <li...@foxmail.com>
Committed: Fri Jan 30 10:46:12 2015 +0800

----------------------------------------------------------------------
 .../java/org/apache/kerby/config/ConfTest.java  | 34 ++++++++++----------
 .../org/apache/kerby/config/ConfigImplTest.java | 19 +++++------
 .../org/apache/kerby/config/IniConfigTest.java  | 13 ++++----
 .../java/org/apache/kerby/event/TestBuffer.java |  7 ++--
 .../kerby/event/network/TestNetworkClient.java  |  7 ++--
 .../kerby/event/network/TestNetworkServer.java  |  7 ++--
 .../apache/kerby/event/tcp/TestTcpClient.java   |  5 +--
 .../apache/kerby/event/tcp/TestTcpServer.java   |  5 +--
 .../apache/kerby/event/udp/TestUdpClient.java   |  5 +--
 .../apache/kerby/event/udp/TestUdpServer.java   |  5 +--
 .../java/org/apache/kerby/pki/PkixTest.java     |  7 ++--
 lib/pom.xml                                     |  6 ++++
 12 files changed, 68 insertions(+), 52 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/7c8dc370/lib/kerby-config/src/test/java/org/apache/kerby/config/ConfTest.java
----------------------------------------------------------------------
diff --git a/lib/kerby-config/src/test/java/org/apache/kerby/config/ConfTest.java b/lib/kerby-config/src/test/java/org/apache/kerby/config/ConfTest.java
index 0d6c74a..185fe3f 100644
--- a/lib/kerby-config/src/test/java/org/apache/kerby/config/ConfTest.java
+++ b/lib/kerby-config/src/test/java/org/apache/kerby/config/ConfTest.java
@@ -19,13 +19,14 @@
  */
 package org.apache.kerby.config;
 
-import org.junit.Assert;
 import org.junit.Test;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 /**
  * The test is base on the Conf level.
  * We hope users use the Conf object only, and don't need to care about its internal implementation.
@@ -44,9 +45,9 @@ public class ConfTest {
 
         Conf conf = new Conf();
         conf.addMapConfig(mapConfig);
-        Assert.assertEquals(strProp, conf.getString("strProp"));
-        Assert.assertEquals(intProp, conf.getInt("intProp"));
-        Assert.assertEquals(boolProp, conf.getBoolean("boolProp"));
+        assertThat(conf.getString("strProp")).isEqualTo(strProp);
+        assertThat(conf.getInt("intProp")).isEqualTo(intProp);
+        assertThat(conf.getBoolean("boolProp")).isEqualTo(boolProp);
     }
 
     @Test
@@ -61,9 +62,9 @@ public class ConfTest {
 
         Conf conf = new Conf();
         conf.addPropertiesConfig(properties);
-        Assert.assertEquals(strProp, conf.getString("strProp"));
-        Assert.assertEquals(intProp, conf.getInt("intProp"));
-        Assert.assertEquals(boolProp, conf.getBoolean("boolProp"));
+        assertThat(conf.getString("strProp")).isEqualTo(strProp);
+        assertThat(conf.getInt("intProp")).isEqualTo(intProp);
+        assertThat(conf.getBoolean("boolProp")).isEqualTo(boolProp);
     }
 
     /**
@@ -86,11 +87,11 @@ public class ConfTest {
         Conf conf = new Conf();
         conf.addMapConfig(mapConfig);
         conf.addPropertiesConfig(properties);
-        Assert.assertNull(conf.getConfig("mapConfig"));
-        Assert.assertEquals(mapStrProp, conf.getString("mapStrProp"));
-        Assert.assertEquals(propertiesStrProp, conf.getString("propertiesStrProp"));
-        Assert.assertEquals(intProp, conf.getInt("intProp"));
-        Assert.assertEquals(boolProp, conf.getBoolean("boolProp"));
+        assertThat(conf.getConfig("mapConfig")).isNull();
+        assertThat(conf.getString("mapStrProp")).isEqualTo(mapStrProp);
+        assertThat(conf.getString("propertiesStrProp")).isEqualTo(propertiesStrProp);
+        assertThat(conf.getInt("intProp")).isEqualTo(intProp);
+        assertThat(conf.getBoolean("boolProp")).isEqualTo(boolProp);
     }
 
     static enum TestConfKey implements ConfigKey {
@@ -118,14 +119,13 @@ public class ConfTest {
     @Test
     public void testConfKey() {
         Conf conf = new Conf();
-        Assert.assertEquals(conf.getString(TestConfKey.ADDRESS),
-                TestConfKey.ADDRESS.getDefaultValue());
+        assertThat(conf.getString(TestConfKey.ADDRESS)).isEqualTo(TestConfKey.ADDRESS.getDefaultValue());
         Map<String, String> mapConfig = new HashMap<String, String>();
         String myAddress = "www.google.com";
         mapConfig.put(TestConfKey.ADDRESS.getPropertyKey(), myAddress);
         conf.addMapConfig(mapConfig);
-        Assert.assertEquals(myAddress, conf.getString(TestConfKey.ADDRESS));
-        Assert.assertEquals(TestConfKey.PORT.getDefaultValue(), conf.getInt(TestConfKey.PORT));
-        Assert.assertEquals(TestConfKey.ENABLE.getDefaultValue(), conf.getBoolean(TestConfKey.ENABLE));
+        assertThat(conf.getString(TestConfKey.ADDRESS)).isEqualTo(myAddress);
+        assertThat(conf.getInt(TestConfKey.PORT)).isEqualTo(TestConfKey.PORT.getDefaultValue());
+        assertThat(conf.getBoolean(TestConfKey.ENABLE)).isEqualTo(TestConfKey.ENABLE.getDefaultValue());
     }
 }

http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/7c8dc370/lib/kerby-config/src/test/java/org/apache/kerby/config/ConfigImplTest.java
----------------------------------------------------------------------
diff --git a/lib/kerby-config/src/test/java/org/apache/kerby/config/ConfigImplTest.java b/lib/kerby-config/src/test/java/org/apache/kerby/config/ConfigImplTest.java
index 2cfc3d5..d029d96 100644
--- a/lib/kerby-config/src/test/java/org/apache/kerby/config/ConfigImplTest.java
+++ b/lib/kerby-config/src/test/java/org/apache/kerby/config/ConfigImplTest.java
@@ -19,9 +19,10 @@
  */
 package org.apache.kerby.config;
 
-import org.junit.Assert;
 import org.junit.Test;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 /**
  * The test is on ConfigImpl level.
  * ConfigImpl is the internal implementation of Conf, only visual by developers.
@@ -46,17 +47,17 @@ public class ConfigImplTest {
         rootConfig.set("logging", sectionB);
         sectionB.set("kdc", "FILE:/var/log/krb5kdc.log");
 
-        Assert.assertEquals("true", rootConfig.getString("globalConfig"));
-        Assert.assertNull(rootConfig.getString("default_realm"));//section config should not get the global value
+        assertThat(rootConfig.getString("globalConfig")).isEqualTo("true");
+        assertThat(rootConfig.getString("default_realm")).isNull();//section config should not get the global value
 
         Config subA = rootConfig.getConfig("libdefaults");
-        Assert.assertEquals("EXAMPLE.COM", subA.getString("default_realm"));
-        Assert.assertNull(subA.getString("globalConfig"));
-        Assert.assertNull(subA.getString("kdc"));
+        assertThat(subA.getString("default_realm")).isEqualTo("EXAMPLE.COM");
+        assertThat(subA.getString("globalConfig")).isNull();
+        assertThat(subA.getString("kdc")).isNull();
 
         Config subB = rootConfig.getConfig("logging");
-        Assert.assertEquals("FILE:/var/log/krb5kdc.log", subB.getString("kdc"));
-        Assert.assertNull(subB.getString("globalConfig"));
-        Assert.assertNull(subB.getBoolean("forwardable"));
+        assertThat(subB.getString("kdc")).isEqualTo("FILE:/var/log/krb5kdc.log");
+        assertThat(subB.getString("globalConfig")).isNull();
+        assertThat(subB.getBoolean("forwardable")).isNull();
     }
 }

http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/7c8dc370/lib/kerby-config/src/test/java/org/apache/kerby/config/IniConfigTest.java
----------------------------------------------------------------------
diff --git a/lib/kerby-config/src/test/java/org/apache/kerby/config/IniConfigTest.java b/lib/kerby-config/src/test/java/org/apache/kerby/config/IniConfigTest.java
index a6a527e..3e0f04e 100644
--- a/lib/kerby-config/src/test/java/org/apache/kerby/config/IniConfigTest.java
+++ b/lib/kerby-config/src/test/java/org/apache/kerby/config/IniConfigTest.java
@@ -19,7 +19,6 @@
  */
 package org.apache.kerby.config;
 
-import org.junit.Assert;
 import org.junit.Test;
 
 import java.io.File;
@@ -27,6 +26,8 @@ import java.io.FileWriter;
 import java.io.IOException;
 import java.io.PrintWriter;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class IniConfigTest {
 
     private final static String TEST_DIR = new File(System.getProperty(
@@ -62,15 +63,15 @@ public class IniConfigTest {
         Conf conf = new Conf();
         conf.addIniConfig(TEST_FILE);
 
-        Assert.assertEquals("FILE:/var/log/krb5libs.log", conf.getString("default"));
-        Assert.assertNull(conf.getString("#note"));//Comments should be ignored when loading.
+        assertThat(conf.getString("default")).isEqualTo("FILE:/var/log/krb5libs.log");
+        assertThat(conf.getString("#note")).isNull();//Comments should be ignored when loading.
 
         Config config = conf.getConfig("libdefaults");
-        Assert.assertFalse(config.getBoolean("dns_lookup_realm"));
-        Assert.assertTrue(config.getBoolean("forwardable"));
+        assertThat(config.getBoolean("dns_lookup_realm")).isFalse();
+        assertThat(config.getBoolean("forwardable")).isTrue();
 
         Config config1 = conf.getConfig("lib1");
-        Assert.assertTrue(config1.getBoolean("dns_lookup_realm"));
+        assertThat(config1.getBoolean("dns_lookup_realm")).isTrue();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/7c8dc370/lib/kerby-event/src/test/java/org/apache/kerby/event/TestBuffer.java
----------------------------------------------------------------------
diff --git a/lib/kerby-event/src/test/java/org/apache/kerby/event/TestBuffer.java b/lib/kerby-event/src/test/java/org/apache/kerby/event/TestBuffer.java
index 704afa9..d7b0778 100644
--- a/lib/kerby-event/src/test/java/org/apache/kerby/event/TestBuffer.java
+++ b/lib/kerby-event/src/test/java/org/apache/kerby/event/TestBuffer.java
@@ -20,11 +20,12 @@
 package org.apache.kerby.event;
 
 import org.apache.kerby.transport.buffer.RecvBuffer;
-import org.junit.Assert;
 import org.junit.Test;
 
 import java.nio.ByteBuffer;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class TestBuffer {
 
     @Test
@@ -36,7 +37,7 @@ public class TestBuffer {
         RecvBuffer testBuffer = new RecvBuffer();
         testBuffer.write(testMessage);
         tmp = testBuffer.readMostBytes();
-        Assert.assertArrayEquals(testString.getBytes(), tmp.array());
+        assertThat(tmp.array()).isEqualTo(testString.getBytes());
 
         int nTimes = 10;
         testBuffer.clear();
@@ -45,6 +46,6 @@ public class TestBuffer {
         }
         int expectedBytes = nTimes * testMessage.limit();
         tmp = testBuffer.readMostBytes();
-        Assert.assertEquals(expectedBytes, tmp.limit());
+        assertThat(tmp.limit()).isEqualTo(expectedBytes);
     }
 }

http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/7c8dc370/lib/kerby-event/src/test/java/org/apache/kerby/event/network/TestNetworkClient.java
----------------------------------------------------------------------
diff --git a/lib/kerby-event/src/test/java/org/apache/kerby/event/network/TestNetworkClient.java b/lib/kerby-event/src/test/java/org/apache/kerby/event/network/TestNetworkClient.java
index 7074a81..10471eb 100644
--- a/lib/kerby-event/src/test/java/org/apache/kerby/event/network/TestNetworkClient.java
+++ b/lib/kerby-event/src/test/java/org/apache/kerby/event/network/TestNetworkClient.java
@@ -19,7 +19,6 @@
  */
 package org.apache.kerby.event.network;
 
-import junit.framework.Assert;
 import org.apache.kerby.event.Event;
 import org.apache.kerby.event.EventHandler;
 import org.apache.kerby.event.EventHub;
@@ -43,6 +42,8 @@ import java.nio.channels.*;
 import java.util.Iterator;
 import java.util.Set;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class TestNetworkClient extends TestNetworkBase {
 
     private EventHub eventHub;
@@ -196,13 +197,13 @@ public class TestNetworkClient extends TestNetworkBase {
         Transport transport = ((TransportEvent) event).getTransport();
         transport.sendMessage(ByteBuffer.wrap(TEST_MESSAGE.getBytes()));
         event = eventWaiter.waitEvent(TestEventType.FINISHED);
-        Assert.assertTrue((Boolean) event.getEventData());
+        assertThat((Boolean) event.getEventData()).isTrue();
 
         event = eventWaiter.waitEvent(TransportEventType.NEW_TRANSPORT);
         transport = ((TransportEvent) event).getTransport();
         transport.sendMessage(ByteBuffer.wrap(TEST_MESSAGE.getBytes()));
         event = eventWaiter.waitEvent(TestEventType.FINISHED);
-        Assert.assertTrue((Boolean) event.getEventData());
+        assertThat((Boolean) event.getEventData()).isTrue();
     }
 
     @After

http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/7c8dc370/lib/kerby-event/src/test/java/org/apache/kerby/event/network/TestNetworkServer.java
----------------------------------------------------------------------
diff --git a/lib/kerby-event/src/test/java/org/apache/kerby/event/network/TestNetworkServer.java b/lib/kerby-event/src/test/java/org/apache/kerby/event/network/TestNetworkServer.java
index eefc7a3..09a8f0e 100644
--- a/lib/kerby-event/src/test/java/org/apache/kerby/event/network/TestNetworkServer.java
+++ b/lib/kerby-event/src/test/java/org/apache/kerby/event/network/TestNetworkServer.java
@@ -19,7 +19,6 @@
  */
 package org.apache.kerby.event.network;
 
-import junit.framework.Assert;
 import org.apache.kerby.event.EventHandler;
 import org.apache.kerby.event.EventHub;
 import org.apache.kerby.transport.MessageHandler;
@@ -37,6 +36,8 @@ import java.nio.ByteBuffer;
 import java.nio.channels.DatagramChannel;
 import java.nio.channels.SocketChannel;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class TestNetworkServer extends TestNetworkBase {
 
     private EventHub eventHub;
@@ -86,7 +87,7 @@ public class TestNetworkServer extends TestNetworkBase {
         socketChannel.read(byteBuffer);
         byteBuffer.flip();
         clientRecvedMessage = recvBuffer2String(byteBuffer);
-        Assert.assertEquals(TEST_MESSAGE, clientRecvedMessage);
+        assertThat(clientRecvedMessage).isEqualTo(TEST_MESSAGE);
     }
 
     private void testUdpTransport() throws IOException, InterruptedException {
@@ -100,7 +101,7 @@ public class TestNetworkServer extends TestNetworkBase {
         socketChannel.receive(byteBuffer);
         byteBuffer.flip();
         clientRecvedMessage = recvBuffer2String(byteBuffer);
-        Assert.assertEquals(TEST_MESSAGE, clientRecvedMessage);
+        assertThat(clientRecvedMessage).isEqualTo(TEST_MESSAGE);
     }
 
     @After

http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/7c8dc370/lib/kerby-event/src/test/java/org/apache/kerby/event/tcp/TestTcpClient.java
----------------------------------------------------------------------
diff --git a/lib/kerby-event/src/test/java/org/apache/kerby/event/tcp/TestTcpClient.java b/lib/kerby-event/src/test/java/org/apache/kerby/event/tcp/TestTcpClient.java
index b0bd3ff..5f03c99 100644
--- a/lib/kerby-event/src/test/java/org/apache/kerby/event/tcp/TestTcpClient.java
+++ b/lib/kerby-event/src/test/java/org/apache/kerby/event/tcp/TestTcpClient.java
@@ -19,7 +19,6 @@
  */
 package org.apache.kerby.event.tcp;
 
-import junit.framework.Assert;
 import org.apache.kerby.event.Event;
 import org.apache.kerby.event.EventHandler;
 import org.apache.kerby.event.EventHub;
@@ -46,6 +45,8 @@ import java.nio.channels.SocketChannel;
 import java.util.Iterator;
 import java.util.Set;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class TestTcpClient extends TestTcpBase {
 
     private EventHub eventHub;
@@ -150,7 +151,7 @@ public class TestTcpClient extends TestTcpBase {
         transport.sendMessage(ByteBuffer.wrap(TEST_MESSAGE.getBytes()));
 
         event = eventWaiter.waitEvent(TestEventType.FINISHED);
-        Assert.assertTrue((Boolean) event.getEventData());
+        assertThat((Boolean) event.getEventData()).isTrue();
     }
 
     @After

http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/7c8dc370/lib/kerby-event/src/test/java/org/apache/kerby/event/tcp/TestTcpServer.java
----------------------------------------------------------------------
diff --git a/lib/kerby-event/src/test/java/org/apache/kerby/event/tcp/TestTcpServer.java b/lib/kerby-event/src/test/java/org/apache/kerby/event/tcp/TestTcpServer.java
index 43ebe20..3fe791a 100644
--- a/lib/kerby-event/src/test/java/org/apache/kerby/event/tcp/TestTcpServer.java
+++ b/lib/kerby-event/src/test/java/org/apache/kerby/event/tcp/TestTcpServer.java
@@ -19,7 +19,6 @@
  */
 package org.apache.kerby.event.tcp;
 
-import junit.framework.Assert;
 import org.apache.kerby.event.EventHandler;
 import org.apache.kerby.event.EventHub;
 import org.apache.kerby.transport.Acceptor;
@@ -37,6 +36,8 @@ import java.net.SocketAddress;
 import java.nio.ByteBuffer;
 import java.nio.channels.SocketChannel;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class TestTcpServer extends TestTcpBase {
 
     private EventHub eventHub;
@@ -80,7 +81,7 @@ public class TestTcpServer extends TestTcpBase {
         byteBuffer.flip();
         clientRecvedMessage = recvBuffer2String(byteBuffer);
 
-        Assert.assertEquals(TEST_MESSAGE, clientRecvedMessage);
+        assertThat(clientRecvedMessage).isEqualTo(TEST_MESSAGE);
     }
 
     @After

http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/7c8dc370/lib/kerby-event/src/test/java/org/apache/kerby/event/udp/TestUdpClient.java
----------------------------------------------------------------------
diff --git a/lib/kerby-event/src/test/java/org/apache/kerby/event/udp/TestUdpClient.java b/lib/kerby-event/src/test/java/org/apache/kerby/event/udp/TestUdpClient.java
index f460b60..8c0cd30 100644
--- a/lib/kerby-event/src/test/java/org/apache/kerby/event/udp/TestUdpClient.java
+++ b/lib/kerby-event/src/test/java/org/apache/kerby/event/udp/TestUdpClient.java
@@ -19,7 +19,6 @@
  */
 package org.apache.kerby.event.udp;
 
-import junit.framework.Assert;
 import org.apache.kerby.event.Event;
 import org.apache.kerby.event.EventHandler;
 import org.apache.kerby.event.EventHub;
@@ -45,6 +44,8 @@ import java.nio.channels.Selector;
 import java.util.Iterator;
 import java.util.Set;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class TestUdpClient extends TestUdpBase {
 
     private EventHub eventHub;
@@ -139,7 +140,7 @@ public class TestUdpClient extends TestUdpBase {
         transport.sendMessage(ByteBuffer.wrap(TEST_MESSAGE.getBytes()));
 
         event = eventWaiter.waitEvent(TestEventType.FINISHED);
-        Assert.assertTrue((Boolean) event.getEventData());
+        assertThat((Boolean) event.getEventData()).isTrue();
     }
 
     @After

http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/7c8dc370/lib/kerby-event/src/test/java/org/apache/kerby/event/udp/TestUdpServer.java
----------------------------------------------------------------------
diff --git a/lib/kerby-event/src/test/java/org/apache/kerby/event/udp/TestUdpServer.java b/lib/kerby-event/src/test/java/org/apache/kerby/event/udp/TestUdpServer.java
index 1402d9e..188e6de 100644
--- a/lib/kerby-event/src/test/java/org/apache/kerby/event/udp/TestUdpServer.java
+++ b/lib/kerby-event/src/test/java/org/apache/kerby/event/udp/TestUdpServer.java
@@ -19,7 +19,6 @@
  */
 package org.apache.kerby.event.udp;
 
-import junit.framework.Assert;
 import org.apache.kerby.event.EventHandler;
 import org.apache.kerby.event.EventHub;
 import org.apache.kerby.transport.Acceptor;
@@ -37,6 +36,8 @@ import java.net.SocketAddress;
 import java.nio.ByteBuffer;
 import java.nio.channels.DatagramChannel;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class TestUdpServer extends TestUdpBase {
 
     private EventHub eventHub;
@@ -79,7 +80,7 @@ public class TestUdpServer extends TestUdpBase {
         byteBuffer.flip();
         clientRecvedMessage = recvBuffer2String(byteBuffer);
 
-        Assert.assertEquals(TEST_MESSAGE, clientRecvedMessage);
+        assertThat(clientRecvedMessage).isEqualTo(TEST_MESSAGE);
     }
 
     @After

http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/7c8dc370/lib/kerby-pkix/src/test/java/org/apache/kerby/pki/PkixTest.java
----------------------------------------------------------------------
diff --git a/lib/kerby-pkix/src/test/java/org/apache/kerby/pki/PkixTest.java b/lib/kerby-pkix/src/test/java/org/apache/kerby/pki/PkixTest.java
index f827247..2b44e1c 100644
--- a/lib/kerby-pkix/src/test/java/org/apache/kerby/pki/PkixTest.java
+++ b/lib/kerby-pkix/src/test/java/org/apache/kerby/pki/PkixTest.java
@@ -19,7 +19,6 @@
  */
 package org.apache.kerby.pki;
 
-import org.junit.Assert;
 import org.junit.Test;
 
 import java.io.IOException;
@@ -30,6 +29,8 @@ import java.security.cert.Certificate;
 import java.security.cert.CertificateException;
 import java.util.List;
 
+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
@@ -47,7 +48,7 @@ public class PkixTest {
         List<Certificate> certs = Pkix.getCerts(res);
         Certificate userCert = certs.iterator().next();
 
-        Assert.assertNotNull(userCert);
+        assertThat(userCert).isNotNull();
     }
 
     @Test
@@ -55,6 +56,6 @@ public class PkixTest {
         InputStream res = getClass().getResourceAsStream("/userkey.pem");
         PrivateKey key = Pkix.getPrivateKey(res, null);
 
-        Assert.assertNotNull(key);
+        assertThat(key).isNotNull();
     }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/7c8dc370/lib/pom.xml
----------------------------------------------------------------------
diff --git a/lib/pom.xml b/lib/pom.xml
index 149d45e..8a1cd49 100644
--- a/lib/pom.xml
+++ b/lib/pom.xml
@@ -40,6 +40,12 @@
       <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>