[embjopr-commits] EMBJOPR SVN: r233 - in trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit: as5 and 1 other directory.

[embjopr-commits at lists.jboss.org]

Author: ozizka at redhat.com
Date: 2009-03-17 14:34:16 -0400 (Tue, 17 Mar 2009)
New Revision: 233

Modified:
   trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/DatasourceTestBase.java
   trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/DatasourceTest.java
Log:
Added EmbJoprTestException to several tests which call getNodeArrow()

Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/DatasourceTestBase.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/DatasourceTestBase.java	2009-03-17 17:35:33 UTC (rev 232)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/DatasourceTestBase.java	2009-03-17 18:34:16 UTC (rev 233)
@@ -162,7 +162,8 @@
      */
     protected abstract void createDatasource(DatasourceType datasourceType,
                                              String datasourceTemplate,
-                                             Map<String, String> propertiesMap) throws IOException;
+                                             Map<String, String> propertiesMap) 
+																						throws IOException, EmbJoprTestException;
 
     /**
      * Delete the datasource given by datasourceName.
@@ -401,7 +402,7 @@
      * Create a basic Local TX Datasource. Return the mapping of property
      * names to property values.
      */
-    protected Map<String, String> createLocalTXDatasource(String datasourceName) throws IOException {
+    protected Map<String, String> createLocalTXDatasource(String datasourceName) throws IOException, EmbJoprTestException {
         Map<String, String> propertiesMap = new HashMap<String, String>();
         propertiesMap.put("jndi-name", datasourceName);
         propertiesMap.put("max-pool-size", "20");
@@ -428,7 +429,7 @@
      * Create a basic No TX Datasource. Return the mapping of property
      * names to property values.
      */
-    protected Map<String, String> createNoTXDatasource(String datasourceName) throws IOException {
+    protected Map<String, String> createNoTXDatasource(String datasourceName) throws IOException, EmbJoprTestException {
         Map<String, String> propertiesMap = new HashMap<String, String>();
         propertiesMap.put("jndi-name", datasourceName);
         propertiesMap.put("prefill", "true");
@@ -457,7 +458,7 @@
      * Create a basic XA Datasource. Return the mapping of property
      * name to property values.
      */
-    protected Map<String, String> createXADatasource(String datasourceName) throws IOException {
+    protected Map<String, String> createXADatasource(String datasourceName) throws IOException, EmbJoprTestException {
         Map<String, String> propertiesMap = new HashMap<String, String>();
         propertiesMap.put("jndi-name", datasourceName);
         propertiesMap.put("xa-datasource-class", "org.postgresql.xa.PGXADataSource");
@@ -666,7 +667,7 @@
 		 *
 		 * TODO:  Check if works for AS 4 .
      */
-    public void testCreateDatasourceMissingRequiredValues() throws IOException {
+    public void testCreateDatasourceMissingRequiredValues() throws IOException, EmbJoprTestException {
         
         // Leave jndi-name and connection-url unset
         Map<String, String> propertiesMap = new HashMap<String, String>();
@@ -699,7 +700,7 @@
 		 *
 		 * TODO:  Check if works for AS 4 .
      */
-    public void testCreateDatasourcePropertyOutOfRange() throws IOException {
+    public void testCreateDatasourcePropertyOutOfRange() throws IOException, EmbJoprTestException {
         Map<String, String> propertiesMap = new HashMap<String, String>();
         propertiesMap.put("jndi-name", "InvalidDS");
         propertiesMap.put("user-name", "testUser");
@@ -727,7 +728,7 @@
 		 *
 		 * TODO:  Check if works for AS 4 .
      */
-    public void testCreateDatasourceInvalidPropertyType() throws IOException {
+    public void testCreateDatasourceInvalidPropertyType() throws IOException, EmbJoprTestException {
         Map<String, String> propertiesMap = new HashMap<String, String>();
         propertiesMap.put("jndi-name", "InvalidDS");
         propertiesMap.put("min-pool-size", "10");
@@ -755,7 +756,7 @@
      * that is the correct type but is not an allowed value for that
      * property. An error should occur.
      */
-    public void testCreateDatasourcePropertyNotAllowed() throws IOException {
+    public void testCreateDatasourcePropertyNotAllowed() throws IOException, EmbJoprTestException {
         Map<String, String> propertiesMap = new HashMap<String, String>();
         propertiesMap.put("jndi-name", "InvalidDS");
         propertiesMap.put("driver-class", "org.hsqldb.jdbcDriver");
@@ -781,7 +782,7 @@
      * Attempt to create a new datasource using a JNDI name that already exists.
      * An error should occur.
      */
-    public void testCreateDatasourceDuplicateJNDIName() throws IOException {
+    public void testCreateDatasourceDuplicateJNDIName() throws IOException, EmbJoprTestException {
         Map<String, String> propertiesMap = new HashMap<String, String>();
         propertiesMap.put("jndi-name", "DefaultDS");
         propertiesMap.put("driver-class", "org.hsqldb.jdbcDriver");

Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/DatasourceTest.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/DatasourceTest.java	2009-03-17 17:35:33 UTC (rev 232)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/DatasourceTest.java	2009-03-17 18:34:16 UTC (rev 233)
@@ -65,7 +65,7 @@
     @Override
     protected void createDatasource(DatasourceType datasourceType,
                                     String datasourceTemplate,
-                                    Map<String, String> propertiesMap) throws IOException {
+                                    Map<String, String> propertiesMap) throws IOException, EmbJoprTestException {
 
         // Expand the "Datasources" tree node
         ClickableElement datasourcesArrow = getNavTreeArrow(DS_NAV_LABEL);