EMBJOPR SVN: r569 - trunk.
by embjopr-commits＠lists.jboss.org
Author: ips
Date: 2009-07-21 19:08:27 -0400 (Tue, 21 Jul 2009)
New Revision: 569
Modified:
trunk/pom.xml
Log:
switch to non-snapshot deps to prepare for 1.3.0.Beta2 release
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-07-20 18:28:53 UTC (rev 568)
+++ trunk/pom.xml 2009-07-21 23:08:27 UTC (rev 569)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.0.EmbJopr.1_3_0-2</version>
</parent>
<groupId>org.jboss.jopr</groupId>
@@ -64,9 +64,9 @@
<!-- dependency versions -->
<jaxb-api.version>2.1</jaxb-api.version>
<jaxb-impl.version>2.1.6</jaxb-impl.version>
- <jopr.version>2.3.0-SNAPSHOT</jopr.version>
+ <jopr.version>2.3.0.EmbJopr.1.3.0-2</jopr.version>
<richfaces.version>3.3.0.GA</richfaces.version>
- <rhq.version>1.3.0-SNAPSHOT</rhq.version>
+ <rhq.version>1.3.0.EmbJopr.1_3_0-2</rhq.version>
<seam.version>2.1.0.SP1</seam.version>
<seam.embedded.version>beta3.SP3</seam.embedded.version>
<!-- This is a special patched version of not-yet-released Facelets 1.1.15,
16 years, 9 months
EMBJOPR SVN: r568 - in trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5: datasources and 1 other directory.
by embjopr-commits＠lists.jboss.org
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");
16 years, 9 months
EMBJOPR SVN: r567 - in trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit: as5 and 1 other directories.
by embjopr-commits＠lists.jboss.org
Author: ozizka(a)redhat.com
Date: 2009-07-20 13:32:46 -0400 (Mon, 20 Jul 2009)
New Revision: 567
Modified:
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/ResourceTestBase.java
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories/ConnFactoryConfigurationTest.java
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories/ConnFactoryTest.java
Log:
* JAAS security added to ConnFactoryTest - done, all tests pass.
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java 2009-07-20 15:05:38 UTC (rev 566)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java 2009-07-20 17:32:46 UTC (rev 567)
@@ -26,7 +26,6 @@
import com.gargoylesoftware.htmlunit.html.*;
import java.io.IOException;
import java.util.*;
-import java.util.logging.Level;
import org.jboss.logging.*;
import org.apache.cactus.ServletTestCase;
import org.jboss.jsfunit.framework.WebClientSpec;
@@ -947,7 +946,20 @@
protected Map<String, MetaValue> getSpecificComponentProperties(String componentName,
ComponentType type,
String specificProperties[]) throws Exception {
- ManagedComponent component = getManagedComponent(componentName, type);
+ return getSpecificComponentProperties(componentName, type, specificProperties, false);
+ }
+
+ /**
+ * Create a map of property names to property values for a particular
+ * component. The desired property names are given by specificProperties.
+ * (This is useful when we need to check the values of some specific properties
+ * only - eg. the configuration tests)
+ */
+ protected Map<String, MetaValue> getSpecificComponentProperties(String componentName,
+ ComponentType type,
+ String specificProperties[],
+ boolean secured) throws Exception {
+ ManagedComponent component = getManagedComponent(componentName, type, secured);
assertNotNull("The returned component was null", component);
assertEquals(componentName, component.getName());
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 15:05:38 UTC (rev 566)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/ResourceTestBase.java 2009-07-20 17:32:46 UTC (rev 567)
@@ -24,7 +24,6 @@
import com.gargoylesoftware.htmlunit.html.*;
import java.io.IOException;
-import junit.framework.Test;
import org.jboss.jopr.jsfunit.*;
import java.util.Map;
import org.jboss.metatype.api.values.MetaValue;
@@ -33,12 +32,10 @@
import org.jdom.input.SAXBuilder;
import java.io.File;
import org.jboss.managed.api.ComponentType;
-import org.jboss.jopr.jsfunit.exceptions.EmbJoprTestException;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.LinkedHashMap;
-import org.jboss.jopr.jsfunit.util.EmbJoprTestToolkit;
import org.jboss.jopr.jsfunit.util.EmbJoprTestToolkit.NavTreeNode;
import org.jboss.jopr.jsfunit.exceptions.*;
@@ -176,7 +173,8 @@
Map<String, String> formattedPropertiesMap = formatPropertiesMap(propertiesMap);
fillOutForm(formattedPropertiesMap, RESOURCE_CONFIGURATION_FORM);
}
-
+
+
/**
* Configure the properties associated with this resource
* and verify that the properties were updated appropriately.
@@ -217,19 +215,29 @@
// Verify that the properties were set correctly
checkComponentProperties(propertiesMapChanges, resourceName, componentType, secured);
}
-
+
+
/**
* Unset the specified properties for the given resource.
- *
* @param propertiesMap is a map of property names to expected property values
*/
+ protected void unsetResourceProperties(String category, String subCategory, String name, Map<String, MetaValue> propsMap,
+ String[] propsToUnset, ComponentType componentType, String expectedMessage) throws Exception {
+ unsetResourceProperties(subCategory, subCategory, name, propsMap, propsToUnset, componentType, expectedMessage, false);
+ }
+
+ /**
+ * Unset the specified properties for the given resource.
+ * @param propertiesMap is a map of property names to expected property values
+ */
protected void unsetResourceProperties(String resourceCategory,
String resourceSubCategory,
String resourceName,
Map<String, MetaValue> propertiesMap,
String[] propertiesToUnset,
ComponentType componentType,
- String expectedMessage) throws Exception {
+ String expectedMessage,
+ boolean secured) throws Exception {
// Navigate to the configuration page for the resource
navigateToPage(resourceCategory, resourceSubCategory,
@@ -246,9 +254,10 @@
checkClientAndServerMessages(expectedMessage, expectedMessage, false);
// Make sure the rest of the properties remained unchanged
- checkComponentProperties(propertiesMap, resourceName, componentType);
+ checkComponentProperties(propertiesMap, resourceName, componentType, secured);
}
-
+
+
/**
* Delete the given resource.
*
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories/ConnFactoryConfigurationTest.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories/ConnFactoryConfigurationTest.java 2009-07-20 15:05:38 UTC (rev 566)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories/ConnFactoryConfigurationTest.java 2009-07-20 17:32:46 UTC (rev 567)
@@ -33,15 +33,16 @@
/**
* This class contains tests for configuring Connection Factories with JBoss AS 5.
- *
+ *
+ * Note: Fixed to work with JAAS. Could have been coded more nicely by providing some TestInfo interface,
+ * but I got that idea when it was already done through "boolean secured"...
+ * So now all methods involved in this test working with ProfileService have this param added.
+ *
* @author Farah Juma
*
*/
-
public class ConnFactoryConfigurationTest extends ConnFactoryTest {
- private static final boolean SECURED = true;
- private static final boolean UNSECURED = false;
/*
@@ -113,7 +114,7 @@
*/
public void testConfigureNoTxConnectionFactoryChangePropertiesUsingExistingDSFile() throws Exception {
String jndiName = "ChangePropertiesExistingNoTxCF";
- Map<String, MetaValue> propertiesMap = getComponentProperties(jndiName, NO_TX_COMPONENT_TYPE);
+ Map<String, MetaValue> propertiesMap = getComponentProperties(jndiName, NO_TX_COMPONENT_TYPE, SECURED);
// Change some property values that are already set
Map<String, MetaValue> propertiesMapChanges = new LinkedHashMap<String, MetaValue>();
@@ -229,7 +230,7 @@
unsetResourceProperties(CF_NAV_LABEL, cfType.getLabel(),
jndiName, propertiesMap, propertiesToUnset,
- componentType, expectedMessage);
+ componentType, expectedMessage, SECURED);
assertTrue("The connection factory is not deployed ", isDeployed(jndiName + "-ds.xml", SECURED));
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories/ConnFactoryTest.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories/ConnFactoryTest.java 2009-07-20 15:05:38 UTC (rev 566)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories/ConnFactoryTest.java 2009-07-20 17:32:46 UTC (rev 567)
@@ -22,12 +22,7 @@
package org.jboss.jopr.jsfunit.as5.connfactories;
-import com.gargoylesoftware.htmlunit.html.*;
-import org.jboss.jopr.jsfunit.*;
-import junit.framework.Test;
-import junit.framework.TestSuite;
import org.jboss.jopr.jsfunit.exceptions.*;
-import org.jboss.jopr.jsfunit.util.EmbJoprTestToolkit;
import org.jboss.jopr.jsfunit.util.EmbJoprTestToolkit.*;
import org.jboss.jopr.jsfunit.as5.ResourceTestBase;
import org.jboss.deployers.spi.management.KnownComponentTypes;
@@ -58,8 +53,12 @@
*/
public abstract class ConnFactoryTest extends ResourceTestBase {
- public enum CFType {
+ protected static final boolean SECURED = true;
+ protected static final boolean UNSECURED = false;
+
+ public enum CFType {
+
NO_TX_CF("No Tx ConnectionFactories", NO_TXCF_DEFAULT_TEMPLATE,
"No Tx ConnectionFactory", "no-tx-connection-factory"),
LOCAL_TX_CF("Tx ConnectionFactories", TXCF_LOCAL_TEMPLATE,
@@ -353,6 +352,6 @@
"prefill", "idle-timeout-minutes",
"allocation-retry", "use-java-context",
"no-tx-separate-pools", "blocking-timeout-millis" };
- return super.getSpecificComponentProperties(componentName, type, specificProperties);
+ return super.getSpecificComponentProperties(componentName, type, specificProperties, SECURED);
}
}
16 years, 9 months
EMBJOPR SVN: r566 - in trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit: as5 and 4 other directories.
by embjopr-commits＠lists.jboss.org
Author: ozizka(a)redhat.com
Date: 2009-07-20 11:05:38 -0400 (Mon, 20 Jul 2009)
New Revision: 566
Added:
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/jaas/
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/jaas/JBossCallbackHandler.java
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/jaas/JBossConfiguration.java
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/jaas/JaasAuthenticationInvocationHandler.java
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/jaas/JaasUtils.java
Modified:
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/ResourceTestBase.java
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories/ConnFactoryConfigurationTest.java
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations/JMSConfigurationTest.java
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations/JMSMetricsTest.java
Log:
* JAAS security added to ConnFactoryTest
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java 2009-07-20 11:27:25 UTC (rev 565)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java 2009-07-20 15:05:38 UTC (rev 566)
@@ -26,6 +26,7 @@
import com.gargoylesoftware.htmlunit.html.*;
import java.io.IOException;
import java.util.*;
+import java.util.logging.Level;
import org.jboss.logging.*;
import org.apache.cactus.ServletTestCase;
import org.jboss.jsfunit.framework.WebClientSpec;
@@ -48,6 +49,7 @@
import org.jboss.jopr.jsfunit.exceptions.EmbJoprTestException;
import org.jboss.jopr.jsfunit.exceptions.HtmlElementNotFoundException;
import org.jboss.jopr.jsfunit.util.EmbJoprTestToolkit;
+import org.jboss.jopr.jsfunit.util.jaas.JaasUtils;
/**
@@ -869,7 +871,8 @@
return formattedPropertiesMap;
}
-
+
+
/**
* Check the properties for a particular managed component.
*
@@ -877,11 +880,22 @@
* @param componentName - the name of the ManagedComponent
* @param type - the component type
*/
- protected void checkComponentProperties(Map<String, MetaValue> expectedProperties,
- String componentName,
- ComponentType type) throws Exception {
+ protected void checkComponentProperties(Map<String, MetaValue> expectedProperties, String componentName,
+ ComponentType type) throws Exception {
+ checkComponentProperties(expectedProperties, componentName, type, false);
+ }
+
+ /**
+ * Check the properties for a particular managed component.
+ *
+ * @param expectedProperties maps property names to expected values
+ * @param componentName - the name of the ManagedComponent
+ * @param type - the component type
+ */
+ protected void checkComponentProperties(Map<String, MetaValue> expectedProperties, String componentName,
+ ComponentType type, boolean secured) throws Exception {
- Map<String, MetaValue> actualProperties = getComponentProperties(componentName, type);
+ Map<String, MetaValue> actualProperties = getComponentProperties(componentName, type, secured);
// Verify that the property values are correct
for(String propertyName : expectedProperties.keySet()) {
@@ -891,13 +905,22 @@
}
}
+
/**
- * Create a map of property names to property values for a particular
- * component.
+ * Create a map of property names to property values for a particular component. Unsecured.
*/
protected Map<String, MetaValue> getComponentProperties(String componentName,
ComponentType type) throws Exception {
- ManagedComponent component = getManagedComponent(componentName, type);
+ return getComponentProperties(componentName, type, false);
+ }
+
+ /**
+ * Create a map of property names to property values for a particular component.
+ */
+ protected Map<String, MetaValue> getComponentProperties(String componentName,
+ ComponentType type, boolean secured) throws Exception
+ {
+ ManagedComponent component = getManagedComponent(componentName, type, secured);
assertNotNull("The returned component was null; Name: "+componentName, component);
assertEquals(componentName, component.getName());
@@ -913,7 +936,8 @@
return propertiesMap;
}
-
+
+
/**
* Create a map of property names to property values for a particular
* component. The desired property names are given by specificProperties.
@@ -946,9 +970,14 @@
*/
protected ManagedComponent getManagedComponent(String componentName,
ComponentType type) throws Exception {
+ return getManagedComponent(componentName, type, false);
+ }
+ protected ManagedComponent getManagedComponent(String componentName,
+ ComponentType type, boolean secured) throws Exception {
+
// Get the ManagedComponent
- ManagementView mgtView = getCurrentProfileView();
+ ManagementView mgtView = getCurrentProfileView( secured );
ManagedComponent component = mgtView.getComponent(componentName, type);
return component;
@@ -960,7 +989,16 @@
* @param deployment - the deployment we are interested in
*/
protected boolean isDeployed(String deployment) throws Exception {
- ManagementView currentProfileView = getCurrentProfileView();
+ return isDeployed(deployment, false);
+ }
+ /**
+ * Return whether or not the given deployment is deployed.
+ *
+ * @param deployment - the deployment we are interested in
+ * @param secured If true, JAAS secured ManagementView is used.
+ */
+ protected boolean isDeployed(String deployment, boolean secured) throws Exception {
+ ManagementView currentProfileView = getCurrentProfileView(secured);
ManagedDeployment managedDeployment = null;
try {
@@ -975,6 +1013,21 @@
/**
* Get the profile service.
*/
+ protected ProfileService getProfileService( boolean secured ){
+ return secured ? getProfileServiceSecured() : getProfileService();
+ }
+
+ protected ProfileService getProfileServiceSecured()
+ {
+ try {
+ return JaasUtils.getInstance().getProfileService();
+ } catch (NamingException ex) {
+ // Farah's methods don't propagate exceptions -> report and swallow.
+ log.error("Can't get secured ProfileService: " + ex.toString(), ex);
+ return null;
+ }
+ }
+
protected ProfileService getProfileService()
{
ProfileService profileService = null;
@@ -1000,8 +1053,25 @@
/**
* Get the current profile view.
+ * @param secured If true, returns JAAS profile view of secured profile service.
*/
- protected ManagementView getCurrentProfileView()
+ protected ManagementView getCurrentProfileView( boolean secured ){ return secured ? getCurrentProfileViewSecured() : getCurrentProfileView(); }
+
+ /**
+ * Get the current profile view.
+ */
+ protected ManagementView getCurrentProfileViewSecured(){
+ try {
+ ManagementView view = JaasUtils.getInstance().getManagementView();
+ view.load();
+ return view;
+ } catch (NamingException ex) {
+ log.error("Can't get ManagementView: "+ex);
+ return null;
+ }
+ }
+
+ protected ManagementView getCurrentProfileView()
{
ProfileService profileService = getProfileService();
ManagementView currentProfileView = profileService.getViewManager();
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 11:27:25 UTC (rev 565)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/ResourceTestBase.java 2009-07-20 15:05:38 UTC (rev 566)
@@ -180,17 +180,30 @@
/**
* Configure the properties associated with this resource
* and verify that the properties were updated appropriately.
- *
+ *
* Assumes the resource tree node (eg. "JMS Destinations", "Datasources",
* etc.) is already expanded.
*/
- protected void configureResource(String resourceCategory,
+ protected void configureResource(String category, String subCategory, String name, Map<String, MetaValue> propsMap,
+ Map<String, MetaValue> propsMapChanges, ComponentType componentType, String expectedMessage) throws Exception {
+ configureResource(category, subCategory, name, propsMap, propsMapChanges, componentType, expectedMessage, false);
+ }
+
+ /**
+ * Configure the properties associated with this resource
+ * and verify that the properties were updated appropriately.
+ *
+ * Assumes the resource tree node (eg. "JMS Destinations", "Datasources",
+ * etc.) is already expanded.
+ */
+ protected void configureResource(String resourceCategory,
String resourceSubCategory,
String resourceName,
Map<String, MetaValue> propertiesMap,
Map<String, MetaValue> propertiesMapChanges,
ComponentType componentType,
- String expectedMessage) throws Exception {
+ String expectedMessage,
+ boolean secured) throws Exception {
// Navigate to the configuration page for the resource
navigateToPage(resourceCategory, resourceSubCategory,
@@ -202,7 +215,7 @@
checkClientAndServerMessages(expectedMessage, expectedMessage, false);
// Verify that the properties were set correctly
- checkComponentProperties(propertiesMapChanges, resourceName, componentType);
+ checkComponentProperties(propertiesMapChanges, resourceName, componentType, secured);
}
/**
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories/ConnFactoryConfigurationTest.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories/ConnFactoryConfigurationTest.java 2009-07-20 11:27:25 UTC (rev 565)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories/ConnFactoryConfigurationTest.java 2009-07-20 15:05:38 UTC (rev 566)
@@ -22,13 +22,8 @@
package org.jboss.jopr.jsfunit.as5.connfactories;
-import org.jboss.jopr.jsfunit.*;
-import com.gargoylesoftware.htmlunit.html.*;
-import java.io.*;
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.jboss.jopr.jsfunit.exceptions.*;
-import org.jboss.jopr.jsfunit.as5.ResourceTestBase;
import org.jboss.managed.api.ComponentType;
import org.jboss.metatype.api.values.SimpleValueSupport;
import org.jboss.metatype.api.values.MetaValue;
@@ -45,6 +40,10 @@
public class ConnFactoryConfigurationTest extends ConnFactoryTest {
+ private static final boolean SECURED = true;
+ private static final boolean UNSECURED = false;
+
+
/*
* CONFIGURATION TESTS
*/
@@ -75,7 +74,7 @@
*/
public void testConfigureTxConnectionFactoryChangePropertiesUsingExistingDSFile() throws Exception {
String jndiName = "ChangePropertiesExistingTxCF";
- Map<String, MetaValue> propertiesMap = getComponentProperties(jndiName, LOCAL_TX_COMPONENT_TYPE);
+ Map<String, MetaValue> propertiesMap = getComponentProperties(jndiName, LOCAL_TX_COMPONENT_TYPE, SECURED);
// Change some property values that are already set
Map<String, MetaValue> propertiesMapChanges = new LinkedHashMap<String, MetaValue>();
@@ -131,24 +130,22 @@
/**
* Common code for changing the property values of a connection factory.
*/
- private void changeConnFactoryProperties(String jndiName,
+ private void changeConnFactoryProperties(String jndiName,
CFType cfType,
ComponentType componentType,
Map<String, MetaValue> propertiesMapChanges,
Map<String, MetaValue> propertiesMap) throws Exception {
// The success message we should see
- String expectedMessage = UPDATE_MESSAGE + cfType.getName() + " '"
- + jndiName + "'";
+ String expectedMessage = UPDATE_MESSAGE + cfType.getName() + " '"+jndiName+"'";
// Change some property values and check that the properties of
// the ManagedComponent were updated appropriately
configureResource(CF_NAV_LABEL, cfType.getLabel(), jndiName,
propertiesMap, propertiesMapChanges, componentType,
- expectedMessage);
+ expectedMessage, SECURED);
- assertTrue("The connection factory is not deployed ",
- isDeployed(jndiName + "-ds.xml"));
+ assertTrue("The connection factory is not deployed ", isDeployed(jndiName + "-ds.xml", SECURED));
// Clean up
deleteConnFactory(cfType, jndiName);
@@ -228,15 +225,13 @@
propertiesMap.remove("min-pool-size");
// The success message we should see
- String expectedMessage = UPDATE_MESSAGE + cfType.getName() + " '"
- + jndiName + "'";
+ String expectedMessage = UPDATE_MESSAGE + cfType.getName() + " '"+jndiName+"'";
unsetResourceProperties(CF_NAV_LABEL, cfType.getLabel(),
jndiName, propertiesMap, propertiesToUnset,
componentType, expectedMessage);
- assertTrue("The connection factory is not deployed ",
- isDeployed(jndiName + "-ds.xml"));
+ assertTrue("The connection factory is not deployed ", isDeployed(jndiName + "-ds.xml", SECURED));
// Clean up
deleteConnFactory(cfType, jndiName);
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations/JMSConfigurationTest.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations/JMSConfigurationTest.java 2009-07-20 11:27:25 UTC (rev 565)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations/JMSConfigurationTest.java 2009-07-20 15:05:38 UTC (rev 566)
@@ -22,13 +22,8 @@
package org.jboss.jopr.jsfunit.as5.jmsDestinations;
-import com.gargoylesoftware.htmlunit.html.*;
-import junit.framework.Test;
import java.util.Map;
-import java.util.HashMap;
import java.util.LinkedHashMap;
-import org.jboss.jopr.jsfunit.*;
-import org.jboss.jopr.jsfunit.exceptions.EmbJoprTestException;
import org.jboss.metatype.api.values.MetaValue;
import org.jboss.metatype.api.values.SimpleValueSupport;
import org.jboss.managed.api.ComponentType;
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations/JMSMetricsTest.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations/JMSMetricsTest.java 2009-07-20 11:27:25 UTC (rev 565)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations/JMSMetricsTest.java 2009-07-20 15:05:38 UTC (rev 566)
@@ -399,8 +399,10 @@
expectedMetrics.put(COUNT_DELTA, "0");
expectedMetrics.put(DEPTH, "0");
expectedMetrics.put(DEPTH_DELTA, "0");
- expectedMetrics.put(TIME_LAST_UPDATE, "0");
-
+ //expectedMetrics.put(TIME_LAST_UPDATE, "0"); // This currently changes
+ //(09:27:08) ozizka: There's a metric, Time Last Update, which has a description: The timestamp of the last message add
+ //(09:27:31) ozizka: But it changes upon queue receiver creation... so, is the description wrong or the behavior?
+
checkDestinationMetrics(jndiName, expectedMetrics, getQueueSummaryMetrics(),
DestinationType.QUEUE);
}
Added: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/jaas/JBossCallbackHandler.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/jaas/JBossCallbackHandler.java (rev 0)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/jaas/JBossCallbackHandler.java 2009-07-20 15:05:38 UTC (rev 566)
@@ -0,0 +1,69 @@
+/*
+ * Jopr Management Platform
+ * Copyright (C) 2005-2009 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation, and/or the GNU Lesser
+ * General Public License, version 2.1, also as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License and the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * and the GNU Lesser General Public License along with this program;
+ * if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package org.jboss.jopr.jsfunit.util.jaas;
+
+import java.io.IOException;
+
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.UnsupportedCallbackException;
+import javax.security.auth.callback.NameCallback;
+import javax.security.auth.callback.PasswordCallback;
+
+/**
+ * @author Ian Springer
+ */
+public class JBossCallbackHandler implements CallbackHandler {
+ private String username;
+ private char[] password;
+
+ public JBossCallbackHandler(String username, String password)
+ {
+ this.username = username;
+ this.password = password.toCharArray();
+ }
+
+ public void handle(Callback[] callbacks) throws
+ IOException, UnsupportedCallbackException
+ {
+ for (Callback callback : callbacks)
+ {
+ //System.out.println("Handling Callback [" + callback + "]...");
+ if (callback instanceof NameCallback)
+ {
+
+ NameCallback nameCallback = (NameCallback)callback;
+ nameCallback.setName(this.username);
+ }
+ else if (callback instanceof PasswordCallback)
+ {
+ PasswordCallback passwordCallback = (PasswordCallback)callback;
+ passwordCallback.setPassword(this.password);
+ }
+ else
+ {
+ throw new UnsupportedCallbackException(callback, "Unrecognized Callback: " + callback);
+ }
+ }
+ }
+}
Added: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/jaas/JBossConfiguration.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/jaas/JBossConfiguration.java (rev 0)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/jaas/JBossConfiguration.java 2009-07-20 15:05:38 UTC (rev 566)
@@ -0,0 +1,66 @@
+/*
+ * Jopr Management Platform
+ * Copyright (C) 2005-2009 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation, and/or the GNU Lesser
+ * General Public License, version 2.1, also as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License and the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * and the GNU Lesser General Public License along with this program;
+ * if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package org.jboss.jopr.jsfunit.util.jaas;
+
+import java.util.Map;
+import java.util.HashMap;
+
+import javax.security.auth.login.Configuration;
+import javax.security.auth.login.AppConfigurationEntry;
+
+/**
+ * A JAAS configuration for a JBoss client. This is the programmatic equivalent of the following auth.conf file:
+ *
+ * <code>
+ * jboss
+ * {
+ * org.jboss.security.ClientLoginModule required
+ * multi-threaded=true;
+ * };
+ * </code>
+ *
+ * @author Ian Springer
+ */
+public class JBossConfiguration extends Configuration {
+ public static final String JBOSS_ENTRY_NAME = "jboss";
+
+ private static final String JBOSS_LOGIN_MODULE_CLASS_NAME = "org.jboss.security.ClientLoginModule";
+ private static final String MULTI_THREADED_OPTION = "multi-threaded";
+
+ public AppConfigurationEntry[] getAppConfigurationEntry(String name) {
+ if (JBOSS_ENTRY_NAME.equals(name)) {
+ Map options = new HashMap(1);
+ options.put(MULTI_THREADED_OPTION, Boolean.TRUE.toString());
+ AppConfigurationEntry appConfigurationEntry =
+ new AppConfigurationEntry(JBOSS_LOGIN_MODULE_CLASS_NAME,
+ AppConfigurationEntry.LoginModuleControlFlag.REQUIRED, options);
+ return new AppConfigurationEntry[] {appConfigurationEntry};
+ } else {
+ throw new IllegalArgumentException("Unknown entry name: " + name);
+ }
+ }
+
+ public void refresh() {
+ return;
+ }
+}
Added: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/jaas/JaasAuthenticationInvocationHandler.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/jaas/JaasAuthenticationInvocationHandler.java (rev 0)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/jaas/JaasAuthenticationInvocationHandler.java 2009-07-20 15:05:38 UTC (rev 566)
@@ -0,0 +1,58 @@
+/*
+ * Jopr Management Platform
+ * Copyright (C) 2005-2009 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation, and/or the GNU Lesser
+ * General Public License, version 2.1, also as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License and the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * and the GNU Lesser General Public License along with this program;
+ * if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package org.jboss.jopr.jsfunit.util.jaas;
+
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+
+import javax.security.auth.login.LoginException;
+import javax.security.auth.login.LoginContext;
+import javax.security.auth.login.Configuration;
+
+/**
+ * @author Ian Springer
+ */
+public class JaasAuthenticationInvocationHandler implements InvocationHandler {
+ private Object target;
+ private LoginContext loginContext;
+
+ public JaasAuthenticationInvocationHandler(Object target, String username, String password) {
+ this.target = target;
+ JBossCallbackHandler jaasCallbackHandler = new JBossCallbackHandler(username, password);
+ Configuration jaasConfig = new JBossConfiguration();
+ try {
+ this.loginContext = new LoginContext(JBossConfiguration.JBOSS_ENTRY_NAME, null, jaasCallbackHandler,
+ jaasConfig);
+ }
+ catch (LoginException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+ this.loginContext.login();
+ Object returnValue = method.invoke(this.target, args);
+ this.loginContext.logout();
+ return returnValue;
+ }
+}
Added: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/jaas/JaasUtils.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/jaas/JaasUtils.java (rev 0)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/jaas/JaasUtils.java 2009-07-20 15:05:38 UTC (rev 566)
@@ -0,0 +1,114 @@
+package org.jboss.jopr.jsfunit.util.jaas;
+
+import java.lang.reflect.Proxy;
+
+import java.util.Properties;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+import org.jboss.deployers.spi.management.ManagementView;
+import org.jboss.deployers.spi.management.deploy.DeploymentManager;
+import org.jboss.logging.Logger;
+import org.jboss.profileservice.spi.ProfileService;
+
+
+
+/**
+ * Singleton class to keep JAAS secured ProfileService, ManagementView and DeploymentManager.
+ * Partially copied from Jopr's test.EjbClient.
+ * @author Ondrej Zizka
+ */
+public class JaasUtils {
+
+ private static final Logger log = Logger.getLogger(JaasUtils.class);
+
+ // Singleton.
+ private static JaasUtils INSTANCE = null;
+ public static JaasUtils getInstance() throws NamingException {
+ if( null == INSTANCE ){
+ INSTANCE = new JaasUtils();
+ INSTANCE.init( true );
+ }
+ return INSTANCE;
+ }
+
+ private static final String JNDI_LOGIN_INITIAL_CONTEXT_FACTORY = "org.jboss.security.jndi.JndiLoginInitialContextFactory";
+ private static final String NAMING_CONTEXT_FACTORY = "org.jnp.interfaces.NamingContextFactory";
+ private static final String SECURE_PROFILE_SERVICE_JNDI_NAME = "SecureProfileService/remote";
+ private static final String SECURE_MANAGEMENT_VIEW_JNDI_NAME = "SecureManagementView/remote";
+ private static final String SECURE_DEPLOYMENT_MANAGER_JNDI_NAME = "SecureDeploymentManager/remote";
+ private static final String PROFILE_SERVICE_JNDI_NAME = "ProfileService";
+ private static final String MANAGEMENT_VIEW_JNDI_NAME = "ManagementView";
+ private static final String DEPLOYMENT_MANAGER_JNDI_NAME = "DeploymentManager";
+ private static final String PROFILE_SERVICE_PRINCIPAL = "admin";
+ private static final String PROFILE_SERVICE_CREDENTIALS = "admin";
+
+
+ ProfileService profileService;
+ ManagementView managementView;
+ DeploymentManager deploymentManager;
+
+ public DeploymentManager getDeploymentManager() { return deploymentManager; }
+ public ManagementView getManagementView() { return managementView; }
+ public ProfileService getProfileService() { return profileService; }
+
+
+ /**
+ * Obtains ProfileService, ManagementView and DeploymentManager.
+ * @param useJaas If true, all those three are secured with JAAS.
+ */
+ private void init(boolean useJaas) throws NamingException {
+
+ Properties env = new Properties();
+ env.setProperty(Context.PROVIDER_URL, "jnp://127.0.0.1:1099/");
+ env.setProperty(Context.INITIAL_CONTEXT_FACTORY, NAMING_CONTEXT_FACTORY);
+
+ InitialContext initialContext = createInitialContext(env);
+
+
+ if (!useJaas) {
+ this.profileService = (ProfileService) lookup(initialContext, PROFILE_SERVICE_JNDI_NAME);
+ this.managementView = this.profileService.getViewManager();
+ this.deploymentManager = this.profileService.getDeploymentManager();
+ }
+ else {
+ this.profileService = (ProfileService) lookup(initialContext, PROFILE_SERVICE_JNDI_NAME);
+ this.managementView = (ManagementView) lookup(initialContext, MANAGEMENT_VIEW_JNDI_NAME);
+ this.deploymentManager = (DeploymentManager) lookup(initialContext, DEPLOYMENT_MANAGER_JNDI_NAME);
+
+ //apply the jaas security
+ ClassLoader classLoader = JaasUtils.class.getClassLoader();
+ this.profileService = (ProfileService) Proxy.newProxyInstance(classLoader,
+ new Class<?>[]{ProfileService.class},
+ new JaasAuthenticationInvocationHandler( this.profileService, PROFILE_SERVICE_PRINCIPAL, PROFILE_SERVICE_CREDENTIALS ));
+
+ this.managementView = (ManagementView) Proxy.newProxyInstance(classLoader,
+ new Class<?>[]{ManagementView.class},
+ new JaasAuthenticationInvocationHandler( this.managementView, PROFILE_SERVICE_PRINCIPAL, PROFILE_SERVICE_CREDENTIALS ));
+
+ this.deploymentManager = (DeploymentManager) Proxy.newProxyInstance(classLoader,
+ new Class<?>[]{DeploymentManager.class},
+ new JaasAuthenticationInvocationHandler( this.deploymentManager, PROFILE_SERVICE_PRINCIPAL, PROFILE_SERVICE_CREDENTIALS ));
+ }
+
+ // This must be called before the other ManagementView operations may be used.
+ this.managementView.load();
+ }
+
+
+ private static InitialContext createInitialContext(Properties env) throws NamingException {
+ log.info("Creating JNDI InitialContext with env [" + env + "]...");
+ InitialContext initialContext = new InitialContext(env);
+ log.info("Created JNDI InitialContext [" + initialContext + "].");
+ return initialContext;
+ }
+
+ private static Object lookup(InitialContext initialContext, String name) throws NamingException {
+ log.info("Looking up name '" + name + "' from InitialContext...");
+ Object obj = initialContext.lookup(name);
+ log.info("Found Object: " + obj);
+ return obj;
+ }
+}// class
16 years, 9 months
EMBJOPR SVN: r565 - trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories.
by embjopr-commits＠lists.jboss.org
Author: ozizka(a)redhat.com
Date: 2009-07-20 07:27:25 -0400 (Mon, 20 Jul 2009)
New Revision: 565
Modified:
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories/ConnFactoryTest.java
Log:
* ConnFactoryTest: "track-connection-by-tx property" replaced with "intereaving"
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories/ConnFactoryTest.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories/ConnFactoryTest.java 2009-07-16 23:24:09 UTC (rev 564)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories/ConnFactoryTest.java 2009-07-20 11:27:25 UTC (rev 565)
@@ -180,8 +180,10 @@
propertiesMap.put("prefill", SimpleValueSupport.wrap(prefill));
propertiesMap.put("idle-timeout-minutes", SimpleValueSupport.wrap(new Integer(60)));
propertiesMap.put("allocation-retry", SimpleValueSupport.wrap(new Integer(10)));
- propertiesMap.put("track-connection-by-tx", SimpleValueSupport.wrap(Boolean.TRUE));
- propertiesMap.put("use-java-context", SimpleValueSupport.wrap(Boolean.TRUE));
+ //propertiesMap.put("track-connection-by-tx", SimpleValueSupport.wrap(Boolean.TRUE));
+ //This property supercedes the "track-connection-by-tx" property from earlier versions of JBoss AS.
+ propertiesMap.put("interleaving", SimpleValueSupport.wrap(Boolean.FALSE));
+ propertiesMap.put("use-java-context", SimpleValueSupport.wrap(Boolean.TRUE));
propertiesMap.put("no-tx-separate-pools", SimpleValueSupport.wrap(Boolean.FALSE));
propertiesMap.put("blocking-timeout-millis", SimpleValueSupport.wrap(new Integer(30000)));
propertiesMap.put("securityDeploymentType", SimpleValueSupport.wrap("APPLICATION"));
16 years, 9 months
EMBJOPR SVN: r564 - trunk/jsfunit.
by embjopr-commits＠lists.jboss.org
Author: ozizka(a)redhat.com
Date: 2009-07-16 19:24:09 -0400 (Thu, 16 Jul 2009)
New Revision: 564
Modified:
trunk/jsfunit/pom.xml
Log:
* Tests POM updated - tests added.
Modified: trunk/jsfunit/pom.xml
===================================================================
--- trunk/jsfunit/pom.xml 2009-07-16 22:50:23 UTC (rev 563)
+++ trunk/jsfunit/pom.xml 2009-07-16 23:24:09 UTC (rev 564)
@@ -444,15 +444,39 @@
<failIfNoTests>true</failIfNoTests>
<testFailureIgnore>true</testFailureIgnore>
<includes>
+ <!--
<include>**/as5/*Test.java</include>
<include>**/as5/app/ear/*Test.java</include>
<include>**/as5/app/war/*Test.java</include>
+ <include>**/as5/app/embwar/*Test.java</include>
<include>**/as5/app/rar/*Test.java</include>
<include>**/as5/app/ejb/*Test.java</include>
<include>**/as5/jmsDestinations/*Test.java</include>
<include>**/as5/datasources/*Test.java</include>
<include>**/as5/connfactories/*Test.java</include>
+ <include>**/as5/connectors/*Test.java</include>
<include>**/jsfunit/*Test.java</include>
+ -->
+
+ <include>**/as5/*Test.java</include>
+ <include>**/jsfunit/*Test.java</include>
+
+ <include>**/as5/connfactories/*Test.java</include>
+ <include>**/as5/datasources/*Test.java</include>
+ <include>**/as5/jmsDestinations/*Test.java</include>
+
+ <include>**/as5/app/war/*Test.java</include>
+ <include>**/as5/app/embwar/*Test.java</include>
+ <include>**/as5/app/ear/*Test.java</include>
+ <include>**/as5/app/rar/*Test.java</include>
+ <include>**/as5/app/ejb/*Test.java</include>
+
+ <include>**/as5/connectors/*Test.java</include>
+ <include>**/as5/sbm/*Test.java</include>
+ <include>**/as5/scripts/*Test.java</include>
+ <include>**/as5/hbn/*Test.java</include>
+ <include>**/as5/jbcache/*Test.java</include>
+
<!--
-->
</includes>
16 years, 9 months
EMBJOPR SVN: r563 - in trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit: as5/app/war and 1 other directories.
by embjopr-commits＠lists.jboss.org
Author: ozizka(a)redhat.com
Date: 2009-07-16 18:50:23 -0400 (Thu, 16 Jul 2009)
New Revision: 563
Added:
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbJoprTestConstants.java
Modified:
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/war/WarTest.java
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java
Log:
* War tests updated.
Added: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbJoprTestConstants.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbJoprTestConstants.java (rev 0)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbJoprTestConstants.java 2009-07-16 22:50:23 UTC (rev 563)
@@ -0,0 +1,23 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package org.jboss.jopr.jsfunit;
+
+/**
+ *
+ * @author Ondrej Zizka
+ */
+public interface EmbJoprTestConstants {
+
+ //public static final String AS_NODE_NAME_FORMAT = "JBoss AS 5 (%s)";
+ public static final String AS_NODE_NAME_FORMAT = "JBoss EAP 5 (%s)";
+
+ public static final String LABEL_AS_SERVERS_SUMMARY = "JBoss Application Server";
+
+}// interface
+
+
+
+
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java 2009-07-16 16:28:25 UTC (rev 562)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java 2009-07-16 22:50:23 UTC (rev 563)
@@ -60,7 +60,7 @@
* @author Ondrej Zizka
* @author Stan Silvert
*/
-public abstract class EmbjoprTestCase extends ServletTestCase {
+public abstract class EmbjoprTestCase extends ServletTestCase implements EmbJoprTestConstants {
protected final Logger log = Logger.getLogger(this.getClass().getName());
@@ -573,20 +573,21 @@
String expectedServerMsg,
FacesMessage.Severity expectedSeverity ) {
- // Check that the expected message appears on the client side
- assertTrue("This expected message was not found on the page: " + expectedClientMsg,
- client.getPageAsText().contains(expectedClientMsg));
-
// Check that the expected message appears on the server side
assertTrue("Expected message not found in faces messages (no messages in Faces)",
server.getFacesMessages().hasNext());
-
+
FacesMessage message = server.getFacesMessages().next();
assertEquals("Incorrect message severity", expectedSeverity, message.getSeverity());
-
+
assertTrue("Expected message: " + expectedServerMsg + " Actual: "+ message.getDetail(),
message.getDetail().contains(expectedServerMsg));
+
+ // Check that the expected message appears on the client side
+ assertTrue("This expected message was not found on the page: " + expectedClientMsg,
+ client.getPageAsText().contains(expectedClientMsg));
+
}
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/war/WarTest.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/war/WarTest.java 2009-07-16 16:28:25 UTC (rev 562)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/war/WarTest.java 2009-07-16 22:50:23 UTC (rev 563)
@@ -31,8 +31,6 @@
import org.jboss.jopr.jsfunit.*;
import com.gargoylesoftware.htmlunit.html.*;
import java.io.*;
-import java.net.InetAddress;
-import java.net.Socket;
import java.util.Properties;
import javax.faces.application.FacesMessage;
import junit.framework.Test;
@@ -293,8 +291,8 @@
client.getPageAsText().contains("UP"));
// Check whether the server is listed. If not, Exception is thrown.
ContentTableRow row =
- ejtt.getTabMenu().getTabContentBox().getTableUnderHeader("JBoss Application Server")
- .getFirstRowContainingLink("JBoss AS 5 ("+jbossConfig+")");
+ ejtt.getTabMenu().getTabContentBox().getTableUnderHeader(LABEL_AS_SERVERS_SUMMARY)
+ .getFirstRowContainingLink( String.format(AS_NODE_NAME_FORMAT, jbossConfig)); // "JBoss EAP 5 (...)");
// Click the server link
//HtmlAnchor link row.getLinkByLabel("JBoss App Server:default");
Node firstLink = row.getCellByColumnName("Name").getElementsByTagName("a").item(0);
@@ -494,7 +492,7 @@
// Metrics Summary - currently hidden.
- ContentTable metricsTable = ejtt.getTabMenu().getTabContentBox().getTableUnderHeader("Numeric Metrics");
+ ContentTable metricsTable = ejtt.getTabMenu().getTabContentBox().findTableUnderHeader("Numeric Metrics");
if( null == metricsTable )
log.info("Metrics table not present.");
else{
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java 2009-07-16 16:28:25 UTC (rev 562)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java 2009-07-16 22:50:23 UTC (rev 563)
@@ -689,6 +689,8 @@
/**
* Returns first table under given header.
+ * If the header is not found or there's no table following the header, returns null or throws HtmlElementNotFoundException,
+ * depending on throwIfNotFound.
*
* Unfortunately, headers are not H2 or similar, but DIV class="instructionalText".
* To be revised later.
@@ -713,6 +715,10 @@
return new ContentTable(tableElement);
}
+ /**
+ * Returns first table under given header.
+ * @throws HtmlElementNotFoundException if the header is not found or there's no table following the header.
+ */
public ContentTable getTableUnderHeader( String headerText ) throws ActionOutOfSyncException, HtmlElementNotFoundException {
return getTableUnderHeader(headerText, true );
}
16 years, 9 months
EMBJOPR SVN: r562 - trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit.
by embjopr-commits＠lists.jboss.org
Author: ozizka(a)redhat.com
Date: 2009-07-16 12:28:25 -0400 (Thu, 16 Jul 2009)
New Revision: 562
Modified:
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/LoginTest.java
Log:
* Login test - logging added
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/LoginTest.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/LoginTest.java 2009-07-15 18:26:10 UTC (rev 561)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/LoginTest.java 2009-07-16 16:28:25 UTC (rev 562)
@@ -46,10 +46,14 @@
public void testLoggedIn() throws IOException
{
+ log.info("Checking the presence of username - '"+LOGIN_USERNAME+"'.");
assertTrue( client.getPageAsText().contains(LOGIN_USERNAME) );
+
+ log.info("Checking the presence of the Logout link.");
assertTrue( client.getPageAsText().contains("Logout") );
- assertEquals("admin", server.getManagedBeanValue("#{identity.username}") );
+ log.info("Checking that #{identity.username} == '"+LOGIN_USERNAME+"'.");
+ assertEquals(LOGIN_USERNAME, server.getManagedBeanValue("#{identity.username}") );
}
16 years, 9 months
EMBJOPR SVN: r559 - trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/ear.
by embjopr-commits＠lists.jboss.org
Author: ozizka(a)redhat.com
Date: 2009-07-14 16:46:40 -0400 (Tue, 14 Jul 2009)
New Revision: 559
Modified:
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/ear/EarTest.java
Log:
* Ear tests renamed
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/ear/EarTest.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/ear/EarTest.java 2009-07-14 19:44:29 UTC (rev 558)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/ear/EarTest.java 2009-07-14 20:46:40 UTC (rev 559)
@@ -94,7 +94,7 @@
*
* Was failing: JMX doesn't report EAR as deployed: eardeployment.ear
*/
- public void testBasicEarDeployment() throws IOException, EmbJoprTestException
+ public void testEarBasicDeployment() throws IOException, EmbJoprTestException
{
final String DEPLOYABLE_NAME = BASIC_EAR;
@@ -253,7 +253,7 @@
* PASSED.
*/
- public void testNavigationToEar() throws IOException, HtmlElementNotFoundException, ActionOutOfSyncException, ActionNotAvailableException, EmbJoprTestException, InterruptedException
+ public void testEarNavigation() throws IOException, HtmlElementNotFoundException, ActionOutOfSyncException, ActionNotAvailableException, EmbJoprTestException, InterruptedException
{
// JBossAS Servers node
@@ -741,7 +741,7 @@
* PASSED.
* Now fails, because EAR does not appear.
*/
- public void testDeployUnpackedEar() throws IOException, EmbJoprTestException {
+ public void testEarDeployUnpacked() throws IOException, EmbJoprTestException {
// Deploy the unpacked EAR.
@@ -1189,7 +1189,7 @@
* deployed. Undeploy the archive for test clean up purposes.
*
*/
- public void testRarInEarDeployment() throws IOException, EmbJoprTestException
+ public void testEarRarInEarDeployment() throws IOException, EmbJoprTestException
{
final String DEPLOYABLE_NAME = EAR_WITH_RAR;
16 years, 9 months
EMBJOPR SVN: r558 - in trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit: as5 and 3 other directories.
by embjopr-commits＠lists.jboss.org
Author: ozizka(a)redhat.com
Date: 2009-07-14 15:44:29 -0400 (Tue, 14 Jul 2009)
New Revision: 558
Added:
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/hbn/
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/hbn/HibernateTest.java
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheTest.java
Modified:
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java
Log:
* Ejb tests updated.
* Hibernate and JBoss Cache test stubs created.
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java 2009-07-14 19:33:13 UTC (rev 557)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java 2009-07-14 19:44:29 UTC (rev 558)
@@ -61,13 +61,17 @@
static{
EJB2.jmxMBeanNameFormat = "jboss.j2ee:module=\"%s\",service=EjbModule";
- EJB3.jmxMBeanNameFormat = "jboss.j2ee:ear=%1s,jar=%1s,service=EJB3";
+ EJB3.jmxMBeanNameFormat = "jboss.j2ee:ear=%1$s,jar=%1$s,service=EJB3";
}
private String jmxMBeanNameFormat;
private void setJmxMBeanNameFormat( String name ){ this.jmxMBeanNameFormat = name; }
public String getJmxMBeanNameFormat(){ return this.jmxMBeanNameFormat; }
- public String formatJmxMBeanName( String deployableName ){ return String.format(this.jmxMBeanNameFormat, deployableName); }
+ public String formatJmxMBeanName( String deployableName ){
+ if( null == this.jmxMBeanNameFormat )
+ throw new UnsupportedOperationException("JMX name for "+this.toString()+" is not filled (yet).");
+ return String.format(this.jmxMBeanNameFormat, deployableName);
+ }
Added: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/hbn/HibernateTest.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/hbn/HibernateTest.java (rev 0)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/hbn/HibernateTest.java 2009-07-14 19:44:29 UTC (rev 558)
@@ -0,0 +1,37 @@
+package org.jboss.jopr.jsfunit.as5.hbn;
+
+import java.io.IOException;
+import org.jboss.jopr.jsfunit.ApplicationTestBaseAS5;
+import org.jboss.jopr.jsfunit.exceptions.HtmlElementNotFoundException;
+
+/**
+ *
+ * @author Ondrej Zizka
+ *
+ * TODO: Implement when Hbn support comes to EmbJopr.
+ */
+public class HibernateTest extends ApplicationTestBaseAS5 {
+
+
+ public final DeployableTypes APP_TYPE = DeployableTypes.HBN;
+
+
+
+ public void testHibernateSummary() throws HtmlElementNotFoundException {
+ fail("Hibernate not present yet.");
+
+ ejtt.navTree.getNodeByLabel(APP_TYPE.getNavTreeLabel());
+ }
+
+
+
+ public void testHibernateMetrics() throws HtmlElementNotFoundException, IOException {
+ fail("Hibernate not present yet.");
+
+ ejtt.navTree.getNodeByLabel(APP_TYPE.getNavTreeLabel());
+
+ ejtt.tabMenu.clickMetricsTab();
+
+ }
+
+}// class
Added: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheTest.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheTest.java (rev 0)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheTest.java 2009-07-14 19:44:29 UTC (rev 558)
@@ -0,0 +1,37 @@
+package org.jboss.jopr.jsfunit.as5.jbcache;
+
+import java.io.IOException;
+import org.jboss.jopr.jsfunit.ApplicationTestBaseAS5;
+import org.jboss.jopr.jsfunit.exceptions.HtmlElementNotFoundException;
+
+/**
+ *
+ * @author Ondrej Zizka
+ *
+ * TODO: Implement when JBoss Cache support comes to EmbJopr.
+ */
+public class JBossCacheTest extends ApplicationTestBaseAS5 {
+
+
+ public final DeployableTypes APP_TYPE = DeployableTypes.JBCACHE;
+
+
+
+ public void testHibernateSummary() throws HtmlElementNotFoundException {
+ fail("JBoss Cache not present yet.");
+
+ ejtt.navTree.getNodeByLabel(APP_TYPE.getNavTreeLabel());
+ }
+
+
+
+ public void testHibernateMetrics() throws HtmlElementNotFoundException, IOException {
+ fail("JBoss Cache not present yet.");
+
+ ejtt.navTree.getNodeByLabel(APP_TYPE.getNavTreeLabel());
+
+ ejtt.tabMenu.clickMetricsTab();
+
+ }
+
+}// class
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java 2009-07-14 19:33:13 UTC (rev 557)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java 2009-07-14 19:44:29 UTC (rev 558)
@@ -1723,10 +1723,7 @@
throws EmbJoprTestException, IOException
{
// Get the MBean name.
- String mBeanNameFormat = type.getJmxMBeanNameFormat();
- if( null == mBeanNameFormat )
- throw new UnsupportedOperationException("JMX name for this filled yet.");
- String mBeanName = String.format( mBeanNameFormat, deployableName );
+ String mBeanName = type.formatJmxMBeanName(deployableName);
// Check whether the mBean is deployed.
16 years, 9 months