You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2003/11/23 11:10:06 UTC
cvs commit: avalon-sandbox/repository/api/src/test/org/apache/avalon/repository ArtifactTest.java ClassicArtifactTest.java
mcconnell 2003/11/23 02:10:06
Modified: repository/api/src/test/org/apache/avalon/repository
ArtifactTest.java ClassicArtifactTest.java
Log:
Test case cleanup.
Revision Changes Path
1.3 +22 -11 avalon-sandbox/repository/api/src/test/org/apache/avalon/repository/ArtifactTest.java
Index: ArtifactTest.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/repository/api/src/test/org/apache/avalon/repository/ArtifactTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ArtifactTest.java 23 Nov 2003 01:58:27 -0000 1.2
+++ ArtifactTest.java 23 Nov 2003 10:10:06 -0000 1.3
@@ -119,11 +119,15 @@
public void testArtifactState() throws Exception
{
Artifact ref = new Artifact( "/aaa/bbb/ccc/", "xyz" );
- assertTrue( "base", ref.getBase().equals( "aaa/bbb/ccc" ) );
- assertTrue( "name", ref.getFilename().equals( "xyz" ) );
- assertTrue( "path", ref.getPath().equals( "aaa/bbb/ccc/xyz" ) );
- assertTrue( "url-1", ref.getURL( "http://abc.def" ).equals( "http://abc.def/aaa/bbb/ccc/xyz" ) );
- assertTrue( "url-2", ref.getURL( "http://abc.def/" ).equals( "http://abc.def/aaa/bbb/ccc/xyz" ) );
+ assertEquals( "base", ref.getBase(), "aaa/bbb/ccc" );
+ assertEquals( "name", ref.getFilename(), "xyz" );
+ assertEquals( "path", ref.getPath(), "aaa/bbb/ccc/xyz" );
+ assertEquals( "url-1",
+ ref.getURL( "http://abc.def" ),
+ "http://abc.def/aaa/bbb/ccc/xyz" );
+ assertEquals( "url-2",
+ ref.getURL( "http://abc.def/" ),
+ "http://abc.def/aaa/bbb/ccc/xyz" );
}
public void testStaticOne() throws Exception
@@ -169,21 +173,28 @@
{
Artifact artifact = Artifact.createArtifact( "xxx", "yyy" );
assertNotNull( artifact );
- assertTrue(
- artifact.getURL( "http://dpml.net" ).equals(
- "http://dpml.net/xxx/yyy" ) );
+ assertEquals(
+ "integrity",
+ artifact.getURL( "http://dpml.net" ),
+ "http://dpml.net/xxx/yyy" );
}
public void testURLFromEmptyRepository() throws Exception
{
Artifact artifact = Artifact.createArtifact( "xxx", "yyy" );
assertNotNull( artifact );
- assertTrue( artifact.getURL( "" ).equals( "/xxx/yyy" ) );
+ assertEquals(
+ "url-from-empty",
+ artifact.getURL( "" ),
+ "/xxx/yyy" );
}
public void testURLFromNullRepository() throws Exception
{
Artifact artifact = Artifact.createArtifact( "xxx", "yyy" );
- assertTrue( artifact.getURL( null ).equals( "/xxx/yyy" ) );
+ assertEquals(
+ "url-from-null",
+ artifact.getURL( null ),
+ "/xxx/yyy" );
}
}
1.2 +56 -42 avalon-sandbox/repository/api/src/test/org/apache/avalon/repository/ClassicArtifactTest.java
Index: ClassicArtifactTest.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/repository/api/src/test/org/apache/avalon/repository/ClassicArtifactTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ClassicArtifactTest.java 23 Nov 2003 01:58:27 -0000 1.1
+++ ClassicArtifactTest.java 23 Nov 2003 10:10:06 -0000 1.2
@@ -120,14 +120,16 @@
ClassicArtifact artifact =
ClassicArtifact.createClassicArtifact( group, name );
assertNotNull( artifact );
- assertTrue( artifact.getURL( null ).equals( "/" + group + "/" + name ) );
- assertTrue( "group", group.equals( artifact.getGroup() ) );
- assertTrue( "name", name.equals( artifact.getName() ) );
+ assertEquals( "group", group, artifact.getGroup() );
+ assertEquals( "name", name, artifact.getName() );
+ assertEquals(
+ "url",
+ artifact.getURL( null ),
+ "/" + group + "/" + name );
}
public void testCreateVersionedClassicArtifact() throws Exception
{
-
String group = "xxx";
String name = "yyy";
String version = "1.0-dev";
@@ -137,12 +139,13 @@
group, name, version );
assertNotNull( artifact );
- assertTrue(
- artifact.getURL( null ).equals(
- "/" + group + "/" + name + "-" + version ) );
- assertTrue( "group", group.equals( artifact.getGroup() ) );
- assertTrue( "name", name.equals( artifact.getName() ) );
- assertTrue( "version", version.equals( artifact.getVersion() ) );
+ assertEquals( "group", group, artifact.getGroup() );
+ assertEquals( "name", name, artifact.getName() );
+ assertEquals( "version", version, artifact.getVersion() );
+ assertEquals(
+ "url",
+ artifact.getURL( null ),
+ "/" + group + "/" + name + "-" + version );
}
public void testCreateTypedArtifact() throws Exception
@@ -156,14 +159,14 @@
group, name, version, type );
assertNotNull( artifact );
- assertTrue(
- artifact.getURL( null ).equals(
- "/" + group + "/" + type + "s/" + name
- + "-" + version + "." + type ) );
- assertTrue( "group", group.equals( artifact.getGroup() ) );
- assertTrue( "name", name.equals( artifact.getName() ) );
- assertTrue( "version", version.equals( artifact.getVersion() ) );
- assertTrue( "type", type.equals( artifact.getType() ) );
+ assertEquals( "group", group, artifact.getGroup() );
+ assertEquals( "name", name, artifact.getName() );
+ assertEquals( "version", version, artifact.getVersion() );
+ assertEquals( "type", type, artifact.getType() );
+ assertEquals(
+ "url",
+ artifact.getURL( null ),
+ "/" + group + "/" + type + "s/" + name + "-" + version + "." + type );
}
public void testJarArtifactCreation() throws Exception
@@ -175,12 +178,14 @@
ClassicArtifact artifact =
ClassicArtifact.createJarArtifact( group, name, version );
assertNotNull( artifact );
- assertTrue( "group", group.equals( artifact.getGroup() ) );
- assertTrue( "name", name.equals( artifact.getName() ) );
- assertTrue( "version", version.equals( artifact.getVersion() ) );
- assertTrue( "type", "jar".equals( artifact.getType() ) );
- assertTrue( artifact.getURL( null ).equals(
- "/" + group + "/jars/" + name + "-" + version + ".jar" ) );
+ assertEquals( "group", group, artifact.getGroup() );
+ assertEquals( "name", name, artifact.getName() );
+ assertEquals( "version", version, artifact.getVersion() );
+ assertEquals( "type", "jar", artifact.getType() );
+ assertEquals(
+ "url",
+ artifact.getURL( null ),
+ "/" + group + "/jars/" + name + "-" + version + ".jar" );
}
public void testJarArtifactCreationBySimpleSpec() throws Exception
@@ -189,36 +194,45 @@
ClassicArtifact artifact = ClassicArtifact.createJarArtifact( spec );
assertNotNull( artifact );
- assertTrue( "group", "xxx".equals( artifact.getGroup() ) );
- assertTrue( "name", "xxx".equals( artifact.getName() ) );
- assertTrue( "version", artifact.getVersion() == null );
- assertTrue( "type", artifact.getType() == "jar" );
- assertTrue( "url", artifact.getURL( null ).equals( "/xxx/jars/xxx.jar" ) );
+ assertEquals( "group", "xxx", artifact.getGroup() );
+ assertEquals( "name", "xxx", artifact.getName() );
+ assertNull( "version", artifact.getVersion() );
+ assertEquals( "type", artifact.getType(), "jar" );
+ assertEquals(
+ "url",
+ artifact.getURL( null ),
+ "/xxx/jars/xxx.jar" );
}
public void testJarArtifactCreationByCompoundSpec() throws Exception
{
final String spec = "xxx:yyy";
- ClassicArtifact artifact = ClassicArtifact.createJarArtifact( spec );
+ ClassicArtifact artifact =
+ ClassicArtifact.createJarArtifact( spec );
assertNotNull( artifact );
- assertTrue( "group", artifact.getGroup().equals( "xxx" ) );
- assertTrue( "name", artifact.getName().equals( "yyy" ) );
- assertTrue( "type", artifact.getType().equals( "jar" ) );
- assertTrue( "url", artifact.getURL( null ).equals(
- "/xxx/jars/yyy.jar" ) );
+ assertEquals( "group", artifact.getGroup(), "xxx" );
+ assertEquals( "name", artifact.getName(), "yyy" );
+ assertEquals( "type", artifact.getType(), "jar" );
+ assertEquals(
+ "url",
+ artifact.getURL( null ),
+ "/xxx/jars/yyy.jar" );
}
public void testJarArtifactCreationBySpec() throws Exception
{
final String spec = "xxx:yyy;zzz";
- ClassicArtifact artifact = ClassicArtifact.createJarArtifact( spec );
+ ClassicArtifact artifact =
+ ClassicArtifact.createJarArtifact( spec );
assertNotNull( artifact );
- assertTrue( "group", artifact.getGroup().equals( "xxx" ) );
- assertTrue( "name", artifact.getName().equals( "yyy" ) );
- assertTrue( "version", artifact.getVersion().equals( "zzz" ) );
- assertTrue( "type", artifact.getType().equals( "jar" ) );
- assertTrue( "url", artifact.getURL( null ).equals(
- "/xxx/jars/yyy-zzz.jar" ) );
+ assertEquals( "group", artifact.getGroup(), "xxx" );
+ assertEquals( "name", artifact.getName(), "yyy" );
+ assertEquals( "version", artifact.getVersion(), "zzz" );
+ assertEquals( "type", artifact.getType(), "jar" );
+ assertEquals(
+ "url",
+ artifact.getURL( null ),
+ "/xxx/jars/yyy-zzz.jar" );
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org