You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by el...@apache.org on 2020/05/27 11:42:34 UTC
[maven-shared-utils] branch warn created (now 4d6fabd)
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a change to branch warn
in repository https://gitbox.apache.org/repos/asf/maven-shared-utils.git.
at 4d6fabd modernize tests
This branch includes the following new commits:
new 4d6fabd modernize tests
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-shared-utils] 01/01: modernize tests
Posted by el...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch warn
in repository https://gitbox.apache.org/repos/asf/maven-shared-utils.git
commit 4d6fabd8b0c2815086edd7bdb2997d515350c0ca
Author: Elliotte Rusty Harold <el...@ibiblio.org>
AuthorDate: Wed May 27 07:42:20 2020 -0400
modernize tests
---
.../java/org/apache/maven/shared/utils/OsTest.java | 72 +++++++++++-----------
.../apache/maven/shared/utils/PathToolTest.java | 6 +-
.../apache/maven/shared/utils/StringUtilsTest.java | 3 +-
.../shared/utils/io/DirectoryScannerTest.java | 1 -
.../maven/shared/utils/io/FileUtilsTest.java | 2 -
.../apache/maven/shared/utils/io/IOUtilTest.java | 2 +-
.../utils/logging/AnsiMessageBuilderTest.java | 2 +-
.../shared/utils/logging/MessageUtilsTest.java | 2 +-
8 files changed, 43 insertions(+), 47 deletions(-)
diff --git a/src/test/java/org/apache/maven/shared/utils/OsTest.java b/src/test/java/org/apache/maven/shared/utils/OsTest.java
index d5ea683..4ee8fdd 100644
--- a/src/test/java/org/apache/maven/shared/utils/OsTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/OsTest.java
@@ -27,6 +27,7 @@ import org.junit.Assert;
import java.util.Set;
import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.MatcherAssert.assertThat;
/**
* This class will test the 'Os' class which evaluates
@@ -35,7 +36,6 @@ import static org.hamcrest.CoreMatchers.*;
* @author <a href="mailto:struberg@yahoo.de">Mark Struberg</a>
*/
public class OsTest
- extends Assert
{
private String origOsName;
private String origOsArch;
@@ -70,34 +70,34 @@ public class OsTest
Os os = new Os();
os.eval();
- assertTrue( Os.isName( Os.FAMILY_OS2 ) );
-
- assertFalse( Os.isName( Os.FAMILY_DOS ) );
- assertFalse( Os.isName( Os.FAMILY_MAC ) );
- assertFalse( Os.isName( Os.FAMILY_NETWARE ) );
- assertFalse( Os.isName( Os.FAMILY_OPENVMS ) );
- assertFalse( Os.isName( Os.FAMILY_OS400 ) );
- assertFalse( Os.isName( Os.FAMILY_TANDEM ) );
- assertFalse( Os.isName( Os.FAMILY_UNIX ) );
- assertFalse( Os.isName( Os.FAMILY_WIN9X ) );
- assertFalse( Os.isName( Os.FAMILY_WINDOWS ) );
- assertFalse( Os.isName( Os.FAMILY_ZOS ) );
+ Assert.assertTrue( Os.isName( Os.FAMILY_OS2 ) );
+
+ Assert.assertFalse( Os.isName( Os.FAMILY_DOS ) );
+ Assert.assertFalse( Os.isName( Os.FAMILY_MAC ) );
+ Assert.assertFalse( Os.isName( Os.FAMILY_NETWARE ) );
+ Assert.assertFalse( Os.isName( Os.FAMILY_OPENVMS ) );
+ Assert.assertFalse( Os.isName( Os.FAMILY_OS400 ) );
+ Assert.assertFalse( Os.isName( Os.FAMILY_TANDEM ) );
+ Assert.assertFalse( Os.isName( Os.FAMILY_UNIX ) );
+ Assert.assertFalse( Os.isName( Os.FAMILY_WIN9X ) );
+ Assert.assertFalse( Os.isName( Os.FAMILY_WINDOWS ) );
+ Assert.assertFalse( Os.isName( Os.FAMILY_ZOS ) );
}
@Test
public void testFamilyNames()
{
- assertEquals( Os.FAMILY_DOS, "dos" );
- assertEquals( Os.FAMILY_MAC, "mac" );
- assertEquals( Os.FAMILY_NETWARE, "netware" );
- assertEquals( Os.FAMILY_OPENVMS, "openvms" );
- assertEquals( Os.FAMILY_OS2, "os/2" );
- assertEquals( Os.FAMILY_OS400, "os/400" );
- assertEquals( Os.FAMILY_TANDEM, "tandem" );
- assertEquals( Os.FAMILY_UNIX, "unix" );
- assertEquals( Os.FAMILY_WIN9X, "win9x" );
- assertEquals( Os.FAMILY_WINDOWS, "windows" );
- assertEquals( Os.FAMILY_ZOS, "z/os" );
+ Assert.assertEquals( Os.FAMILY_DOS, "dos" );
+ Assert.assertEquals( Os.FAMILY_MAC, "mac" );
+ Assert.assertEquals( Os.FAMILY_NETWARE, "netware" );
+ Assert.assertEquals( Os.FAMILY_OPENVMS, "openvms" );
+ Assert.assertEquals( Os.FAMILY_OS2, "os/2" );
+ Assert.assertEquals( Os.FAMILY_OS400, "os/400" );
+ Assert.assertEquals( Os.FAMILY_TANDEM, "tandem" );
+ Assert.assertEquals( Os.FAMILY_UNIX, "unix" );
+ Assert.assertEquals( Os.FAMILY_WIN9X, "win9x" );
+ Assert.assertEquals( Os.FAMILY_WINDOWS, "windows" );
+ Assert.assertEquals( Os.FAMILY_ZOS, "z/os" );
}
@Test
@@ -105,20 +105,20 @@ public class OsTest
{
Set<String> osFamilies = Os.getValidFamilies();
- assertTrue( "OsFamilies Set size"
+ Assert.assertTrue( "OsFamilies Set size"
, osFamilies.size() >= 11 );
- assert( osFamilies.contains( Os.FAMILY_DOS ) );
- assert( osFamilies.contains( Os.FAMILY_MAC ) );
- assert( osFamilies.contains( Os.FAMILY_NETWARE ) );
- assert( osFamilies.contains( Os.FAMILY_OPENVMS ) );
- assert( osFamilies.contains( Os.FAMILY_OS2 ) );
- assert( osFamilies.contains( Os.FAMILY_OS400 ) );
- assert( osFamilies.contains( Os.FAMILY_TANDEM ) );
- assert( osFamilies.contains( Os.FAMILY_UNIX ) );
- assert( osFamilies.contains( Os.FAMILY_WIN9X ) );
- assert( osFamilies.contains( Os.FAMILY_WINDOWS ) );
- assert( osFamilies.contains( Os.FAMILY_ZOS ) );
+ Assert.assertTrue( osFamilies.contains( Os.FAMILY_DOS ) );
+ Assert.assertTrue( osFamilies.contains( Os.FAMILY_MAC ) );
+ Assert.assertTrue( osFamilies.contains( Os.FAMILY_NETWARE ) );
+ Assert.assertTrue( osFamilies.contains( Os.FAMILY_OPENVMS ) );
+ Assert.assertTrue( osFamilies.contains( Os.FAMILY_OS2 ) );
+ Assert.assertTrue( osFamilies.contains( Os.FAMILY_OS400 ) );
+ Assert.assertTrue( osFamilies.contains( Os.FAMILY_TANDEM ) );
+ Assert.assertTrue( osFamilies.contains( Os.FAMILY_UNIX ) );
+ Assert.assertTrue( osFamilies.contains( Os.FAMILY_WIN9X ) );
+ Assert.assertTrue( osFamilies.contains( Os.FAMILY_WINDOWS ) );
+ Assert.assertTrue( osFamilies.contains( Os.FAMILY_ZOS ) );
}
diff --git a/src/test/java/org/apache/maven/shared/utils/PathToolTest.java b/src/test/java/org/apache/maven/shared/utils/PathToolTest.java
index 073d525..f8db74f 100644
--- a/src/test/java/org/apache/maven/shared/utils/PathToolTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/PathToolTest.java
@@ -23,21 +23,21 @@ import org.hamcrest.CoreMatchers;
import org.junit.Assume;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.Assert;
import org.junit.rules.TemporaryFolder;
import java.io.File;
import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+
/**
* Test the {@link PathTool} class.
*
- * We don't need to test this
* @author <a href="mailto:struberg@yahoo.de">Mark Struberg</a>
*/
-public class PathToolTest extends Assert
+public class PathToolTest
{
@Rule
diff --git a/src/test/java/org/apache/maven/shared/utils/StringUtilsTest.java b/src/test/java/org/apache/maven/shared/utils/StringUtilsTest.java
index e81cb60..fdf4e38 100644
--- a/src/test/java/org/apache/maven/shared/utils/StringUtilsTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/StringUtilsTest.java
@@ -24,13 +24,13 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import org.junit.Assert;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
/**
* Test the {@link StringUtils} class.
@@ -39,7 +39,6 @@ import static org.hamcrest.CoreMatchers.nullValue;
* @author <a href="mailto:struberg@yahoo.de">Mark Struberg</a>
*/
public class StringUtilsTest
- extends Assert
{
@Rule
diff --git a/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java b/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java
index 9ede93a..421f635 100644
--- a/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java
@@ -36,7 +36,6 @@ import java.util.List;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assume.assumeFalse;
-import static org.junit.Assume.assumeTrue;
public class DirectoryScannerTest
{
diff --git a/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java b/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java
index 66d1844..3a09bac 100644
--- a/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java
@@ -4,7 +4,6 @@ import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.CoreMatchers.hasItems;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.CoreMatchers.startsWith;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -12,7 +11,6 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.junit.Assume.assumeFalse;
import static org.junit.Assume.assumeThat;
-import static org.junit.Assume.assumeTrue;
import org.apache.maven.shared.utils.Os;
import org.apache.maven.shared.utils.testhelpers.FileTestHelper;
diff --git a/src/test/java/org/apache/maven/shared/utils/io/IOUtilTest.java b/src/test/java/org/apache/maven/shared/utils/io/IOUtilTest.java
index 0f307d0..8a3f17b 100644
--- a/src/test/java/org/apache/maven/shared/utils/io/IOUtilTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/io/IOUtilTest.java
@@ -38,7 +38,7 @@ import java.io.Writer;
import java.util.concurrent.atomic.AtomicBoolean;
import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
public class IOUtilTest
{
diff --git a/src/test/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilderTest.java b/src/test/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilderTest.java
index 81a32b3..2c580e2 100644
--- a/src/test/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilderTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilderTest.java
@@ -23,7 +23,7 @@ import org.junit.Before;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
public class AnsiMessageBuilderTest
{
diff --git a/src/test/java/org/apache/maven/shared/utils/logging/MessageUtilsTest.java b/src/test/java/org/apache/maven/shared/utils/logging/MessageUtilsTest.java
index 1a6d4b4..a53c4d9 100644
--- a/src/test/java/org/apache/maven/shared/utils/logging/MessageUtilsTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/logging/MessageUtilsTest.java
@@ -21,7 +21,7 @@ package org.apache.maven.shared.utils.logging;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.sameInstance;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import java.io.PrintStream;