Author: ozizka(a)redhat.com Date: 2009-01-20 17:51:51 -0500 (Tue, 20 Jan 2009) New Revision: 117 Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/DatasourceTestBase.java Log: Changing all private methods to protected... all are candidates for overriding. Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/DatasourceTestBase.java =================================================================== --- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/DatasourceTestBase.java 2009-01-20 21:55:10 UTC (rev 116) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/DatasourceTestBase.java 2009-01-20 22:51:51 UTC (rev 117) @@ -707,7 +707,7 @@ * Create a basic Local TX Datasource. Return the mapping of property * names to property values. */ - private Map<String, String> createLocalTXDatasource(String datasourceName) throws IOException { + protected Map<String, String> createLocalTXDatasource(String datasourceName) throws IOException { Map<String, String> propertiesMap = new HashMap<String, String>(); propertiesMap.put("jndi-name", datasourceName); propertiesMap.put("max-pool-size", "20"); @@ -734,7 +734,7 @@ * Create a basic No TX Datasource. Return the mapping of property * names to property values. */ - private Map<String, String> createNoTXDatasource(String datasourceName) throws IOException { + protected Map<String, String> createNoTXDatasource(String datasourceName) throws IOException { Map<String, String> propertiesMap = new HashMap<String, String>(); propertiesMap.put("jndi-name", datasourceName); propertiesMap.put("prefill", "true"); @@ -763,7 +763,7 @@ * Create a basic XA Datasource. Return the mapping of property * name to property values. */ - private Map<String, String> createXADatasource(String datasourceName) throws IOException { + protected Map<String, String> createXADatasource(String datasourceName) throws IOException { Map<String, String> propertiesMap = new HashMap<String, String>(); propertiesMap.put("jndi-name", datasourceName); propertiesMap.put("xa-datasource-class", "org.postgresql.xa.PGXADataSource"); @@ -829,7 +829,7 @@ * to the datasource given by jndiName contains the given element. * TODO: Refactor. */ - private boolean containsElement(String jndiName, String elementName) { + protected boolean containsElement(String jndiName, String elementName) { try { File file = new File(System.getProperty("jsfunit.deploy.dir") + "/" + jndiName + "-ds.xml"); @@ -853,7 +853,7 @@ * * @param metricsMap maps metric names to the expected metric values. */ - private void checkMetrics(String datasourceName, + protected void checkMetrics(String datasourceName, DatasourceType datasourceType, Map<String, String> metricsMap) throws IOException { @@ -890,7 +890,7 @@ /** * Perform the given operation on the given datasource. */ - private void performDatasourceOperation(String datasourceName, + protected void performDatasourceOperation(String datasourceName, String datasourceType, String operationName) throws IOException {