[embjopr-commits] EMBJOPR SVN: r568 - in trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5: datasources and 1 other directory.
Author: ozizka(a)redhat.com
Date: 2009-07-20 14:28:53 -0400 (Mon, 20 Jul 2009)
New Revision: 568
Modified:
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/ResourceTestBase.java
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/datasources/DatasourceOperationsTest.java
Log:
* JAAS security added to DatasourceOperationsTest
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/ResourceTestBase.java
===================================================================
---
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/ResourceTestBase.java 2009-07-20
17:32:46 UTC (rev 567)
+++
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/ResourceTestBase.java 2009-07-20
18:28:53 UTC (rev 568)
@@ -640,9 +640,9 @@
protected Map<String, String> formatListStatisticsResults(String jndiName,
ComponentType
componentType,
String[] specificProps)
throws Exception {
- Map<String, String> propertiesMap =
formatPropertiesMap(getSpecificComponentProperties(jndiName,
-
componentType,
-
listStatisticsProps));
+ Map<String, MetaValue> componentProps = getSpecificComponentProperties(
+ jndiName, componentType, listStatisticsProps, true); // true means JAAS secured.
+ Map<String, String> propertiesMap = formatPropertiesMap( componentProps );
// Set up the expected values
Map<String, String> expectedStatistics = new LinkedHashMap<String,
String>();
Modified:
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/datasources/DatasourceOperationsTest.java
===================================================================
---
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/datasources/DatasourceOperationsTest.java 2009-07-20
17:32:46 UTC (rev 567)
+++
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/datasources/DatasourceOperationsTest.java 2009-07-20
18:28:53 UTC (rev 568)
@@ -22,8 +22,6 @@
package org.jboss.jopr.jsfunit.as5.datasources;
-import org.jboss.jopr.jsfunit.*;
-import com.gargoylesoftware.htmlunit.html.*;
import java.util.*;
import junit.framework.Test;
import junit.framework.TestSuite;
@@ -305,7 +303,9 @@
deleteDatasource(propertiesMap.get("jndi-name"),
DatasourceType.LOCAL_TX_DATASOURCE);
}
}
-
+
+
+
/* LIST STATISTICS OPERATION */
/**
@@ -326,8 +326,7 @@
// Additional statistics that need to be checked
expectedStatistics.put("criteria", "ByContainer");
- expectedStatistics.put("name",
"jboss.jca:service=ManagedConnectionFactory,name="
- + jndiName);
+ expectedStatistics.put("name",
"jboss.jca:service=ManagedConnectionFactory,name="+jndiName);
expectedStatistics.put("subPoolCount", "0");
expectedStatistics.put("totalConnectionsInUseCount", "0");
expectedStatistics.put("totalMaxConnectionsInUseCount",
"0");