niclas 2004/01/19 13:46:47
Modified: merlin/composition/impl/src/test/conf secure-block.xml
merlin/composition/impl/src/test/org/apache/avalon/composition/model
AbstractTestCase.java
merlin/composition/impl/src/test/org/apache/avalon/composition/model/test
SecurityTestCase.java
Log:
Testcase for code level security in composition.
Revision Changes Path
1.2 +1 -1 avalon/merlin/composition/impl/src/test/conf/secure-block.xml
Index: secure-block.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/test/conf/secure-block.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- secure-block.xml 19 Jan 2004 01:26:19 -0000 1.1
+++ secure-block.xml 19 Jan 2004 21:46:47 -0000 1.2
@@ -1,4 +1,4 @@
-
+<?xml version="1.0" encoding="ISO-8859-1"?>
<container name="secure-block">
1.4 +1 -1
avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/AbstractTestCase.java
Index: AbstractTestCase.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/AbstractTestCase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractTestCase.java 13 Jan 2004 11:41:27 -0000 1.3
+++ AbstractTestCase.java 19 Jan 2004 21:46:47 -0000 1.4
@@ -64,7 +64,7 @@
try
{
SystemContext system =
- DefaultSystemContext.createSystemContext( base, repository,
PRIORITY );
+ DefaultSystemContext.createSystemContext( base, repository,
PRIORITY, true );
m_model = system.getFactory().createContainmentModel(
source.toURL() );
}
catch( Throwable e )
1.2 +8 -0
avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/test/SecurityTestCase.java
Index: SecurityTestCase.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/test/SecurityTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SecurityTestCase.java 19 Jan 2004 01:26:19 -0000 1.1
+++ SecurityTestCase.java 19 Jan 2004 21:46:47 -0000 1.2
@@ -43,4 +43,12 @@
for( int i=0 ; i < 3 ; i++ )
assertEquals( "Permission is not the expected.", p[i], permissions[i] );
}
+
+ public void testSecureExecutionFlag()
+ throws Exception
+ {
+ m_model.assemble();
+ boolean secure = m_model.isSecureExecutionEnabled();
+ assertEquals( "Secure Execution Flag not working.", true, secure );
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
