This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
The following commit(s) were added to refs/heads/master by this push:
new 3711a62 JSPWIKI-1151 - Simplify assertion with simpler and equivalent
calls.
3711a62 is described below
commit 3711a62b814076e14fd90343560eb2c87c256701
Author: Arturo Bernal <[email protected]>
AuthorDate: Thu Sep 23 20:12:20 2021 +0200
JSPWIKI-1151 - Simplify assertion with simpler and equivalent calls.
---
.../org/apache/wiki/auth/authorize/GroupTest.java | 8 ++++----
.../wiki/auth/authorize/XMLGroupDatabaseTest.java | 2 +-
.../wiki/auth/login/AnonymousLoginModuleTest.java | 6 +++---
.../auth/login/CookieAssertionLoginModuleTest.java | 6 +++---
.../auth/login/UserDatabaseLoginModuleTest.java | 6 +++---
.../auth/login/WebContainerLoginModuleTest.java | 6 +++---
.../permissions/AllPermissionCollectionTest.java | 2 +-
.../wiki/auth/permissions/AllPermissionTest.java | 12 +++++------
.../wiki/auth/permissions/GroupPermissionTest.java | 2 +-
.../wiki/auth/permissions/PagePermissionTest.java | 2 +-
.../wiki/auth/permissions/WikiPermissionTest.java | 20 +++++++++---------
.../apache/wiki/auth/user/XMLUserDatabaseTest.java | 24 +++++++++++-----------
.../org/apache/wiki/plugin/InsertPageTest.java | 4 ++--
.../apache/wiki/plugin/TableOfContentsTest.java | 4 ++--
.../java/org/apache/wiki/util/ByteUtilsTest.java | 2 +-
15 files changed, 53 insertions(+), 53 deletions(-)
diff --git
a/jspwiki-main/src/test/java/org/apache/wiki/auth/authorize/GroupTest.java
b/jspwiki-main/src/test/java/org/apache/wiki/auth/authorize/GroupTest.java
index d104acf..d6cf575 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/auth/authorize/GroupTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/auth/authorize/GroupTest.java
@@ -114,7 +114,7 @@ public class GroupTest
group2.add( u3 );
group2.add( u4 );
- Assertions.assertTrue( m_group.equals( group2 ) );
+ Assertions.assertEquals(m_group, group2);
}
@Test
@@ -133,7 +133,7 @@ public class GroupTest
group2.add( u3 );
group2.add( u4 );
- Assertions.assertFalse( m_group.equals( group2 ) );
+ Assertions.assertNotEquals( m_group, group2) ;
}
@Test
@@ -151,7 +151,7 @@ public class GroupTest
group2.add( u3 );
group2.add( u4 );
- Assertions.assertTrue( group1.equals( group2 ) );
+ Assertions.assertEquals( group1, group2 );
}
@Test
@@ -169,7 +169,7 @@ public class GroupTest
group2.add( u3 );
group2.add( u4 );
- Assertions.assertFalse( m_group.equals( group2 ) );
+ Assertions.assertNotEquals( m_group, group2 );
}
}
\ No newline at end of file
diff --git
a/jspwiki-main/src/test/java/org/apache/wiki/auth/authorize/XMLGroupDatabaseTest.java
b/jspwiki-main/src/test/java/org/apache/wiki/auth/authorize/XMLGroupDatabaseTest.java
index b76e541..e0ee706 100644
---
a/jspwiki-main/src/test/java/org/apache/wiki/auth/authorize/XMLGroupDatabaseTest.java
+++
b/jspwiki-main/src/test/java/org/apache/wiki/auth/authorize/XMLGroupDatabaseTest.java
@@ -112,7 +112,7 @@ public class XMLGroupDatabaseTest
{
group = backendGroup( "Archaeology" );
// We should never get here
- Assertions.assertTrue(false);
+ Assertions.fail();
}
catch (final NoSuchPrincipalException e)
{
diff --git
a/jspwiki-main/src/test/java/org/apache/wiki/auth/login/AnonymousLoginModuleTest.java
b/jspwiki-main/src/test/java/org/apache/wiki/auth/login/AnonymousLoginModuleTest.java
index 8e79462..eed86f6 100644
---
a/jspwiki-main/src/test/java/org/apache/wiki/auth/login/AnonymousLoginModuleTest.java
+++
b/jspwiki-main/src/test/java/org/apache/wiki/auth/login/AnonymousLoginModuleTest.java
@@ -70,7 +70,7 @@ public class AnonymousLoginModuleTest
catch( final LoginException e )
{
System.err.println( e.getMessage() );
- Assertions.assertTrue( false );
+ Assertions.fail();
}
}
@@ -98,7 +98,7 @@ public class AnonymousLoginModuleTest
catch( final LoginException e )
{
System.err.println( e.getMessage() );
- Assertions.assertTrue( false );
+ Assertions.fail();
}
}
@@ -120,7 +120,7 @@ public class AnonymousLoginModuleTest
catch( final NoRequiredPropertyException e )
{
System.err.println( e.getMessage() );
- Assertions.assertTrue( false );
+ Assertions.fail();
}
}
diff --git
a/jspwiki-main/src/test/java/org/apache/wiki/auth/login/CookieAssertionLoginModuleTest.java
b/jspwiki-main/src/test/java/org/apache/wiki/auth/login/CookieAssertionLoginModuleTest.java
index 3547a29..91f53d5 100644
---
a/jspwiki-main/src/test/java/org/apache/wiki/auth/login/CookieAssertionLoginModuleTest.java
+++
b/jspwiki-main/src/test/java/org/apache/wiki/auth/login/CookieAssertionLoginModuleTest.java
@@ -76,7 +76,7 @@ public class CookieAssertionLoginModuleTest
catch( final LoginException e )
{
System.err.println( e.getMessage() );
- Assertions.assertTrue( false );
+ Assertions.fail();
}
}
@@ -104,7 +104,7 @@ public class CookieAssertionLoginModuleTest
catch( final LoginException e )
{
System.err.println( e.getMessage() );
- Assertions.assertTrue( false );
+ Assertions.fail();
}
}
@@ -126,7 +126,7 @@ public class CookieAssertionLoginModuleTest
catch( final NoRequiredPropertyException e )
{
System.err.println( e.getMessage() );
- Assertions.assertTrue( false );
+ Assertions.fail();
}
}
diff --git
a/jspwiki-main/src/test/java/org/apache/wiki/auth/login/UserDatabaseLoginModuleTest.java
b/jspwiki-main/src/test/java/org/apache/wiki/auth/login/UserDatabaseLoginModuleTest.java
index 3be1f63..6a4f768 100644
---
a/jspwiki-main/src/test/java/org/apache/wiki/auth/login/UserDatabaseLoginModuleTest.java
+++
b/jspwiki-main/src/test/java/org/apache/wiki/auth/login/UserDatabaseLoginModuleTest.java
@@ -85,7 +85,7 @@ public class UserDatabaseLoginModuleTest
catch( final LoginException e )
{
System.err.println( e.getMessage() );
- Assertions.assertTrue( false );
+ Assertions.fail();
}
}
@@ -112,7 +112,7 @@ public class UserDatabaseLoginModuleTest
catch( final LoginException e )
{
System.err.println( e.getMessage() );
- Assertions.assertTrue( false );
+ Assertions.fail();
}
}
@@ -134,7 +134,7 @@ public class UserDatabaseLoginModuleTest
catch( final NoRequiredPropertyException e )
{
System.err.println( e.getMessage() );
- Assertions.assertTrue( false );
+ Assertions.fail();
}
}
diff --git
a/jspwiki-main/src/test/java/org/apache/wiki/auth/login/WebContainerLoginModuleTest.java
b/jspwiki-main/src/test/java/org/apache/wiki/auth/login/WebContainerLoginModuleTest.java
index 9b520a1..9462eeb 100644
---
a/jspwiki-main/src/test/java/org/apache/wiki/auth/login/WebContainerLoginModuleTest.java
+++
b/jspwiki-main/src/test/java/org/apache/wiki/auth/login/WebContainerLoginModuleTest.java
@@ -75,7 +75,7 @@ public class WebContainerLoginModuleTest
catch( final LoginException e )
{
System.err.println( e.getMessage() );
- Assertions.assertTrue( false );
+ Assertions.fail();
}
}
@@ -105,7 +105,7 @@ public class WebContainerLoginModuleTest
catch( final LoginException e )
{
System.err.println( e.getMessage() );
- Assertions.assertTrue( false );
+ Assertions.fail();
}
}
@@ -124,7 +124,7 @@ public class WebContainerLoginModuleTest
catch( final NoRequiredPropertyException e )
{
System.err.println( e.getMessage() );
- Assertions.assertTrue( false );
+ Assertions.fail();
}
}
diff --git
a/jspwiki-main/src/test/java/org/apache/wiki/auth/permissions/AllPermissionCollectionTest.java
b/jspwiki-main/src/test/java/org/apache/wiki/auth/permissions/AllPermissionCollectionTest.java
index be4774f..6d451d6 100644
---
a/jspwiki-main/src/test/java/org/apache/wiki/auth/permissions/AllPermissionCollectionTest.java
+++
b/jspwiki-main/src/test/java/org/apache/wiki/auth/permissions/AllPermissionCollectionTest.java
@@ -133,7 +133,7 @@ public class AllPermissionCollectionTest
if ( !exception )
{
// We should never get here
- Assertions.assertTrue( false );
+ Assertions.fail();
}
}
diff --git
a/jspwiki-main/src/test/java/org/apache/wiki/auth/permissions/AllPermissionTest.java
b/jspwiki-main/src/test/java/org/apache/wiki/auth/permissions/AllPermissionTest.java
index 1d67ecc..4feea49 100644
---
a/jspwiki-main/src/test/java/org/apache/wiki/auth/permissions/AllPermissionTest.java
+++
b/jspwiki-main/src/test/java/org/apache/wiki/auth/permissions/AllPermissionTest.java
@@ -35,10 +35,10 @@ public class AllPermissionTest
final AllPermission p1 = new AllPermission( "*" );
final AllPermission p2 = new AllPermission( "*" );
final AllPermission p3 = new AllPermission( "myWiki" );
- Assertions.assertTrue( p1.equals( p2 ) );
- Assertions.assertTrue( p2.equals( p1 ) );
- Assertions.assertFalse( p1.equals( p3 ) );
- Assertions.assertFalse( p3.equals( p1 ) );
+ Assertions.assertEquals( p1, p2 );
+ Assertions.assertEquals( p2, p1 );
+ Assertions.assertNotEquals( p1, p3 );
+ Assertions.assertNotEquals( p3, p1 );
}
@Test
@@ -46,8 +46,8 @@ public class AllPermissionTest
{
final AllPermission p1 = new AllPermission( "*" );
AllPermission p2 = new AllPermission( "*" );
- Assertions.assertTrue( p1.equals( p2 ) );
- Assertions.assertTrue( p2.equals( p1 ) );
+ Assertions.assertEquals( p1, p2 );
+ Assertions.assertEquals( p2, p1 );
p2 = new AllPermission( "myWiki" );
Assertions.assertTrue( p1.implies( p2 ) );
diff --git
a/jspwiki-main/src/test/java/org/apache/wiki/auth/permissions/GroupPermissionTest.java
b/jspwiki-main/src/test/java/org/apache/wiki/auth/permissions/GroupPermissionTest.java
index 4281873..518284b 100644
---
a/jspwiki-main/src/test/java/org/apache/wiki/auth/permissions/GroupPermissionTest.java
+++
b/jspwiki-main/src/test/java/org/apache/wiki/auth/permissions/GroupPermissionTest.java
@@ -44,7 +44,7 @@ public class GroupPermissionTest
final GroupPermission p4 = new GroupPermission( "mywiki:Test*",
"delete,view,edit" );
Assertions.assertEquals( p1, p2 );
Assertions.assertEquals( p1, p3 );
- Assertions.assertFalse( p3.equals( p4 ) );
+ Assertions.assertNotEquals( p3, p4 );
}
@Test
diff --git
a/jspwiki-main/src/test/java/org/apache/wiki/auth/permissions/PagePermissionTest.java
b/jspwiki-main/src/test/java/org/apache/wiki/auth/permissions/PagePermissionTest.java
index 9694658..5bf79e6 100644
---
a/jspwiki-main/src/test/java/org/apache/wiki/auth/permissions/PagePermissionTest.java
+++
b/jspwiki-main/src/test/java/org/apache/wiki/auth/permissions/PagePermissionTest.java
@@ -38,7 +38,7 @@ public class PagePermissionTest
final PagePermission p4 = new PagePermission( "mywiki:Main*",
"delete,view,edit" );
Assertions.assertEquals( p1, p2 );
Assertions.assertEquals( p1, p3 );
- Assertions.assertFalse( p3.equals( p4 ) );
+ Assertions.assertNotEquals( p3, p4 );
}
@Test
diff --git
a/jspwiki-main/src/test/java/org/apache/wiki/auth/permissions/WikiPermissionTest.java
b/jspwiki-main/src/test/java/org/apache/wiki/auth/permissions/WikiPermissionTest.java
index dc7a97c..3221a1c 100644
---
a/jspwiki-main/src/test/java/org/apache/wiki/auth/permissions/WikiPermissionTest.java
+++
b/jspwiki-main/src/test/java/org/apache/wiki/auth/permissions/WikiPermissionTest.java
@@ -46,13 +46,13 @@ public class WikiPermissionTest
final WikiPermission p1 = new WikiPermission("*", "createPages");
final WikiPermission p2 = new WikiPermission("*", "createPages");
final WikiPermission p3 = new WikiPermission("*", "createGroups");
- Assertions.assertTrue(p1.equals(p2));
- Assertions.assertTrue(p2.equals(p1));
- Assertions.assertFalse(p1.equals(p3));
- Assertions.assertFalse(p3.equals(p1));
+ Assertions.assertEquals( p1, p2 );
+ Assertions.assertEquals( p2, p1 );
+ Assertions.assertNotEquals( p1, p3 );
+ Assertions.assertNotEquals( p3, p1 );
final WikiPermission p4 = new WikiPermission("*",
"createPages,createGroups");
final WikiPermission p5 = new WikiPermission("*",
"createGroups,createPages");
- Assertions.assertTrue(p4.equals(p5));
+ Assertions.assertEquals( p4, p5 );
}
/*
@@ -64,13 +64,13 @@ public class WikiPermissionTest
final WikiPermission p1 = new WikiPermission("mywiki", "createPages");
final WikiPermission p2 = new WikiPermission("*", "createPages");
final WikiPermission p3 = new WikiPermission("mywiki", "createGroups");
- Assertions.assertFalse(p1.equals(p2));
- Assertions.assertFalse(p2.equals(p1));
- Assertions.assertFalse(p1.equals(p3));
- Assertions.assertFalse(p3.equals(p1));
+ Assertions.assertNotEquals(p1, p2);
+ Assertions.assertNotEquals(p2, p1);
+ Assertions.assertNotEquals(p1, p3);
+ Assertions.assertNotEquals(p3, p1);
final WikiPermission p4 = new WikiPermission("mywiki",
"createPages,createGroups");
final WikiPermission p5 = new WikiPermission("*",
"createGroups,createPages");
- Assertions.assertFalse(p4.equals(p5));
+ Assertions.assertNotEquals(p4, p5);
}
/*
diff --git
a/jspwiki-main/src/test/java/org/apache/wiki/auth/user/XMLUserDatabaseTest.java
b/jspwiki-main/src/test/java/org/apache/wiki/auth/user/XMLUserDatabaseTest.java
index 7a2a013..6cd846a 100644
---
a/jspwiki-main/src/test/java/org/apache/wiki/auth/user/XMLUserDatabaseTest.java
+++
b/jspwiki-main/src/test/java/org/apache/wiki/auth/user/XMLUserDatabaseTest.java
@@ -120,12 +120,12 @@ public class XMLUserDatabaseTest {
Assertions.assertEquals(
"{SHA-256}AeJQgAgYDAf2WZiqPJ2l6cGdGC/PgWmkjZmkjrBEV6SW/HlclZGlIg==",
profile.getPassword() );
Assertions.assertEquals( "[email protected]", profile.getEmail() );
} catch( final NoSuchPrincipalException e ) {
- Assertions.assertTrue( false );
+ Assertions.fail();
}
try {
m_db.findByEmail( "[email protected]" );
// We should never get here
- Assertions.assertTrue( false );
+ Assertions.fail();
} catch( final NoSuchPrincipalException e ) {
Assertions.assertTrue( true );
}
@@ -144,12 +144,12 @@ public class XMLUserDatabaseTest {
Assertions.assertNotNull( profile.getCreated() );
Assertions.assertNotNull( profile.getLastModified() );
} catch( final NoSuchPrincipalException e ) {
- Assertions.assertTrue( false );
+ Assertions.fail();
}
try {
m_db.findByEmail( "[email protected]" );
// We should never get here
- Assertions.assertTrue( false );
+ Assertions.fail();
} catch( final NoSuchPrincipalException e ) {
Assertions.assertTrue( true );
}
@@ -168,12 +168,12 @@ public class XMLUserDatabaseTest {
Assertions.assertNotNull( profile.getCreated() );
Assertions.assertNotNull( profile.getLastModified() );
} catch( final NoSuchPrincipalException e ) {
- Assertions.assertTrue( false );
+ Assertions.fail();
}
try {
m_db.findByEmail( "[email protected]" );
// We should never get here
- Assertions.assertTrue( false );
+ Assertions.fail();
} catch( final NoSuchPrincipalException e ) {
Assertions.assertTrue( true );
}
@@ -190,12 +190,12 @@ public class XMLUserDatabaseTest {
Assertions.assertEquals(
"{SHA-256}AeJQgAgYDAf2WZiqPJ2l6cGdGC/PgWmkjZmkjrBEV6SW/HlclZGlIg==",
profile.getPassword() );
Assertions.assertEquals( "[email protected]", profile.getEmail() );
} catch( final NoSuchPrincipalException e ) {
- Assertions.assertTrue( false );
+ Assertions.fail();
}
try {
m_db.findByEmail( "foo" );
// We should never get here
- Assertions.assertTrue( false );
+ Assertions.fail();
} catch( final NoSuchPrincipalException e ) {
Assertions.assertTrue( true );
}
@@ -212,12 +212,12 @@ public class XMLUserDatabaseTest {
Assertions.assertEquals(
"{SHA-256}AeJQgAgYDAf2WZiqPJ2l6cGdGC/PgWmkjZmkjrBEV6SW/HlclZGlIg==",
profile.getPassword() );
Assertions.assertEquals( "[email protected]", profile.getEmail() );
} catch( final NoSuchPrincipalException e ) {
- Assertions.assertTrue( false );
+ Assertions.fail();
}
try {
m_db.findByEmail( "FooBar" );
// We should never get here
- Assertions.assertTrue( false );
+ Assertions.fail();
} catch( final NoSuchPrincipalException e ) {
Assertions.assertTrue( true );
}
@@ -304,9 +304,9 @@ public class XMLUserDatabaseTest {
final String uid = profile.getUid();
Assertions.assertNotNull( m_db.findByUid( uid ) );
} catch( final NoSuchPrincipalException e ) {
- Assertions.assertTrue( false );
+ Assertions.fail();
} catch( final WikiSecurityException e ) {
- Assertions.assertTrue( false );
+ Assertions.fail();
}
}
diff --git
a/jspwiki-main/src/test/java/org/apache/wiki/plugin/InsertPageTest.java
b/jspwiki-main/src/test/java/org/apache/wiki/plugin/InsertPageTest.java
index 85fb704..a82aa3a 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/plugin/InsertPageTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/plugin/InsertPageTest.java
@@ -84,7 +84,7 @@ public class InsertPageTest
testEngine.saveText("ThisPage",src);
testEngine.saveText("ThisPage2",src2);
- Assertions.assertTrue( testEngine.getManager( RenderingManager.class
).getHTML("ThisPage").indexOf("Circular reference") == -1, "got circ ref" );
+ Assertions.assertEquals( -1,
testEngine.getManager(RenderingManager.class).getHTML("ThisPage").indexOf("Circular
reference"), "got circ ref" );
Assertions.assertEquals( "<div class=\"inserted-page \" >foo\n</div>
<div class=\"inserted-page \" >foo\n</div>\n",
testEngine.getManager( RenderingManager.class
).getHTML("ThisPage"), "found != 2" );
}
@@ -97,7 +97,7 @@ public class InsertPageTest
testEngine.saveText("ThisPage",src);
testEngine.saveText("Test_Page",src2);
- Assertions.assertTrue( testEngine.getManager( RenderingManager.class
).getHTML("ThisPage").indexOf("Circular reference") == -1, "got circ ref" );
+ Assertions.assertEquals( -1,
testEngine.getManager(RenderingManager.class).getHTML("ThisPage").indexOf("Circular
reference"), "got circ ref" );
Assertions.assertEquals( "<div class=\"inserted-page \"
>foo\n</div>\n", testEngine.getManager( RenderingManager.class
).getHTML("ThisPage"), "found != 1" );
}
diff --git
a/jspwiki-main/src/test/java/org/apache/wiki/plugin/TableOfContentsTest.java
b/jspwiki-main/src/test/java/org/apache/wiki/plugin/TableOfContentsTest.java
index b53c400..a0d1631 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/plugin/TableOfContentsTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/plugin/TableOfContentsTest.java
@@ -214,8 +214,8 @@ public class TableOfContentsTest
final String res = testEngine.getI18nHTML( "Test" );
- Assertions.assertTrue( res.indexOf("<i>") == -1, "<i>" ); // Check
that there is no HTML left
- Assertions.assertTrue( res.indexOf("</i>") == -1, "</i>" ); // Check
that there is no HTML left
+ Assertions.assertEquals( -1, res.indexOf("<i>"), "<i>" ); // Check
that there is no HTML left
+ Assertions.assertEquals( -1, res.indexOf("</i>"), "</i>" ); // Check
that there is no HTML left
}
@Test
diff --git a/jspwiki-util/src/test/java/org/apache/wiki/util/ByteUtilsTest.java
b/jspwiki-util/src/test/java/org/apache/wiki/util/ByteUtilsTest.java
index 4729ec5..caed32f 100644
--- a/jspwiki-util/src/test/java/org/apache/wiki/util/ByteUtilsTest.java
+++ b/jspwiki-util/src/test/java/org/apache/wiki/util/ByteUtilsTest.java
@@ -42,7 +42,7 @@ public class ByteUtilsTest {
{
final byte[] reconstructedBytes =
ByteUtils.parseHexBinary(EXPECTED_HEX_STRING);
Assertions.assertEquals(bytes.length,reconstructedBytes.length);
- Assertions.assertTrue(Arrays.equals(bytes,reconstructedBytes));
+ Assertions.assertArrayEquals(bytes, reconstructedBytes);
}
@Test
