You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by no...@apache.org on 2010/03/04 22:15:29 UTC
svn commit: r919186 - in
/incubator/aries/trunk/testsupport/testsupport-unit/src/main/java/org/apache/aries/unittest:
fixture/ArchiveFixture.java mocks/Skeleton.java
Author: not
Date: Thu Mar 4 21:15:27 2010
New Revision: 919186
URL: http://svn.apache.org/viewvc?rev=919186&view=rev
Log:
ARIES-174 Fixed some minor issues with test support while writing the OBRAriesResolver itests.
Modified:
incubator/aries/trunk/testsupport/testsupport-unit/src/main/java/org/apache/aries/unittest/fixture/ArchiveFixture.java
incubator/aries/trunk/testsupport/testsupport-unit/src/main/java/org/apache/aries/unittest/mocks/Skeleton.java
Modified: incubator/aries/trunk/testsupport/testsupport-unit/src/main/java/org/apache/aries/unittest/fixture/ArchiveFixture.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/testsupport/testsupport-unit/src/main/java/org/apache/aries/unittest/fixture/ArchiveFixture.java?rev=919186&r1=919185&r2=919186&view=diff
==============================================================================
--- incubator/aries/trunk/testsupport/testsupport-unit/src/main/java/org/apache/aries/unittest/fixture/ArchiveFixture.java (original)
+++ incubator/aries/trunk/testsupport/testsupport-unit/src/main/java/org/apache/aries/unittest/fixture/ArchiveFixture.java Thu Mar 4 21:15:27 2010
@@ -374,6 +374,9 @@
* @return
*/
public ZipFixture binary(String path, InputStream input) throws IOException {
+
+ if (input == null) throw new IllegalArgumentException("Provided input stream cannot be null");
+
IStreamFixture child = new IStreamFixture(this, input);
children.add(new ChildFixture(path, child));
Modified: incubator/aries/trunk/testsupport/testsupport-unit/src/main/java/org/apache/aries/unittest/mocks/Skeleton.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/testsupport/testsupport-unit/src/main/java/org/apache/aries/unittest/mocks/Skeleton.java?rev=919186&r1=919185&r2=919186&view=diff
==============================================================================
--- incubator/aries/trunk/testsupport/testsupport-unit/src/main/java/org/apache/aries/unittest/mocks/Skeleton.java (original)
+++ incubator/aries/trunk/testsupport/testsupport-unit/src/main/java/org/apache/aries/unittest/mocks/Skeleton.java Thu Mar 4 21:15:27 2010
@@ -263,7 +263,7 @@
{
return (Skeleton)ih;
}
- throw new IllegalArgumentException("The supplied proxy (" + mock + ") was not a (Jetstream mediations) dynamic mock ");
+ throw new IllegalArgumentException("The supplied proxy (" + mock + ") was not an Aries dynamic mock ");
}
/* ------------------------------------------------------------------------ */
@@ -989,7 +989,7 @@
{
Assert.assertFalse( "The method call " +
call +
- "occurred in the skeleton " +
+ " occurred in the skeleton " +
this.toString(), checkCall(call));
}