diff --git a/zanata-war/pom.xml b/zanata-war/pom.xml
index bb37ef3580..c078a9f6ea 100644
--- a/zanata-war/pom.xml
+++ b/zanata-war/pom.xml
@@ -2085,12 +2085,6 @@
mockito-core
-
- org.testng
- testng
-
-
-
org.codehaus.groovy
groovy-all
diff --git a/zanata-war/src/test/java/org/zanata/action/validator/DuplicateEmailValidatorTest.java b/zanata-war/src/test/java/org/zanata/action/validator/DuplicateEmailValidatorTest.java
index 3872f5621e..7cf490f6fa 100644
--- a/zanata-war/src/test/java/org/zanata/action/validator/DuplicateEmailValidatorTest.java
+++ b/zanata-war/src/test/java/org/zanata/action/validator/DuplicateEmailValidatorTest.java
@@ -12,7 +12,6 @@
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.when;
-import static org.testng.Assert.*;
public class DuplicateEmailValidatorTest {
private DuplicateEmailValidator validator;
diff --git a/zanata-war/src/test/java/org/zanata/action/validator/EmailListValidatorTest.java b/zanata-war/src/test/java/org/zanata/action/validator/EmailListValidatorTest.java
index b004fb5d1b..f9244bd46c 100644
--- a/zanata-war/src/test/java/org/zanata/action/validator/EmailListValidatorTest.java
+++ b/zanata-war/src/test/java/org/zanata/action/validator/EmailListValidatorTest.java
@@ -7,7 +7,6 @@
import javax.validation.ConstraintValidatorContext;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.testng.Assert.*;
public class EmailListValidatorTest {
@@ -22,38 +21,40 @@ public void create() {
@Test
public void nullIsValid() throws Exception {
- assertTrue(validator.isValid(null, context));
+ assertThat(validator.isValid(null, context)).isTrue();
}
@Test
public void emptyIsValid() throws Exception {
- assertTrue(validator.isValid("", context));
+ assertThat(validator.isValid("", context)).isTrue();
}
@Test
public void aIsValid() throws Exception {
- assertTrue(validator.isValid(" a@example.com ", context));
+ assertThat(validator.isValid(" a@example.com ", context)).isTrue();
}
@Test
public void aBIsValid() throws Exception {
- assertTrue(validator.isValid("a@example.com, b@example.org", context));
+ assertThat(validator.isValid("a@example.com, b@example.org", context))
+ .isTrue();
}
@Test
public void CIsInvalid() throws Exception {
- assertFalse(validator.isValid("c", context));
+ assertThat(validator.isValid("c", context)).isFalse();
}
@Test
public void DIsValid() throws Exception {
- assertTrue(validator.isValid("d@example", context));
+ assertThat(validator.isValid("d@example", context)).isTrue();
}
@Test
public void aBCDIsValid() throws Exception {
- assertFalse(validator
- .isValid("a@example.com, b@example.org c d@example", context));
+ assertThat(validator
+ .isValid("a@example.com, b@example.org c d@example", context))
+ .isFalse();
}
@Test
diff --git a/zanata-war/src/test/java/org/zanata/database/WrappedConnectionProviderTest.java b/zanata-war/src/test/java/org/zanata/database/WrappedConnectionProviderTest.java
index b5853652c1..0adb7c959e 100644
--- a/zanata-war/src/test/java/org/zanata/database/WrappedConnectionProviderTest.java
+++ b/zanata-war/src/test/java/org/zanata/database/WrappedConnectionProviderTest.java
@@ -6,6 +6,7 @@
import lombok.Cleanup;
+import org.assertj.core.api.Fail;
import org.dbunit.operation.DatabaseOperation;
import org.hibernate.JDBCException;
import org.hibernate.Query;
@@ -15,7 +16,6 @@
import org.hibernate.jdbc.Work;
import org.junit.Before;
import org.junit.Test;
-import org.testng.Assert;
import org.zanata.ZanataDbunitJpaTest;
public class WrappedConnectionProviderTest extends ZanataDbunitJpaTest {
@@ -88,7 +88,8 @@ public void testWrapperWithNestedResults() throws Exception {
}
private void concurrentResultSetNotDetected() {
- Assert.fail("Failed to detect concurrent ResultSet - is Wrapped*ConnectionProvider enabled in persistence.xml?");
+ Fail.fail("Failed to detect concurrent ResultSet - is " +
+ "Wrapped*ConnectionProvider enabled in persistence.xml?");
}
private void checkExceptionType(JDBCException e) {
diff --git a/zanata-war/src/test/java/org/zanata/notification/DeadLetterQueueReceiverTest.java b/zanata-war/src/test/java/org/zanata/notification/DeadLetterQueueReceiverTest.java
index a79192b8d3..d5ee812973 100644
--- a/zanata-war/src/test/java/org/zanata/notification/DeadLetterQueueReceiverTest.java
+++ b/zanata-war/src/test/java/org/zanata/notification/DeadLetterQueueReceiverTest.java
@@ -9,7 +9,6 @@
import org.zanata.util.EmptyEnumeration;
import static org.mockito.Mockito.when;
-import static org.testng.Assert.*;
public class DeadLetterQueueReceiverTest {
private DeadLetterQueueReceiver receiver;
diff --git a/zanata-war/src/test/java/org/zanata/notification/NotificationManagerTest.java b/zanata-war/src/test/java/org/zanata/notification/NotificationManagerTest.java
index e6cfbd65ac..149ec30729 100644
--- a/zanata-war/src/test/java/org/zanata/notification/NotificationManagerTest.java
+++ b/zanata-war/src/test/java/org/zanata/notification/NotificationManagerTest.java
@@ -14,7 +14,6 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import static org.testng.Assert.*;
public class NotificationManagerTest {
private NotificationManager manager;
diff --git a/zanata-war/src/test/java/org/zanata/rest/editor/dto/LocaleTest.java b/zanata-war/src/test/java/org/zanata/rest/editor/dto/LocaleTest.java
index 3eb128ae98..d7463be512 100644
--- a/zanata-war/src/test/java/org/zanata/rest/editor/dto/LocaleTest.java
+++ b/zanata-war/src/test/java/org/zanata/rest/editor/dto/LocaleTest.java
@@ -6,7 +6,7 @@
import org.junit.Test;
import org.zanata.common.LocaleId;
-import static org.testng.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Alex Eng aeng@redhat.com
@@ -22,6 +22,6 @@ public void testJsonOutput() throws IOException {
Locale locale = om.readValue(json, Locale.class);
Locale expected = new Locale(LocaleId.DE, "German");
- assertEquals(locale, expected);
+ assertThat(locale).isEqualTo(expected);
}
}
diff --git a/zanata-war/src/test/java/org/zanata/rest/editor/dto/TransUnitStatusTest.java b/zanata-war/src/test/java/org/zanata/rest/editor/dto/TransUnitStatusTest.java
index adf231659c..cc8b284030 100644
--- a/zanata-war/src/test/java/org/zanata/rest/editor/dto/TransUnitStatusTest.java
+++ b/zanata-war/src/test/java/org/zanata/rest/editor/dto/TransUnitStatusTest.java
@@ -1,13 +1,13 @@
package org.zanata.rest.editor.dto;
-import static org.testng.Assert.assertEquals;
-
import java.io.IOException;
import org.codehaus.jackson.map.ObjectMapper;
import org.junit.Test;
import org.zanata.common.ContentState;
+import static org.assertj.core.api.Assertions.assertThat;
+
/**
* @author Alex Eng aeng@redhat.com
*/
@@ -27,6 +27,6 @@ public void testJsonOutput() throws IOException {
TransUnitStatus expected = new TransUnitStatus(100L, "rest id",
ContentState.NeedReview);
- assertEquals(status, expected);
+ assertThat(status).isEqualTo(expected);
}
}
diff --git a/zanata-war/src/test/java/org/zanata/rest/editor/dto/TransUnitTest.java b/zanata-war/src/test/java/org/zanata/rest/editor/dto/TransUnitTest.java
index e5db7ae4c8..f5220058da 100644
--- a/zanata-war/src/test/java/org/zanata/rest/editor/dto/TransUnitTest.java
+++ b/zanata-war/src/test/java/org/zanata/rest/editor/dto/TransUnitTest.java
@@ -1,13 +1,10 @@
package org.zanata.rest.editor.dto;
-import static org.testng.Assert.assertEquals;
-
-import java.io.IOException;
-
-import org.codehaus.jackson.map.ObjectMapper;
import org.junit.Test;
import org.zanata.rest.dto.resource.TextFlowTarget;
+import static org.assertj.core.api.Assertions.assertThat;
+
/**
* @author Alex Eng aeng@redhat.com
*/
@@ -23,7 +20,7 @@ public void testPutInvalidSource() {
public void testPutValidSource() {
TransUnit tu = new TransUnit();
tu.put(TransUnit.SOURCE, new EditorTextFlow());
- assertEquals(tu.size(), 1);
+ assertThat(tu.size()).isEqualTo(1);
}
@Test(expected = ClassCastException.class)
@@ -36,6 +33,6 @@ public void testPutInvalidTarget() {
public void testPutValidTarget() {
TransUnit tu = new TransUnit();
tu.put("fr", new TextFlowTarget());
- assertEquals(tu.size(), 1);
+ assertThat(tu.size()).isEqualTo(1);
}
}
diff --git a/zanata-war/src/test/java/org/zanata/rest/editor/dto/TranslationDataTest.java b/zanata-war/src/test/java/org/zanata/rest/editor/dto/TranslationDataTest.java
index a1e5c6e71c..2e30a65188 100644
--- a/zanata-war/src/test/java/org/zanata/rest/editor/dto/TranslationDataTest.java
+++ b/zanata-war/src/test/java/org/zanata/rest/editor/dto/TranslationDataTest.java
@@ -3,11 +3,10 @@
import org.codehaus.jackson.map.ObjectMapper;
import org.junit.Test;
import org.zanata.common.ContentState;
-import org.zanata.common.LocaleId;
import java.io.IOException;
-import static org.testng.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Alex Eng aeng@redhat.com
@@ -31,7 +30,7 @@ public void testJsonOutput() throws IOException {
expected.setPlural(false);
expected.setStatus(ContentState.NeedReview);
- assertEquals(translationData, expected);
+ assertThat(translationData).isEqualTo(expected);
}
}
diff --git a/zanata-war/src/test/java/org/zanata/rest/editor/dto/UserTest.java b/zanata-war/src/test/java/org/zanata/rest/editor/dto/UserTest.java
index 508d9ea4f6..383dad940f 100644
--- a/zanata-war/src/test/java/org/zanata/rest/editor/dto/UserTest.java
+++ b/zanata-war/src/test/java/org/zanata/rest/editor/dto/UserTest.java
@@ -1,12 +1,11 @@
package org.zanata.rest.editor.dto;
-import static org.testng.Assert.assertEquals;
-
import java.io.IOException;
import org.codehaus.jackson.map.ObjectMapper;
import org.junit.Test;
-import org.zanata.common.LocaleId;
+
+import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Alex Eng aeng@redhat.com
@@ -26,6 +25,6 @@ public void testJsonOutput() throws IOException {
User expected = new User("_username", "test@example.com", "testUser", "hash");
- assertEquals(user, expected);
+ assertThat(user).isEqualTo(expected);
}
}
diff --git a/zanata-war/src/test/java/org/zanata/rest/editor/service/ProjectServiceTest.java b/zanata-war/src/test/java/org/zanata/rest/editor/service/ProjectServiceTest.java
index 31fd82b3e0..3368f22343 100644
--- a/zanata-war/src/test/java/org/zanata/rest/editor/service/ProjectServiceTest.java
+++ b/zanata-war/src/test/java/org/zanata/rest/editor/service/ProjectServiceTest.java
@@ -16,7 +16,6 @@
import org.zanata.rest.service.ETagUtils;
import static org.mockito.Mockito.when;
-import static org.testng.Assert.*;
public class ProjectServiceTest {
private ProjectService service;
diff --git a/zanata-war/src/test/java/org/zanata/rest/editor/service/ProjectVersionServiceTest.java b/zanata-war/src/test/java/org/zanata/rest/editor/service/ProjectVersionServiceTest.java
index 20a19aba1d..3db70aa331 100644
--- a/zanata-war/src/test/java/org/zanata/rest/editor/service/ProjectVersionServiceTest.java
+++ b/zanata-war/src/test/java/org/zanata/rest/editor/service/ProjectVersionServiceTest.java
@@ -6,9 +6,7 @@
import javax.ws.rs.core.Request;
import javax.ws.rs.core.Response;
-import org.assertj.core.api.Assertions;
import org.assertj.core.util.Lists;
-import org.hibernate.transform.ResultTransformer;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mock;
@@ -25,7 +23,6 @@
import org.zanata.model.HProjectIteration;
import org.zanata.rest.NoSuchEntityException;
import org.zanata.rest.ReadOnlyEntityException;
-import org.zanata.rest.dto.Project;
import org.zanata.rest.dto.ProjectIteration;
import org.zanata.rest.dto.resource.ResourceMeta;
import org.zanata.rest.editor.dto.Locale;
@@ -45,7 +42,6 @@
import static org.mockito.Matchers.isNull;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import static org.testng.Assert.*;
public class ProjectVersionServiceTest {
private ProjectVersionService service;
diff --git a/zanata-war/src/test/java/org/zanata/rest/editor/service/StatisticsServiceTest.java b/zanata-war/src/test/java/org/zanata/rest/editor/service/StatisticsServiceTest.java
index 42434fbab5..8a9f671aab 100644
--- a/zanata-war/src/test/java/org/zanata/rest/editor/service/StatisticsServiceTest.java
+++ b/zanata-war/src/test/java/org/zanata/rest/editor/service/StatisticsServiceTest.java
@@ -17,7 +17,6 @@
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.when;
-import static org.testng.Assert.*;
public class StatisticsServiceTest {
private StatisticsService service;
diff --git a/zanata-war/src/test/java/org/zanata/rest/editor/service/TextFlowServiceTest.java b/zanata-war/src/test/java/org/zanata/rest/editor/service/TextFlowServiceTest.java
index 04e531f01c..f30e6ffdb4 100644
--- a/zanata-war/src/test/java/org/zanata/rest/editor/service/TextFlowServiceTest.java
+++ b/zanata-war/src/test/java/org/zanata/rest/editor/service/TextFlowServiceTest.java
@@ -2,8 +2,6 @@
import javax.ws.rs.core.Response;
-import org.assertj.core.api.Assertions;
-import org.assertj.core.util.Lists;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mock;
@@ -12,14 +10,12 @@
import org.zanata.common.LocaleId;
import org.zanata.dao.TextFlowDAO;
import org.zanata.model.HLocale;
-import org.zanata.model.TestFixture;
import org.zanata.rest.editor.dto.TransUnits;
import org.zanata.rest.service.ResourceUtils;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.util.Lists.newArrayList;
import static org.mockito.Mockito.when;
-import static org.testng.Assert.*;
import static org.zanata.model.TestFixture.makeHTextFlow;
import static org.zanata.model.TestFixture.makeTransUnit;
diff --git a/zanata-war/src/test/java/org/zanata/rest/service/PoUtilityTest.java b/zanata-war/src/test/java/org/zanata/rest/service/PoUtilityTest.java
index f7c97781dc..6a9aa34042 100644
--- a/zanata-war/src/test/java/org/zanata/rest/service/PoUtilityTest.java
+++ b/zanata-war/src/test/java/org/zanata/rest/service/PoUtilityTest.java
@@ -1,13 +1,13 @@
package org.zanata.rest.service;
-import static org.testng.Assert.assertEquals;
-
import java.util.ArrayList;
import java.util.Arrays;
import org.fedorahosted.openprops.Properties;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
public class PoUtilityTest {
String lineSep = System.getProperty("line.separator");
diff --git a/zanata-war/src/test/java/org/zanata/search/LevenshteinTokenUtilTest.java b/zanata-war/src/test/java/org/zanata/search/LevenshteinTokenUtilTest.java
index 434862fc40..4cf0b02ead 100644
--- a/zanata-war/src/test/java/org/zanata/search/LevenshteinTokenUtilTest.java
+++ b/zanata-war/src/test/java/org/zanata/search/LevenshteinTokenUtilTest.java
@@ -24,8 +24,12 @@
import java.util.Arrays;
import java.util.List;
+import org.assertj.core.data.Offset;
import org.junit.Test;
-import org.testng.Assert;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.data.Offset.offset;
+import static org.junit.Assert.assertTrue;
/**
* @author Sean Flanigan DELTA = offset(0.0001);
@Test
public void testVarious() {
@@ -43,17 +47,17 @@ public void testVarious() {
String s4 = "dbnoicgjnedbitnhjudbioe";
double similarity = LevenshteinTokenUtil.getSimilarity(s1, s1);
- Assert.assertTrue(similarity > 0.999f);
+ assertTrue(similarity > 0.999f);
similarity = LevenshteinTokenUtil.getSimilarity(s1, s2);
- Assert.assertTrue(similarity > 0.3f);
- Assert.assertTrue(similarity < 0.4f);
+ assertTrue(similarity > 0.3f);
+ assertTrue(similarity < 0.4f);
similarity = LevenshteinTokenUtil.getSimilarity(s1, s3);
- Assert.assertEquals(similarity, 0.5, DELTA);
+ assertThat(similarity).isEqualTo(0.5, DELTA);
similarity = LevenshteinTokenUtil.getSimilarity(s1, s4);
- Assert.assertEquals(similarity, 0.0, DELTA);
+ assertThat(similarity).isEqualTo(0.0, DELTA);
}
@Test
@@ -64,8 +68,8 @@ public void testPoint96Similarity() {
"1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890";
double similarity = LevenshteinTokenUtil.getSimilarity(s1, s2);
- Assert.assertTrue(similarity > 0.95f);
- Assert.assertTrue(similarity < 1.0f);
+ assertTrue(similarity > 0.95f);
+ assertTrue(similarity < 1.0f);
}
@Test
@@ -74,7 +78,7 @@ public void testDifferentSizedLists() {
List strings2 = Arrays.asList("1234567890abcdefghij");
double similarity =
LevenshteinTokenUtil.getSimilarity(strings1, strings2);
- Assert.assertEquals(similarity, 0.0, DELTA);
+ assertThat(similarity).isEqualTo(0.0, DELTA);
}
@Test
@@ -84,8 +88,8 @@ public void testSimilarLists() {
List strings2 = Arrays.asList("123 456 78 9", "bc_ def ghi j");
double similarity =
LevenshteinTokenUtil.getSimilarity(strings1, strings2);
- Assert.assertTrue(similarity > 0.7);
- Assert.assertTrue(similarity < 0.8);
+ assertTrue(similarity > 0.7);
+ assertTrue(similarity < 0.8);
}
@Test
@@ -94,7 +98,7 @@ public void testMisorderedLists() {
List strings2 = Arrays.asList("abcdefghij", "1234567890");
double similarity =
LevenshteinTokenUtil.getSimilarity(strings1, strings2);
- Assert.assertEquals(similarity, 0.0, DELTA);
+ assertThat(similarity).isEqualTo(0.0, DELTA);
}
@Test
@@ -103,7 +107,7 @@ public void testIdenticalLists() {
List strings2 = Arrays.asList("one", "two");
double similarity =
LevenshteinTokenUtil.getSimilarity(strings1, strings2);
- Assert.assertEquals(similarity, 1.0, DELTA);
+ assertThat(similarity).isEqualTo(1.0, DELTA);
}
@Test
diff --git a/zanata-war/src/test/java/org/zanata/search/LevenshteinUtilTest.java b/zanata-war/src/test/java/org/zanata/search/LevenshteinUtilTest.java
index a61d633011..dfd4e624a7 100644
--- a/zanata-war/src/test/java/org/zanata/search/LevenshteinUtilTest.java
+++ b/zanata-war/src/test/java/org/zanata/search/LevenshteinUtilTest.java
@@ -24,8 +24,12 @@
import java.util.Arrays;
import java.util.List;
+import org.assertj.core.data.Offset;
+import org.junit.Assert;
import org.junit.Test;
-import org.testng.Assert;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.data.Offset.offset;
/**
* @author Sean Flanigan DELTA = offset(0.0001);
@Test
public void testVarious() {
@@ -83,7 +87,7 @@ public void testSimilarLists() {
List strings1 = Arrays.asList("1234567890", "abcdefghij");
List strings2 = Arrays.asList("123456789", "bcdefghij");
double similarity = LevenshteinUtil.getSimilarity(strings1, strings2);
- Assert.assertEquals(similarity, 0.9, DELTA);
+ assertThat(similarity).isEqualTo(0.9, DELTA);
}
@Test
@@ -91,7 +95,7 @@ public void testMisorderedLists() {
List strings1 = Arrays.asList("1234567890", "abcdefghij");
List strings2 = Arrays.asList("abcdefghij", "1234567890");
double similarity = LevenshteinUtil.getSimilarity(strings1, strings2);
- Assert.assertEquals(similarity, 0.0, DELTA);
+ assertThat(similarity).isEqualTo(0.0, DELTA);
}
@Test
@@ -99,7 +103,7 @@ public void testIdenticalLists() {
List strings1 = Arrays.asList("one", "two");
List strings2 = Arrays.asList("one", "two");
double similarity = LevenshteinUtil.getSimilarity(strings1, strings2);
- Assert.assertEquals(similarity, 1.0, DELTA);
+ assertThat(similarity).isEqualTo(1.0, DELTA);
}
}
diff --git a/zanata-war/src/test/java/org/zanata/service/impl/LocaleServiceImplTest.java b/zanata-war/src/test/java/org/zanata/service/impl/LocaleServiceImplTest.java
index 0b0c391804..3bdeaa6c39 100644
--- a/zanata-war/src/test/java/org/zanata/service/impl/LocaleServiceImplTest.java
+++ b/zanata-war/src/test/java/org/zanata/service/impl/LocaleServiceImplTest.java
@@ -25,11 +25,11 @@
import java.util.List;
import java.util.Set;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.testng.Assert;
import org.zanata.common.LocaleId;
import org.zanata.dao.LocaleDAO;
import org.zanata.dao.ProjectDAO;
@@ -117,11 +117,11 @@ public void testGetAllSupportedLanguages() {
lan.add(new HLocale(new LocaleId("pt-BR")));
when(localeDAO.findAll()).thenReturn(lan);
List sup = testLocaleServiceImpl.getAllLocales();
- Assert.assertEquals(sup.size(), 2);
+ assertThat(sup.size()).isEqualTo(2);
String loc1 = sup.get(0).getLocaleId().getId();
- Assert.assertEquals(loc1, "as-IN");
+ assertThat(loc1).isEqualTo("as-IN");
String loc2 = sup.get(1).getLocaleId().getId();
- Assert.assertEquals(loc2, "pt-BR");
+ assertThat(loc2).isEqualTo("pt-BR");
}
@Test
diff --git a/zanata-war/src/test/java/org/zanata/util/Base64UrlSafeTest.java b/zanata-war/src/test/java/org/zanata/util/Base64UrlSafeTest.java
index 45070e2a00..7c3aa2c141 100644
--- a/zanata-war/src/test/java/org/zanata/util/Base64UrlSafeTest.java
+++ b/zanata-war/src/test/java/org/zanata/util/Base64UrlSafeTest.java
@@ -21,7 +21,8 @@
package org.zanata.util;
import org.junit.Test;
-import org.testng.Assert;
+
+import static org.assertj.core.api.Assertions.assertThat;
public class Base64UrlSafeTest {
@Test
@@ -29,7 +30,7 @@ public void test() {
String var = "hding;helen.ding.uq@gmail.com";
String enVar = Base64UrlSafe.encode(var);
String deVar = Base64UrlSafe.decode(enVar);
- Assert.assertEquals(var, deVar);
+ assertThat(var).isEqualTo(deVar);
}
}
diff --git a/zanata-war/src/test/java/org/zanata/webtrans/client/util/DateUtilTest.java b/zanata-war/src/test/java/org/zanata/webtrans/client/util/DateUtilTest.java
index fcd629d54e..e39d7ec40b 100644
--- a/zanata-war/src/test/java/org/zanata/webtrans/client/util/DateUtilTest.java
+++ b/zanata-war/src/test/java/org/zanata/webtrans/client/util/DateUtilTest.java
@@ -7,7 +7,7 @@
import java.util.Date;
import java.util.GregorianCalendar;
-import static org.testng.Assert.*;
+import static org.assertj.core.api.Assertions.assertThat;
public class DateUtilTest {
@@ -21,12 +21,12 @@ public void before() {
@Test
public void testFormatShortDate() throws Exception {
String s = DateUtil.formatShortDate(aDate);
- assertEquals(s, "25/12/13 01:02");
+ assertThat(s).isEqualTo("25/12/13 01:02");
}
@Test
public void testFormatLongDateTime() throws Exception {
String s = DateUtil.formatLongDateTime(aDate);
- assertEquals(s, "25/12/13 01:02:03");
+ assertThat(s).isEqualTo("25/12/13 01:02:03");
}
}
diff --git a/zanata-war/src/test/java/org/zanata/webtrans/client/util/TextFormatUtilTest.java b/zanata-war/src/test/java/org/zanata/webtrans/client/util/TextFormatUtilTest.java
index 36e1ef0557..099b875c26 100644
--- a/zanata-war/src/test/java/org/zanata/webtrans/client/util/TextFormatUtilTest.java
+++ b/zanata-war/src/test/java/org/zanata/webtrans/client/util/TextFormatUtilTest.java
@@ -1,7 +1,6 @@
package org.zanata.webtrans.client.util;
-import static org.testng.Assert.*;
import static org.assertj.core.api.Assertions.assertThat;
import org.assertj.core.api.Assertions;
import org.junit.Test;