You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by mp...@apache.org on 2002/03/14 02:16:17 UTC
cvs commit: jakarta-turbine-maven/src/test/org/apache/maven/importscrubber FilePairTest.java PackageStmtTest.java
mpoeschl 02/03/13 17:16:17
Modified: src/test/org/apache/maven/importscrubber FilePairTest.java
PackageStmtTest.java
Log:
- starting with jdk1.4 assert is a keyword so use assertTrue instead
- use 4 space indent
Revision Changes Path
1.2 +23 -19 jakarta-turbine-maven/src/test/org/apache/maven/importscrubber/FilePairTest.java
Index: FilePairTest.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/test/org/apache/maven/importscrubber/FilePairTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FilePairTest.java 20 Feb 2002 22:52:57 -0000 1.1
+++ FilePairTest.java 14 Mar 2002 01:16:17 -0000 1.2
@@ -61,28 +61,32 @@
import junit.framework.TestSuite;
import org.apache.maven.importscrubber.FilePair;
+/**
+ *
+ * @version $Id: FilePairTest.java,v 1.2 2002/03/14 01:16:17 mpoeschl Exp $
+ */
public class FilePairTest extends TestCase
{
- public FilePairTest(String aName)
- {
- super(aName);
- }
+ public FilePairTest(String aName)
+ {
+ super(aName);
+ }
- public static Test suite()
- {
- return new TestSuite(FilePairTest.class);
- }
+ public static Test suite()
+ {
+ return new TestSuite(FilePairTest.class);
+ }
- public void testBasic()
- {
- File a = new File("c:\\");
- File b = new File("d:\\");
- FilePair pair = new FilePair(a, b);
- assert(pair.getSourceFile().equals(a));
+ public void testBasic()
+ {
+ File a = new File("c:\\");
+ File b = new File("d:\\");
+ FilePair pair = new FilePair(a, b);
+ assertTrue(pair.getSourceFile().equals(a));
- Iterator i = pair.getClassFiles();
- assert(i.hasNext());
- i.next();
- assert(!i.hasNext());
- }
+ Iterator i = pair.getClassFiles();
+ assertTrue(i.hasNext());
+ i.next();
+ assertTrue(!i.hasNext());
+ }
}
1.2 +44 -37 jakarta-turbine-maven/src/test/org/apache/maven/importscrubber/PackageStmtTest.java
Index: PackageStmtTest.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/test/org/apache/maven/importscrubber/PackageStmtTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PackageStmtTest.java 20 Feb 2002 22:52:57 -0000 1.1
+++ PackageStmtTest.java 14 Mar 2002 01:16:17 -0000 1.2
@@ -60,45 +60,52 @@
import org.apache.maven.importscrubber.PackageStmt;
import org.apache.maven.importscrubber.ImportStatement;
-
+/**
+ * @version $Id: PackageStmtTest.java,v 1.2 2002/03/14 01:16:17 mpoeschl Exp $
+ */
public class PackageStmtTest extends TestCase
{
- private static final String DEFAULT = "package org.apache.maven.importscrubber;";
+ private static final String DEFAULT = "package org.apache.maven.importscrubber;";
- public PackageStmtTest(String aName)
- {
- super(aName);
- }
-
- public static Test suite()
- {
- return new TestSuite(PackageStmtTest.class);
- }
-
- public void testBasic()
- {
- PackageStmt stmt = new PackageStmt(DEFAULT);
- assert(stmt.isInSamePackageAs(new ImportStatement("org.apache.maven.importscrubber.Buz")));
- assert(!stmt.isInSamePackageAs(new ImportStatement("net.sourceforge.osage.Bat")));
- }
-
- public void testDefaultPkg()
- {
- PackageStmt stmt = new PackageStmt();
- assert(!stmt.isInSamePackageAs(new ImportStatement("org.apache.maven.importscrubber.Foo")));
- assert(stmt.isInSamePackageAs(new ImportStatement("")));
- }
-
- public void testInnerClass()
- {
- PackageStmt stmt = new PackageStmt(DEFAULT);
- assert(stmt.isInSamePackageAs(new ImportStatement("org.apache.maven.importscrubber.Foo.Fiz")));
- }
-
- public void testChildPackage()
- {
- PackageStmt stmt = new PackageStmt(DEFAULT);
- assert(!stmt.isInSamePackageAs(new ImportStatement("org.apache.maven.importscrubber.biz.Buz")));
- }
+ public PackageStmtTest(String aName)
+ {
+ super(aName);
+ }
+
+ public static Test suite()
+ {
+ return new TestSuite(PackageStmtTest.class);
+ }
+
+ public void testBasic()
+ {
+ PackageStmt stmt = new PackageStmt(DEFAULT);
+ assertTrue(stmt.isInSamePackageAs(
+ new ImportStatement("org.apache.maven.importscrubber.Buz")));
+ assertTrue(!stmt.isInSamePackageAs(
+ new ImportStatement("net.sourceforge.osage.Bat")));
+ }
+
+ public void testDefaultPkg()
+ {
+ PackageStmt stmt = new PackageStmt();
+ assertTrue(!stmt.isInSamePackageAs(
+ new ImportStatement("org.apache.maven.importscrubber.Foo")));
+ assertTrue(stmt.isInSamePackageAs(new ImportStatement("")));
+ }
+
+ public void testInnerClass()
+ {
+ PackageStmt stmt = new PackageStmt(DEFAULT);
+ assertTrue(stmt.isInSamePackageAs(
+ new ImportStatement("org.apache.maven.importscrubber.Foo.Fiz")));
+ }
+
+ public void testChildPackage()
+ {
+ PackageStmt stmt = new PackageStmt(DEFAULT);
+ assertTrue(!stmt.isInSamePackageAs(
+ new ImportStatement("org.apache.maven.importscrubber.biz.Buz")));
+ }
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>