Seam SVN: r13467 - in modules/security/trunk/examples/idmconsole/src/main/webapp: WEB-INF and 2 other directories.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2010-07-22 01:35:50 -0400 (Thu, 22 Jul 2010)
New Revision: 13467
Added:
modules/security/trunk/examples/idmconsole/src/main/webapp/changepassword.xhtml
Modified:
modules/security/trunk/examples/idmconsole/src/main/webapp/WEB-INF/faces-config.xml
modules/security/trunk/examples/idmconsole/src/main/webapp/WEB-INF/templates/default.xhtml
modules/security/trunk/examples/idmconsole/src/main/webapp/menu.xhtml
modules/security/trunk/examples/idmconsole/src/main/webapp/style/default.css
Log:
added change password view
Modified: modules/security/trunk/examples/idmconsole/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- modules/security/trunk/examples/idmconsole/src/main/webapp/WEB-INF/faces-config.xml 2010-07-21 23:49:42 UTC (rev 13466)
+++ modules/security/trunk/examples/idmconsole/src/main/webapp/WEB-INF/faces-config.xml 2010-07-22 05:35:50 UTC (rev 13467)
@@ -88,6 +88,25 @@
</navigation-case>
</navigation-rule>
+
+ <navigation-rule>
+ <from-view-id>/changepassword.xhtml</from-view-id>
+
+ <navigation-case>
+ <from-action>#{changePasswordAction.changePassword}</from-action>
+ <from-outcome>success</from-outcome>
+ <if>#{true}</if>
+ <to-view-id>/home.xhtml</to-view-id>
+ <redirect />
+ </navigation-case>
+
+ <navigation-case>
+ <from-outcome>cancel</from-outcome>
+ <to-view-id>/home.xhtml</to-view-id>
+ <redirect/>
+ </navigation-case>
+
+ </navigation-rule>
</faces-config>
Modified: modules/security/trunk/examples/idmconsole/src/main/webapp/WEB-INF/templates/default.xhtml
===================================================================
--- modules/security/trunk/examples/idmconsole/src/main/webapp/WEB-INF/templates/default.xhtml 2010-07-21 23:49:42 UTC (rev 13466)
+++ modules/security/trunk/examples/idmconsole/src/main/webapp/WEB-INF/templates/default.xhtml 2010-07-22 05:35:50 UTC (rev 13467)
@@ -14,6 +14,16 @@
<div id="title">
Identity Management Console
</div>
+
+ <div id="headerMenu">
+ <h:form>
+ <ui:fragment rendered="#{identity.loggedIn}">
+ Welcome, #{identity.user.id}!<br/>
+ <a href="changepassword.jsf">Change password</a><span> | </span>
+ <h:commandLink value="Log out" action="#{identity.logout}"/>
+ </ui:fragment>
+ </h:form>
+ </div>
</div>
<div id="sidebar">
Added: modules/security/trunk/examples/idmconsole/src/main/webapp/changepassword.xhtml
===================================================================
--- modules/security/trunk/examples/idmconsole/src/main/webapp/changepassword.xhtml (rev 0)
+++ modules/security/trunk/examples/idmconsole/src/main/webapp/changepassword.xhtml 2010-07-22 05:35:50 UTC (rev 13467)
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ template="/WEB-INF/templates/default.xhtml">
+
+ <ui:define name="sidebar">
+ <ui:include src="menu.xhtml"/>
+ </ui:define>
+
+ <ui:define name="content">
+
+ <div id="contentMain">
+
+ <h2>Change password</h2>
+
+ <h:messages globalOnly="true"/>
+
+ <h:form id="changepassword">
+
+ <div class="formRow">
+ <h:outputLabel for="oldPassword" value="Old Password" styleClass="formLabel"/>
+ <h:inputSecret id="oldPassword" value="#{changePasswordAction.oldPassword}"/>
+ <div class="validationError"><h:message for="oldPassword"/></div>
+ </div>
+
+ <div class="formRow">
+ <h:outputLabel for="newPassword" value="New Password" styleClass="formLabel"/>
+ <h:inputSecret id="newPassword" value="#{changePasswordAction.newPassword}"/>
+ <div class="validationError"><h:message for="newPassword"/></div>
+ </div>
+
+ <div class="formRow">
+ <h:outputLabel for="confirmPassword" value="Confirm new password" styleClass="formLabel"/>
+ <h:inputSecret id="confirmPassword" value="#{changePasswordAction.confirmPassword}"/>
+ </div>
+
+ <div class="formButtons">
+ <h:commandButton id="save" value="Change Password" action="#{changePasswordAction.changePassword}" styleClass="formButton"/>
+ <h:button id="cancel" value="Cancel" outcome="cancel" styleClass="formButton"/>
+ </div>
+
+ <br class="clear"/>
+
+ </h:form>
+
+ </div>
+
+ </ui:define>
+
+</ui:composition>
+
Modified: modules/security/trunk/examples/idmconsole/src/main/webapp/menu.xhtml
===================================================================
--- modules/security/trunk/examples/idmconsole/src/main/webapp/menu.xhtml 2010-07-21 23:49:42 UTC (rev 13466)
+++ modules/security/trunk/examples/idmconsole/src/main/webapp/menu.xhtml 2010-07-22 05:35:50 UTC (rev 13467)
@@ -3,8 +3,12 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://java.sun.com/jsf/facelets">
-
+
<ui:composition>
+
+ <div class="menuitem">
+ <a href="home.jsf">Home</a>
+ </div>
<div class="menuitem">
<a href="manageusers.jsf">Manage users</a>
@@ -17,7 +21,7 @@
<div class="menuitem">
<a href="manageroletypes.jsf">Manage role types</a>
</div>
-
- </ui:composition>
-
+
+ </ui:composition>
+
</html>
Modified: modules/security/trunk/examples/idmconsole/src/main/webapp/style/default.css
===================================================================
--- modules/security/trunk/examples/idmconsole/src/main/webapp/style/default.css 2010-07-21 23:49:42 UTC (rev 13466)
+++ modules/security/trunk/examples/idmconsole/src/main/webapp/style/default.css 2010-07-22 05:35:50 UTC (rev 13467)
@@ -11,6 +11,10 @@
background-color: #eeeeee;
}
+div#headerMenu {
+ float: right;
+}
+
div#title {
padding-top: 22px;
font-size: 22px;
14 years, 5 months
Seam SVN: r13466 - modules/security/trunk/impl/src/main/java/org/jboss/seam/security/management/picketlink.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2010-07-21 19:49:42 -0400 (Wed, 21 Jul 2010)
New Revision: 13466
Modified:
modules/security/trunk/impl/src/main/java/org/jboss/seam/security/management/picketlink/JpaIdentityStore.java
Log:
implement updateCredential()
Modified: modules/security/trunk/impl/src/main/java/org/jboss/seam/security/management/picketlink/JpaIdentityStore.java
===================================================================
--- modules/security/trunk/impl/src/main/java/org/jboss/seam/security/management/picketlink/JpaIdentityStore.java 2010-07-21 23:13:57 UTC (rev 13465)
+++ modules/security/trunk/impl/src/main/java/org/jboss/seam/security/management/picketlink/JpaIdentityStore.java 2010-07-21 23:49:42 UTC (rev 13466)
@@ -1744,10 +1744,88 @@
IdentityObject identityObject, IdentityObjectCredential credential)
throws IdentityException
{
-
+ EntityManager em = getEntityManager(ctx);
- // TODO Auto-generated method stub
- System.out.println("*** Invoked unimplemented method updateCredential()");
+ Property<Object> credentialValue = modelProperties.get(PROPERTY_CREDENTIAL_VALUE);
+
+ if (credentialClass != null)
+ {
+ Property<Object> credentialIdentity = modelProperties.get(PROPERTY_CREDENTIAL_IDENTITY);
+ Property<Object> credentialType = modelProperties.get(PROPERTY_CREDENTIAL_TYPE);
+ Object identity = lookupIdentity(identityObject, em);
+
+ CriteriaBuilder builder = em.getCriteriaBuilder();
+ CriteriaQuery<?> criteria = builder.createQuery(credentialClass);
+ Root<?> root = criteria.from(credentialClass);
+
+ List<Predicate> predicates = new ArrayList<Predicate>();
+ predicates.add(builder.equal(root.get(credentialIdentity.getName()),
+ identity));
+
+ if (credentialType != null)
+ {
+ if (String.class.equals(credentialType.getJavaClass()))
+ {
+ predicates.add(builder.equal(root.get(credentialType.getName()),
+ credential.getType().getName()));
+ }
+ else
+ {
+ predicates.add(builder.equal(root.get(credentialType.getName()),
+ lookupCredentialTypeEntity(credential.getType().getName(), em)));
+ }
+ }
+
+ criteria.where(predicates.toArray(new Predicate[0]));
+
+ List<?> results = em.createQuery(criteria).getResultList();
+
+ if (results.isEmpty())
+ {
+ // The credential doesn't exist, let's create it
+ try
+ {
+ Object newCredential = credentialClass.newInstance();
+ credentialIdentity.setValue(newCredential, identity);
+ credentialValue.setValue(newCredential, credential.getValue());
+ credentialType.setValue(newCredential,
+ lookupCredentialTypeEntity(credential.getType().getName(), em));
+
+ em.persist(newCredential);
+ }
+ catch (IllegalAccessException ex)
+ {
+ throw new IdentityException("Error updating credential - could " +
+ "not create credential instance", ex);
+ }
+ catch (InstantiationException ex)
+ {
+ throw new IdentityException("Error updating credential - could " +
+ "not create credential instance", ex);
+ }
+ }
+ else
+ {
+ // TODO there shouldn't be multiple credentials with the same type,
+ // but if there are, we need to deal with it somehow.. for now just use the first one
+
+ Object result = results.get(0);
+ credentialValue.setValue(result, credential.getValue());
+
+ em.merge(result);
+ }
+ }
+ else
+ {
+ // The credential is stored in the identity class, update it there
+
+ Property<Object> credentialProp = modelProperties.get(PROPERTY_CREDENTIAL_VALUE);
+ Object identity = lookupIdentity(identityObject, em);
+
+ credentialProp.setValue(identity, credential.getValue());
+
+ em.merge(identity);
+ }
}
14 years, 5 months
Seam SVN: r13465 - in modules/security/trunk/impl/src/main/java/org/jboss/seam/security/management: picketlink and 1 other directory.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2010-07-21 19:13:57 -0400 (Wed, 21 Jul 2010)
New Revision: 13465
Modified:
modules/security/trunk/impl/src/main/java/org/jboss/seam/security/management/action/UserAction.java
modules/security/trunk/impl/src/main/java/org/jboss/seam/security/management/picketlink/JpaIdentityStore.java
Log:
implement identity attribute search, fixed NPE
Modified: modules/security/trunk/impl/src/main/java/org/jboss/seam/security/management/action/UserAction.java
===================================================================
--- modules/security/trunk/impl/src/main/java/org/jboss/seam/security/management/action/UserAction.java 2010-07-21 13:17:04 UTC (rev 13464)
+++ modules/security/trunk/impl/src/main/java/org/jboss/seam/security/management/action/UserAction.java 2010-07-21 23:13:57 UTC (rev 13465)
@@ -56,6 +56,8 @@
conversation.begin();
this.username = username;
+ roles = new ArrayList<Role>();
+
Collection<RoleType> roleTypes = identitySession.getRoleManager().findUserRoleTypes(new UserImpl(username));
for (RoleType roleType : roleTypes)
Modified: modules/security/trunk/impl/src/main/java/org/jboss/seam/security/management/picketlink/JpaIdentityStore.java
===================================================================
--- modules/security/trunk/impl/src/main/java/org/jboss/seam/security/management/picketlink/JpaIdentityStore.java 2010-07-21 13:17:04 UTC (rev 13464)
+++ modules/security/trunk/impl/src/main/java/org/jboss/seam/security/management/picketlink/JpaIdentityStore.java 2010-07-21 23:13:57 UTC (rev 13465)
@@ -33,6 +33,7 @@
import org.jboss.weld.extensions.util.properties.query.PropertyQueries;
import org.jboss.weld.extensions.util.properties.query.TypedPropertyCriteria;
import org.picketlink.idm.common.exception.IdentityException;
+import org.picketlink.idm.impl.api.SimpleAttribute;
import org.picketlink.idm.impl.store.FeaturesMetaDataImpl;
import org.picketlink.idm.spi.configuration.IdentityStoreConfigurationContext;
import org.picketlink.idm.spi.configuration.metadata.IdentityObjectAttributeMetaData;
@@ -95,6 +96,7 @@
private static final String PROPERTY_RELATIONSHIP_NAME_NAME = "RELATIONSHIP_NAME_NAME";
private static final String PROPERTY_ATTRIBUTE_NAME = "ATTRIBUTE_NAME";
private static final String PROPERTY_ATTRIBUTE_VALUE = "ATTRIBUTE_VALUE";
+ private static final String PROPERTY_ATTRIBUTE_IDENTITY = "ATTRIBUTE_IDENTITY";
private static final String PROPERTY_ROLE_TYPE_NAME = "ROLE_TYPE_NAME";
private class EntityToSpiConverter
@@ -903,6 +905,26 @@
"attributeValue", "value");
if (prop != null) modelProperties.put(PROPERTY_ATTRIBUTE_VALUE, prop);
}
+
+ props = PropertyQueries.createQuery(attributeClass)
+ .addCriteria(new TypedPropertyCriteria(identityClass))
+ .getResultList();
+
+ if (props.size() == 1)
+ {
+ modelProperties.put(PROPERTY_ATTRIBUTE_IDENTITY, props.get(0));
+ }
+ else if (props.size() > 1)
+ {
+ throw new IdentityException(
+ "Ambiguous identity property in attribute class " +
+ attributeClass.getName());
+ }
+ else
+ {
+ throw new IdentityException("Error initializing JpaIdentityStore - " +
+ "no attribute identity property found.");
+ }
}
// Scan for additional attributes in the identity class also
@@ -1821,22 +1843,114 @@
return null;
}
- public IdentityObjectAttribute getAttribute(
- IdentityStoreInvocationContext invocationContext,
+ public IdentityObjectAttribute getAttribute(IdentityStoreInvocationContext ctx,
IdentityObject identity, String name) throws IdentityException
{
- // TODO Auto-generated method stub
- return null;
+ EntityManager em = getEntityManager(ctx);
+
+ Property<?> attributeProperty = attributeProperties.get(name);
+ if (attributeProperty != null)
+ {
+ // TODO implement attribute search for attributes scattered across the model
+
+
+ return new SimpleAttribute(name);
+ }
+ else
+ {
+ // If there is no attributeClass set, we have nowhere else to look - return an empty attribute
+ if (attributeClass == null) return new SimpleAttribute(name);
+
+ Property<?> attributeIdentityProp = modelProperties.get(PROPERTY_ATTRIBUTE_IDENTITY);
+ Property<?> attributeNameProp = modelProperties.get(PROPERTY_ATTRIBUTE_NAME);
+ Property<?> attributeValueProp = modelProperties.get(PROPERTY_ATTRIBUTE_VALUE);
+
+ CriteriaBuilder builder = em.getCriteriaBuilder();
+ CriteriaQuery<?> criteria = builder.createQuery(attributeClass);
+ Root<?> root = criteria.from(attributeClass);
+
+ List<Predicate> predicates = new ArrayList<Predicate>();
+ predicates.add(builder.equal(root.get(attributeIdentityProp.getName()),
+ lookupIdentity(identity, em)));
+ predicates.add(builder.equal(root.get(attributeNameProp.getName()),
+ name));
+
+ criteria.where(predicates.toArray(new Predicate[0]));
+
+ List<?> results = em.createQuery(criteria).getResultList();
+
+ if (results.size() == 0)
+ {
+ // No results found, return an empty attribute value
+ return new SimpleAttribute(name);
+ }
+ else if (results.size() == 1)
+ {
+ return new SimpleAttribute(name, attributeValueProp.getValue(results.get(0)));
+ }
+ else
+ {
+ Collection<Object> values = new ArrayList<Object>();
+ for (Object result : results)
+ {
+ values.add(attributeValueProp.getValue(result));
+ }
+
+ return new SimpleAttribute(name, values.toArray());
+ }
+ }
}
public Map<String, IdentityObjectAttribute> getAttributes(
- IdentityStoreInvocationContext invocationContext,
- IdentityObject identity) throws IdentityException
+ IdentityStoreInvocationContext ctx,
+ IdentityObject identityObject) throws IdentityException
{
- // TODO Auto-generated method stub
- return null;
+ Map<String, IdentityObjectAttribute> attributes = new HashMap<String,IdentityObjectAttribute>();
+
+ EntityManager em = getEntityManager(ctx);
+
+ Object identity = lookupIdentity(identityObject, em);
+
+ // TODO iterate through attributeProperties
+
+ if (attributeClass != null)
+ {
+ Property<?> attributeIdentityProp = modelProperties.get(PROPERTY_ATTRIBUTE_IDENTITY);
+ Property<?> attributeNameProp = modelProperties.get(PROPERTY_ATTRIBUTE_NAME);
+ Property<?> attributeValueProp = modelProperties.get(PROPERTY_ATTRIBUTE_VALUE);
+
+ CriteriaBuilder builder = em.getCriteriaBuilder();
+ CriteriaQuery<?> criteria = builder.createQuery(attributeClass);
+ Root<?> root = criteria.from(attributeClass);
+
+ List<Predicate> predicates = new ArrayList<Predicate>();
+ predicates.add(builder.equal(root.get(attributeIdentityProp.getName()),
+ identity));
+
+ criteria.where(predicates.toArray(new Predicate[0]));
+
+ List<?> results = em.createQuery(criteria).getResultList();
+
+ for (Object result : results)
+ {
+ String name = attributeNameProp.getValue(result).toString();
+ Object value = attributeValueProp.getValue(result);
+
+ if (attributes.containsKey(name))
+ {
+ IdentityObjectAttribute attr = attributes.get(name);
+ attr.addValue(value);
+ }
+ else
+ {
+ attributes.put(name, new SimpleAttribute(name, value));
+ }
+ }
+ }
+
+ return attributes;
}
-
+
public Map<String, IdentityObjectAttributeMetaData> getAttributesMetaData(
IdentityStoreInvocationContext invocationContext,
IdentityObjectType identityType)
14 years, 5 months
Seam SVN: r13464 - branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam.
by seam-commits＠lists.jboss.org
Author: oskutka(a)redhat.com
Date: 2010-07-21 09:17:04 -0400 (Wed, 21 Jul 2010)
New Revision: 13464
Modified:
branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/Component.java
Log:
Updated formatting to match the community one.
Modified: branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/Component.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/Component.java 2010-07-21 12:40:44 UTC (rev 13463)
+++ branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/Component.java 2010-07-21 13:17:04 UTC (rev 13464)
@@ -2049,10 +2049,11 @@
}
- public static Object getInstanceFromFactory(String name) {
+ public static Object getInstanceFromFactory(String name)
+ {
return getInstanceFromFactory(name, null);
}
-
+
private static Object getInstanceFromFactory(String name, ScopeType scope)
{
Init init = Init.instance();
@@ -2062,7 +2063,6 @@
}
else
{
-
Init.FactoryMethod factoryMethod = init.getFactory(name);
Init.FactoryExpression methodBinding = init.getFactoryMethodExpression(name);
Init.FactoryExpression valueBinding = init.getFactoryValueExpression(name);
14 years, 5 months
Seam SVN: r13463 - in sandbox/modules/spreadsheet/src: test/java/org/jboss/seam/spreadsheet/jxl and 1 other directory.
by seam-commits＠lists.jboss.org
Author: nickarls
Date: 2010-07-21 08:40:44 -0400 (Wed, 21 Jul 2010)
New Revision: 13463
Modified:
sandbox/modules/spreadsheet/src/main/java/org/jboss/seam/spreadsheet/jxl/formatting/ConstantFactory.java
sandbox/modules/spreadsheet/src/test/java/org/jboss/seam/spreadsheet/jxl/ConstantFactoryTest.java
Log:
constant-factory tests
Modified: sandbox/modules/spreadsheet/src/main/java/org/jboss/seam/spreadsheet/jxl/formatting/ConstantFactory.java
===================================================================
--- sandbox/modules/spreadsheet/src/main/java/org/jboss/seam/spreadsheet/jxl/formatting/ConstantFactory.java 2010-07-21 12:35:37 UTC (rev 13462)
+++ sandbox/modules/spreadsheet/src/main/java/org/jboss/seam/spreadsheet/jxl/formatting/ConstantFactory.java 2010-07-21 12:40:44 UTC (rev 13463)
@@ -1,6 +1,7 @@
package org.jboss.seam.spreadsheet.jxl.formatting;
import java.lang.reflect.Field;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
@@ -43,7 +44,7 @@
underlineStyles = loadConstants(UnderlineStyle.values(), jxl.format.UnderlineStyle.class);
numberFormats = loadConstants(DisplayFormat.class, NumberFormats.class);
dateFormats = loadConstants(DisplayFormat.class, DateFormats.class);
- numberFormatShorthands = loadConstants(String.class, NumberFormat.class);
+ numberFormatShorthands = loadConstants(String.class, NumberFormat.class, new String[] { "COMPLEX_FORMAT" });
orientations = loadConstants(Orientation.values(), jxl.format.Orientation.class);
alignments = loadConstants(Alignment.values(), jxl.format.Alignment.class);
verticalAlignments = loadConstants(VerticalAlignment.values(), jxl.format.VerticalAlignment.class);
@@ -53,11 +54,15 @@
}
@SuppressWarnings("unchecked")
- private <V> Map<String, V> loadConstants(Class<V> valueClass, Class<?> sourceClass)
+ public <V> Map<String, V> loadConstants(Class<V> valueClass, Class<?> sourceClass, String[] ignoreFields)
{
Map<String, V> constants = new HashMap<String, V>();
for (Field field : sourceClass.getFields())
{
+ if (Arrays.binarySearch(ignoreFields, field.getName()) >= 0)
+ {
+ continue;
+ }
try
{
constants.put(field.getName(), (V) field.get(null));
@@ -70,6 +75,11 @@
return constants;
}
+ public <V> Map<String, V> loadConstants(Class<V> valueClass, Class<?> sourceClass)
+ {
+ return loadConstants(valueClass, sourceClass, new String[] {});
+ }
+
public jxl.format.Colour getColour(Colour colour)
{
checkConstantPresent(colours, colour, "Color");
@@ -118,6 +128,7 @@
}
}
return constants;
+
}
public DisplayFormat getNumberFormat(String mask)
Modified: sandbox/modules/spreadsheet/src/test/java/org/jboss/seam/spreadsheet/jxl/ConstantFactoryTest.java
===================================================================
--- sandbox/modules/spreadsheet/src/test/java/org/jboss/seam/spreadsheet/jxl/ConstantFactoryTest.java 2010-07-21 12:35:37 UTC (rev 13462)
+++ sandbox/modules/spreadsheet/src/test/java/org/jboss/seam/spreadsheet/jxl/ConstantFactoryTest.java 2010-07-21 12:40:44 UTC (rev 13463)
@@ -1,29 +1,50 @@
package org.jboss.seam.spreadsheet.jxl;
+import java.util.Map;
+
+import jxl.biff.DisplayFormat;
+import jxl.write.DateFormat;
+import jxl.write.DateFormats;
+import jxl.write.NumberFormat;
+import jxl.write.NumberFormats;
+
import org.jboss.seam.spreadsheet.jxl.formatting.ConstantFactory;
+import org.jboss.seam.spreadsheet.model.formatting.Background.Pattern;
+import org.jboss.seam.spreadsheet.model.formatting.Border.BorderLineStyle;
+import org.jboss.seam.spreadsheet.model.formatting.Border.BorderType;
+import org.jboss.seam.spreadsheet.model.formatting.CellFormat.Alignment;
+import org.jboss.seam.spreadsheet.model.formatting.CellFormat.Orientation;
+import org.jboss.seam.spreadsheet.model.formatting.CellFormat.VerticalAlignment;
import org.jboss.seam.spreadsheet.model.formatting.Colour;
-import org.jboss.seam.spreadsheet.model.formatting.SpreadsheetTest;
import org.jboss.seam.spreadsheet.model.formatting.Font.ScriptStyle;
import org.jboss.seam.spreadsheet.model.formatting.Font.UnderlineStyle;
+import org.jboss.seam.spreadsheet.model.formatting.SpreadsheetTest;
import org.junit.Assert;
+import org.junit.Before;
import org.junit.Test;
public class ConstantFactoryTest extends SpreadsheetTest
{
+ ConstantFactory constantFactory;
+
+ @Before
+ public void init()
+ {
+ constantFactory = new ConstantFactory();
+ }
+
@Test
public void coloursTest()
{
- ConstantFactory constantFactory = new ConstantFactory();
for (Colour colour : Colour.values())
{
Assert.assertNotNull(constantFactory.getColour(colour));
}
}
-
+
@Test
public void underlineStyleTest()
{
- ConstantFactory constantFactory = new ConstantFactory();
for (UnderlineStyle underlineStyle : UnderlineStyle.values())
{
Assert.assertNotNull(constantFactory.getUnderlineStyle(underlineStyle));
@@ -33,11 +54,94 @@
@Test
public void scriptStyleTest()
{
- ConstantFactory constantFactory = new ConstantFactory();
for (ScriptStyle scriptStyle : ScriptStyle.values())
{
Assert.assertNotNull(constantFactory.getScriptStyle(scriptStyle));
}
}
+ @Test
+ public void borderLineTest()
+ {
+ for (BorderLineStyle borderLineStyle : BorderLineStyle.values())
+ {
+ Assert.assertNotNull(constantFactory.getBorderLineStyle(borderLineStyle));
+ }
+ }
+
+ @Test
+ public void borderTypeTest()
+ {
+ for (BorderType borderType : BorderType.values())
+ {
+ Assert.assertNotNull(constantFactory.getBorder(borderType));
+ }
+ }
+
+ @Test
+ public void patternTest()
+ {
+ for (Pattern pattern : Pattern.values())
+ {
+ Assert.assertNotNull(constantFactory.getPattern(pattern));
+ }
+ }
+
+ @Test
+ public void verticalAlignmentTest()
+ {
+ for (VerticalAlignment verticalAlignment : VerticalAlignment.values())
+ {
+ Assert.assertNotNull(constantFactory.getVerticalAlignment(verticalAlignment));
+ }
+ }
+
+ @Test
+ public void orientationTest()
+ {
+ for (Orientation orientation : Orientation.values())
+ {
+ Assert.assertNotNull(constantFactory.getOrientation(orientation));
+ }
+ }
+
+ @Test
+ public void alignmentTest()
+ {
+ for (Alignment alignment : Alignment.values())
+ {
+ Assert.assertNotNull(constantFactory.getAlignment(alignment));
+ }
+ }
+
+ @Test
+ public void numberFormatTest()
+ {
+ Map<String, DisplayFormat> numberFormats = constantFactory.loadConstants(DisplayFormat.class, NumberFormats.class);
+ for (String key : numberFormats.keySet())
+ {
+ Assert.assertNotNull(constantFactory.getNumberFormat(key));
+ }
+ }
+
+ @Test
+ public void numberFormatShorthandTest()
+ {
+ Map<String, String> numberFormatShorthands = constantFactory.loadConstants(String.class, NumberFormat.class);
+ for (String key : numberFormatShorthands.keySet())
+ {
+// Assert.assertNotNull(constantFactory.getNumberFormatShorthand(key));
+ }
+ }
+
+ @Test
+ public void dateFormatTest()
+ {
+ Map<String, DisplayFormat> dateFormats = constantFactory.loadConstants(DisplayFormat.class, DateFormats.class);
+ for (String key : dateFormats.keySet())
+ {
+ Assert.assertNotNull(constantFactory.getDateFormat(key));
+ }
+ }
+
}
14 years, 5 months
Seam SVN: r13462 - branches/community/Seam_2_2/src/main/org/jboss/seam.
by seam-commits＠lists.jboss.org
Author: oskutka(a)redhat.com
Date: 2010-07-21 08:35:37 -0400 (Wed, 21 Jul 2010)
New Revision: 13462
Modified:
branches/community/Seam_2_2/src/main/org/jboss/seam/Component.java
Log:
JBSEAM-2419 Narrowed locked block not to cause JBSEAM-4669
Modified: branches/community/Seam_2_2/src/main/org/jboss/seam/Component.java
===================================================================
--- branches/community/Seam_2_2/src/main/org/jboss/seam/Component.java 2010-07-21 12:04:11 UTC (rev 13461)
+++ branches/community/Seam_2_2/src/main/org/jboss/seam/Component.java 2010-07-21 12:35:37 UTC (rev 13462)
@@ -50,6 +50,7 @@
import java.util.SortedSet;
import java.util.TreeMap;
import java.util.TreeSet;
+import java.util.concurrent.locks.ReentrantLock;
import javassist.util.proxy.MethodFilter;
import javassist.util.proxy.MethodHandler;
@@ -129,6 +130,8 @@
private static final LogProvider log = Logging.getLogProvider(Component.class);
+ static ReentrantLock factoryLock = new ReentrantLock();
+
private ComponentType type;
private String name;
private ScopeType scope;
@@ -2051,7 +2054,6 @@
return getInstanceFromFactory(name, null);
}
- // JBSEAM-4669: Removed the "synchronized" keyword
private static Object getInstanceFromFactory(String name, ScopeType scope)
{
Init init = Init.instance();
@@ -2061,13 +2063,6 @@
}
else
{
- // check whether there has been created an instance by another thread while waiting for this function's lock
- if (scope != STATELESS) {
- Object value = (scope == null) ? Contexts.lookupInStatefulContexts(name) : scope.getContext().get(name);
- if (value != null) {
- return value;
- }
- }
Init.FactoryMethod factoryMethod = init.getFactory(name);
Init.FactoryExpression methodBinding = init.getFactoryMethodExpression(name);
Init.FactoryExpression valueBinding = init.getFactoryValueExpression(name);
@@ -2084,14 +2079,32 @@
else if ( factoryMethod!=null && getOutScope( factoryMethod.getScope(), factoryMethod.getComponent() ).isContextActive() )
{
Object factory = Component.getInstance( factoryMethod.getComponent().getName(), true );
- if (factory==null)
+ factoryLock.lock();
+ try
{
- return null;
+ // check whether there has been created an instance by another thread while waiting for this function's lock
+ if (scope != STATELESS)
+ {
+ Object value = (scope == null) ? Contexts.lookupInStatefulContexts(name) : scope.getContext().get(name);
+ if (value != null)
+ {
+ return value;
+ }
+ }
+
+ if (factory==null)
+ {
+ return null;
+ }
+ else
+ {
+ Object result = factoryMethod.getComponent().callComponentMethod( factory, factoryMethod.getMethod() );
+ return handleFactoryMethodResult( name, factoryMethod.getComponent(), result, factoryMethod.getScope() );
+ }
}
- else
+ finally
{
- Object result = factoryMethod.getComponent().callComponentMethod( factory, factoryMethod.getMethod() );
- return handleFactoryMethodResult( name, factoryMethod.getComponent(), result, factoryMethod.getScope() );
+ factoryLock.unlock();
}
}
else
14 years, 5 months
Seam SVN: r13461 - sandbox/modules/spreadsheet/src/test/java/org/jboss/seam/spreadsheet/jxl.
by seam-commits＠lists.jboss.org
Author: nickarls
Date: 2010-07-21 08:04:11 -0400 (Wed, 21 Jul 2010)
New Revision: 13461
Modified:
sandbox/modules/spreadsheet/src/test/java/org/jboss/seam/spreadsheet/jxl/CellFactoryTest.java
Log:
cell format cache test
Modified: sandbox/modules/spreadsheet/src/test/java/org/jboss/seam/spreadsheet/jxl/CellFactoryTest.java
===================================================================
--- sandbox/modules/spreadsheet/src/test/java/org/jboss/seam/spreadsheet/jxl/CellFactoryTest.java 2010-07-21 11:58:20 UTC (rev 13460)
+++ sandbox/modules/spreadsheet/src/test/java/org/jboss/seam/spreadsheet/jxl/CellFactoryTest.java 2010-07-21 12:04:11 UTC (rev 13461)
@@ -20,7 +20,7 @@
CellFormatResolver cellFormatResolver = new CellFormatResolver();
WritableCell jxlCell = cellFactory.createCell(getTestCell(), cellFormatResolver);
WritableCell jxlCell2 = cellFactory.createCell(getTestCell(), cellFormatResolver);
- Assert.assertEquals(jxlCell.getCellFormat(), jxlCell2.getCellFormat());
+ Assert.assertTrue(jxlCell.getCellFormat() == jxlCell2.getCellFormat());
}
@Test
@@ -31,10 +31,9 @@
WritableCell jxlCell = cellFactory.createCell(getTestCell(), cellFormatResolver);
Cell cell2 = getTestCell();
cell2.getCellFormat().setFont(getSampleFont());
- cell2.getCellFormat().getFont().setColour(Colour.RED);
+ cell2.getCellFormat().getFont().setColour(Colour.GREEN);
WritableCell jxlCell2 = cellFactory.createCell(cell2, cellFormatResolver);
- // Assert.assertEquals(jxlCell.getCellFormat(), jxlCell2.getCellFormat());
+ Assert.assertFalse(jxlCell.getCellFormat() == jxlCell2.getCellFormat());
}
-
}
14 years, 5 months
Seam SVN: r13460 - sandbox/modules/spreadsheet/src/test/java/org/jboss/seam/spreadsheet/jxl.
by seam-commits＠lists.jboss.org
Author: nickarls
Date: 2010-07-21 07:58:20 -0400 (Wed, 21 Jul 2010)
New Revision: 13460
Added:
sandbox/modules/spreadsheet/src/test/java/org/jboss/seam/spreadsheet/jxl/EventObserver.java
Modified:
sandbox/modules/spreadsheet/src/test/java/org/jboss/seam/spreadsheet/jxl/JXLSpreadsheetWriterTest.java
Log:
event tests
Added: sandbox/modules/spreadsheet/src/test/java/org/jboss/seam/spreadsheet/jxl/EventObserver.java
===================================================================
--- sandbox/modules/spreadsheet/src/test/java/org/jboss/seam/spreadsheet/jxl/EventObserver.java (rev 0)
+++ sandbox/modules/spreadsheet/src/test/java/org/jboss/seam/spreadsheet/jxl/EventObserver.java 2010-07-21 11:58:20 UTC (rev 13460)
@@ -0,0 +1,47 @@
+package org.jboss.seam.spreadsheet.jxl;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.event.Observes;
+
+import org.jboss.seam.spreadsheet.model.Cell;
+import org.jboss.seam.spreadsheet.model.Worksheet;
+import org.jboss.seam.spreadsheet.model.command.Command;
+
+@ApplicationScoped
+public class EventObserver
+{
+ private boolean cellAdded;
+ private boolean worksheetCreated;
+ private boolean commandExecuted;
+
+ public void observeCellAdded(@Observes @BeforeAdded Cell cell)
+ {
+ cellAdded = true;
+ }
+
+ public void observeWorksheetCreated(@Observes @BeforeCreated Worksheet worksheet)
+ {
+ worksheetCreated = true;
+ }
+
+ public void observeCommandExecuted(@Observes @BeforeExecuted Command command)
+ {
+ commandExecuted = true;
+ }
+
+ public boolean isCellAdded()
+ {
+ return cellAdded;
+ }
+
+ public boolean isWorksheetCreated()
+ {
+ return worksheetCreated;
+ }
+
+ public boolean isCommandExecuted()
+ {
+ return commandExecuted;
+ }
+
+}
Modified: sandbox/modules/spreadsheet/src/test/java/org/jboss/seam/spreadsheet/jxl/JXLSpreadsheetWriterTest.java
===================================================================
--- sandbox/modules/spreadsheet/src/test/java/org/jboss/seam/spreadsheet/jxl/JXLSpreadsheetWriterTest.java 2010-07-21 11:45:02 UTC (rev 13459)
+++ sandbox/modules/spreadsheet/src/test/java/org/jboss/seam/spreadsheet/jxl/JXLSpreadsheetWriterTest.java 2010-07-21 11:58:20 UTC (rev 13460)
@@ -2,6 +2,8 @@
import java.util.Date;
+import javax.inject.Inject;
+
import junit.framework.Assert;
import jxl.CellType;
import jxl.Sheet;
@@ -12,6 +14,7 @@
import org.jboss.seam.spreadsheet.model.Coordinate;
import org.jboss.seam.spreadsheet.model.Workbook;
import org.jboss.seam.spreadsheet.model.Worksheet;
+import org.jboss.seam.spreadsheet.model.command.ColumnWidthCommand;
import org.jboss.seam.spreadsheet.model.formatting.SpreadsheetTest;
import org.jboss.shrinkwrap.api.ArchivePaths;
import org.jboss.shrinkwrap.api.ShrinkWrap;
@@ -23,12 +26,28 @@
@RunWith(Arquillian.class)
public class JXLSpreadsheetWriterTest extends SpreadsheetTest
{
-
+
@Deployment
public static JavaArchive getArchive()
{
- return ShrinkWrap.create("test.jar", JavaArchive.class).addClass(JXLSpreadsheetWriter.class).addManifestResource(new ByteArrayAsset("<beans/>".getBytes()), ArchivePaths.create("beans.xml"));
+ return ShrinkWrap.create("test.jar", JavaArchive.class).addClasses(JXLSpreadsheetWriter.class, EventObserver.class).addManifestResource(new ByteArrayAsset("<beans/>".getBytes()), ArchivePaths.create("beans.xml"));
}
+
+ @Inject EventObserver eventObserver;
+
+ @Test
+ public void testCellAddedEvent()
+ {
+ Workbook workbook = new Workbook();
+ Worksheet worksheet = Worksheet.named("foo");
+ workbook.getWorksheets().add(worksheet);
+ worksheet.getCells().add(Cell.of("foo", Coordinate.of(0, 0)));
+ worksheet.getCommands().add(new ColumnWidthCommand(1, 100));
+ jxl.Workbook jxlWorkbook = getWorkbook(workbook);
+ Assert.assertTrue(eventObserver.isCellAdded());
+ Assert.assertTrue(eventObserver.isWorksheetCreated());
+ Assert.assertTrue(eventObserver.isCommandExecuted());
+ }
@Test
public void testAddWorksheet()
14 years, 5 months
Seam SVN: r13459 - in sandbox/modules/spreadsheet: src/main/java/org/jboss/seam/spreadsheet/jxl and 4 other directories.
by seam-commits＠lists.jboss.org
Author: nickarls
Date: 2010-07-21 07:45:02 -0400 (Wed, 21 Jul 2010)
New Revision: 13459
Added:
sandbox/modules/spreadsheet/src/test/java/org/jboss/seam/spreadsheet/model/WorkbookTest.java
Modified:
sandbox/modules/spreadsheet/pom.xml
sandbox/modules/spreadsheet/src/main/java/org/jboss/seam/spreadsheet/jxl/JXLSpreadsheetWriter.java
sandbox/modules/spreadsheet/src/main/java/org/jboss/seam/spreadsheet/model/formatting/CellFormat.java
sandbox/modules/spreadsheet/src/test/java/org/jboss/seam/spreadsheet/jxl/CellFormatFactoryTest.java
sandbox/modules/spreadsheet/src/test/java/org/jboss/seam/spreadsheet/jxl/JXLSpreadsheetWriterTest.java
sandbox/modules/spreadsheet/src/test/java/org/jboss/seam/spreadsheet/model/formatting/BorderTest.java
sandbox/modules/spreadsheet/src/test/java/org/jboss/seam/spreadsheet/model/formatting/SpreadsheetTest.java
Log:
Arqullian testing for in-container test
Border merging changes
Modified: sandbox/modules/spreadsheet/pom.xml
===================================================================
--- sandbox/modules/spreadsheet/pom.xml 2010-07-21 11:17:50 UTC (rev 13458)
+++ sandbox/modules/spreadsheet/pom.xml 2010-07-21 11:45:02 UTC (rev 13459)
@@ -30,6 +30,12 @@
<version>4.8.1</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.arquillian</groupId>
+ <artifactId>arquillian-junit</artifactId>
+ <version>${arquillian.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
@@ -46,4 +52,41 @@
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>weld-embedded</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.arquillian.container</groupId>
+ <artifactId>arquillian-weld-embedded</artifactId>
+ <version>1.0.0.Alpha2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ </dependency>
+ </dependencies>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core-bom</artifactId>
+ <version>1.0.1-SP1</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ </profile>
+ </profiles>
</project>
\ No newline at end of file
Modified: sandbox/modules/spreadsheet/src/main/java/org/jboss/seam/spreadsheet/jxl/JXLSpreadsheetWriter.java
===================================================================
--- sandbox/modules/spreadsheet/src/main/java/org/jboss/seam/spreadsheet/jxl/JXLSpreadsheetWriter.java 2010-07-21 11:17:50 UTC (rev 13458)
+++ sandbox/modules/spreadsheet/src/main/java/org/jboss/seam/spreadsheet/jxl/JXLSpreadsheetWriter.java 2010-07-21 11:45:02 UTC (rev 13459)
@@ -23,22 +23,23 @@
import org.jboss.seam.spreadsheet.model.Worksheet;
import org.jboss.seam.spreadsheet.model.command.Command;
-@Excel(implementation = "jxl")
public class JXLSpreadsheetWriter implements SpreadsheetWriter
{
CellFactory cellFactory;
CellFormatResolver cellFormatResolver;
WritableWorkbook jxlWorkbook;
- // @Inject
- // @BeforeAdded
- // Event<Cell> cellAdded;
- // @Inject
- // @BeforeCreated
- // Event<Worksheet> worksheetCreated;
- // @Inject
- // @BeforeExecuted
- // Event<Command> commandExecuted;
+ @Inject
+ @BeforeAdded
+ Event<Cell> cellAdded;
+
+ @Inject
+ @BeforeCreated
+ Event<Worksheet> worksheetCreated;
+
+ @Inject
+ @BeforeExecuted
+ Event<Command> commandExecuted;
@Override
public byte[] writeWorkbook(Workbook workbook) throws SpreadsheetException
@@ -79,7 +80,7 @@
private void processWorksheet(Worksheet worksheet, Workbook workbook, WritableWorkbook jxlWorkbook)
{
cellFormatResolver.setWorksheetRules(worksheet.getCellFormatRules());
- // worksheetCreated.fire(worksheet);
+ worksheetCreated.fire(worksheet);
WritableSheet jxlWorksheet = jxlWorkbook.createSheet(worksheet.getName(), jxlWorkbook.getNumberOfSheets());
for (Cell cell : worksheet.getCells())
{
@@ -94,7 +95,7 @@
for (Command command : commands)
{
JxlCommand jxlCommand = CommandFactory.getJxlCommand(command, jxlWorksheet);
- // commandExecuted.fire(command);
+ commandExecuted.fire(command);
jxlCommand.execute();
}
}
@@ -103,7 +104,7 @@
{
try
{
- // cellAdded.fire(cell);
+ cellAdded.fire(cell);
jxlWorksheet.addCell(cellFactory.createCell(cell, cellFormatResolver));
if (cell.getCellSpan() != null)
{
Modified: sandbox/modules/spreadsheet/src/main/java/org/jboss/seam/spreadsheet/model/formatting/CellFormat.java
===================================================================
--- sandbox/modules/spreadsheet/src/main/java/org/jboss/seam/spreadsheet/model/formatting/CellFormat.java 2010-07-21 11:17:50 UTC (rev 13458)
+++ sandbox/modules/spreadsheet/src/main/java/org/jboss/seam/spreadsheet/model/formatting/CellFormat.java 2010-07-21 11:45:02 UTC (rev 13459)
@@ -228,39 +228,14 @@
{
for (Border otherBorder : otherBorders)
{
- List<BorderType> mergeTypes = new ArrayList<BorderType>();
- if (otherBorder.getBorderType().equals(BorderType.ALL))
+ Border localBorder = getBorder(otherBorder.getBorderType());
+ if (localBorder == null)
{
- mergeTypes.add(BorderType.LEFT);
- mergeTypes.add(BorderType.RIGHT);
- mergeTypes.add(BorderType.BOTTOM);
- mergeTypes.add(BorderType.TOP);
+ localBorder = new Border(otherBorder.getBorderType());
+ borders.add(localBorder);
}
- else
- {
- mergeTypes.add(otherBorder.getBorderType());
- }
- for (BorderType mergeType : mergeTypes)
- {
- mergeBorder(otherBorder, mergeType);
- }
- }
- }
-
- private void mergeBorder(Border otherBorder, BorderType mergeType)
- {
- Border localBorder = getBorder(mergeType);
- if (localBorder == null)
- {
- Border newBorder = new Border(otherBorder.getBorderType());
- newBorder.merge(otherBorder);
- borders.add(newBorder);
- }
- else
- {
localBorder.merge(otherBorder);
}
-
}
private Border getBorder(BorderType borderType)
Modified: sandbox/modules/spreadsheet/src/test/java/org/jboss/seam/spreadsheet/jxl/CellFormatFactoryTest.java
===================================================================
--- sandbox/modules/spreadsheet/src/test/java/org/jboss/seam/spreadsheet/jxl/CellFormatFactoryTest.java 2010-07-21 11:17:50 UTC (rev 13458)
+++ sandbox/modules/spreadsheet/src/test/java/org/jboss/seam/spreadsheet/jxl/CellFormatFactoryTest.java 2010-07-21 11:45:02 UTC (rev 13459)
@@ -84,6 +84,60 @@
}
@Test
+ public void rightMergedAllBorderTest() {
+ List<Border> borders = new ArrayList<Border>();
+ Border borderL = new Border(BorderType.LEFT);
+ borderL.setColour(Colour.RED);
+ borders.add(borderL);
+
+ Border borderA = new Border(BorderType.ALL);
+ borderA.setLineStyle(BorderLineStyle.DOUBLE);
+ borderA.setColour(Colour.PINK);
+ borders.add(borderA);
+
+ cell.getCellFormat().setBorders(borders);
+
+ jxl.format.CellFormat jxlCellFormat = getJxlCell().getCellFormat();
+ Assert.assertEquals(jxl.format.BorderLineStyle.DOUBLE, jxlCellFormat.getBorderLine(jxl.format.Border.LEFT));
+ Assert.assertEquals(jxl.format.BorderLineStyle.DOUBLE, jxlCellFormat.getBorderLine(jxl.format.Border.RIGHT));
+ Assert.assertEquals(jxl.format.BorderLineStyle.DOUBLE, jxlCellFormat.getBorderLine(jxl.format.Border.BOTTOM));
+ Assert.assertEquals(jxl.format.BorderLineStyle.DOUBLE, jxlCellFormat.getBorderLine(jxl.format.Border.TOP));
+ Assert.assertEquals(jxl.format.Colour.PINK, jxlCellFormat.getBorderColour(jxl.format.Border.LEFT));
+ Assert.assertEquals(jxl.format.Colour.PINK, jxlCellFormat.getBorderColour(jxl.format.Border.RIGHT));
+ Assert.assertEquals(jxl.format.Colour.PINK, jxlCellFormat.getBorderColour(jxl.format.Border.BOTTOM));
+ Assert.assertEquals(jxl.format.Colour.PINK, jxlCellFormat.getBorderColour(jxl.format.Border.TOP));
+ }
+
+ @Test
+ public void leftMergedAllBorderTest() {
+ List<Border> borders = new ArrayList<Border>();
+
+ Border borderA = new Border(BorderType.ALL);
+ borderA.setLineStyle(BorderLineStyle.DOUBLE);
+ borderA.setColour(Colour.PINK);
+ borders.add(borderA);
+
+ Border borderL = new Border(BorderType.LEFT);
+ borderL.setColour(Colour.RED);
+ borderL.setLineStyle(BorderLineStyle.DOTTED);
+ borders.add(borderL);
+
+
+ cell.getCellFormat().setBorders(borders);
+
+ jxl.format.CellFormat jxlCellFormat = getJxlCell().getCellFormat();
+ Assert.assertEquals(jxl.format.BorderLineStyle.DOTTED, jxlCellFormat.getBorderLine(jxl.format.Border.LEFT));
+ Assert.assertEquals(jxl.format.BorderLineStyle.DOUBLE, jxlCellFormat.getBorderLine(jxl.format.Border.RIGHT));
+ Assert.assertEquals(jxl.format.BorderLineStyle.DOUBLE, jxlCellFormat.getBorderLine(jxl.format.Border.BOTTOM));
+ Assert.assertEquals(jxl.format.BorderLineStyle.DOUBLE, jxlCellFormat.getBorderLine(jxl.format.Border.TOP));
+ Assert.assertEquals(jxl.format.Colour.RED, jxlCellFormat.getBorderColour(jxl.format.Border.LEFT));
+ Assert.assertEquals(jxl.format.Colour.PINK, jxlCellFormat.getBorderColour(jxl.format.Border.RIGHT));
+ Assert.assertEquals(jxl.format.Colour.PINK, jxlCellFormat.getBorderColour(jxl.format.Border.BOTTOM));
+ Assert.assertEquals(jxl.format.Colour.PINK, jxlCellFormat.getBorderColour(jxl.format.Border.TOP));
+ }
+
+
+ @Test
public void borderLineStyleTest()
{
List<Border> borders = new ArrayList<Border>();
@@ -149,7 +203,7 @@
{
cell.setValue(new Date());
cell.getCellFormat().setMask("dd.MM.yyyy");
- Assert.assertEquals("MM.yyyy", getJxlCell().getCellFormat().getFormat().getFormatString());
+// Assert.assertEquals("MM.yyyy", getJxlCell().getCellFormat().getFormat().getFormatString());
}
@Test
@@ -157,7 +211,7 @@
{
cell.setValue(new Date());
cell.getCellFormat().setMask("FORMAT9");
- Assert.assertEquals("M/d/yy H:mm", getJxlCell().getCellFormat().getFormat().getFormatString());
+// Assert.assertEquals("M/d/yy H:mm", getJxlCell().getCellFormat().getFormat().getFormatString());
}
@Test
@@ -165,7 +219,7 @@
{
cell.setValue(1.1111111f);
cell.getCellFormat().setMask("#.##");
- Assert.assertEquals("#.##", getJxlCell().getCellFormat().getFormat().getFormatString());
+// Assert.assertEquals("#.##", getJxlCell().getCellFormat().getFormat().getFormatString());
}
@Test
@@ -173,7 +227,7 @@
{
cell.setValue(1.1111111f);
cell.getCellFormat().setMask("CURRENCY_EURO_PREFIX");
- Assert.assertEquals("CURRENCY_EURO_PREFIX", getJxlCell().getCellFormat().getFormat().getFormatString());
+// Assert.assertEquals("CURRENCY_EURO_PREFIX", getJxlCell().getCellFormat().getFormat().getFormatString());
}
@Test
@@ -181,7 +235,7 @@
{
cell.setValue(1.1111111f);
cell.getCellFormat().setMask("EXPONENTIAL");
- Assert.assertEquals("EXPONENTIAL", getJxlCell().getCellFormat().getFormat().getFormatString());
+// Assert.assertEquals("EXPONENTIAL", getJxlCell().getCellFormat().getFormat().getFormatString());
}
}
Modified: sandbox/modules/spreadsheet/src/test/java/org/jboss/seam/spreadsheet/jxl/JXLSpreadsheetWriterTest.java
===================================================================
--- sandbox/modules/spreadsheet/src/test/java/org/jboss/seam/spreadsheet/jxl/JXLSpreadsheetWriterTest.java 2010-07-21 11:17:50 UTC (rev 13458)
+++ sandbox/modules/spreadsheet/src/test/java/org/jboss/seam/spreadsheet/jxl/JXLSpreadsheetWriterTest.java 2010-07-21 11:45:02 UTC (rev 13459)
@@ -6,32 +6,30 @@
import jxl.CellType;
import jxl.Sheet;
-import org.jboss.seam.spreadsheet.SpreadsheetException;
+import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
import org.jboss.seam.spreadsheet.model.Cell;
import org.jboss.seam.spreadsheet.model.Coordinate;
import org.jboss.seam.spreadsheet.model.Workbook;
import org.jboss.seam.spreadsheet.model.Worksheet;
import org.jboss.seam.spreadsheet.model.formatting.SpreadsheetTest;
+import org.jboss.shrinkwrap.api.ArchivePaths;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset;
import org.junit.Test;
+import org.junit.runner.RunWith;
+(a)RunWith(Arquillian.class)
public class JXLSpreadsheetWriterTest extends SpreadsheetTest
{
- @Test
- public void testFreshWorkbook()
+ @Deployment
+ public static JavaArchive getArchive()
{
- Workbook workbook = new Workbook();
- Assert.assertTrue(workbook.getWorksheets().isEmpty());
- Assert.assertTrue(workbook.getCellFormatRules().isEmpty());
+ return ShrinkWrap.create("test.jar", JavaArchive.class).addClass(JXLSpreadsheetWriter.class).addManifestResource(new ByteArrayAsset("<beans/>".getBytes()), ArchivePaths.create("beans.xml"));
}
- @Test(expected = SpreadsheetException.class)
- public void testImplicitWorksheet()
- {
- Workbook workbook = new Workbook();
- jxl.Workbook jxlWorkbook = getWorkbook(workbook);
- }
-
@Test
public void testAddWorksheet()
{
Added: sandbox/modules/spreadsheet/src/test/java/org/jboss/seam/spreadsheet/model/WorkbookTest.java
===================================================================
--- sandbox/modules/spreadsheet/src/test/java/org/jboss/seam/spreadsheet/model/WorkbookTest.java (rev 0)
+++ sandbox/modules/spreadsheet/src/test/java/org/jboss/seam/spreadsheet/model/WorkbookTest.java 2010-07-21 11:45:02 UTC (rev 13459)
@@ -0,0 +1,40 @@
+package org.jboss.seam.spreadsheet.model;
+
+import junit.framework.Assert;
+
+import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.seam.spreadsheet.SpreadsheetException;
+import org.jboss.seam.spreadsheet.jxl.JXLSpreadsheetWriter;
+import org.jboss.seam.spreadsheet.model.formatting.SpreadsheetTest;
+import org.jboss.shrinkwrap.api.ArchivePaths;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+(a)RunWith(Arquillian.class)
+public class WorkbookTest extends SpreadsheetTest
+{
+ @Deployment
+ public static JavaArchive getArchive()
+ {
+ return ShrinkWrap.create("test.jar", JavaArchive.class).addClass(JXLSpreadsheetWriter.class).addManifestResource(new ByteArrayAsset("<beans/>".getBytes()), ArchivePaths.create("beans.xml"));
+ }
+
+ @Test
+ public void testFreshWorkbook()
+ {
+ Workbook workbook = new Workbook();
+ Assert.assertTrue(workbook.getWorksheets().isEmpty());
+ Assert.assertTrue(workbook.getCellFormatRules().isEmpty());
+ }
+
+ @Test(expected = SpreadsheetException.class)
+ public void testImplicitWorksheet()
+ {
+ Workbook workbook = new Workbook();
+ jxl.Workbook jxlWorkbook = getWorkbook(workbook);
+ }
+}
Modified: sandbox/modules/spreadsheet/src/test/java/org/jboss/seam/spreadsheet/model/formatting/BorderTest.java
===================================================================
--- sandbox/modules/spreadsheet/src/test/java/org/jboss/seam/spreadsheet/model/formatting/BorderTest.java 2010-07-21 11:17:50 UTC (rev 13458)
+++ sandbox/modules/spreadsheet/src/test/java/org/jboss/seam/spreadsheet/model/formatting/BorderTest.java 2010-07-21 11:45:02 UTC (rev 13459)
@@ -55,10 +55,7 @@
Assert.assertEquals(Colour.GREEN, getBorder(BorderType.LEFT, cfa.getBorders()).getColour());
Assert.assertEquals(Colour.BLUE, getBorder(BorderType.RIGHT, cfa.getBorders()).getColour());
Assert.assertEquals(Colour.WHITE, getBorder(BorderType.BOTTOM, cfa.getBorders()).getColour());
- Assert.assertEquals(BorderLineStyle.DOTTED, getBorder(BorderType.TOP, cfa.getBorders()).getLineStyle());
- Assert.assertEquals(BorderLineStyle.DOTTED, getBorder(BorderType.LEFT, cfa.getBorders()).getLineStyle());
- Assert.assertEquals(BorderLineStyle.DOTTED, getBorder(BorderType.RIGHT, cfa.getBorders()).getLineStyle());
- Assert.assertEquals(BorderLineStyle.DOTTED, getBorder(BorderType.BOTTOM, cfa.getBorders()).getLineStyle());
+ Assert.assertEquals(BorderLineStyle.DOTTED, getBorder(BorderType.ALL, cfa.getBorders()).getLineStyle());
}
private Border getBorder(BorderType type, List<Border> borders)
Modified: sandbox/modules/spreadsheet/src/test/java/org/jboss/seam/spreadsheet/model/formatting/SpreadsheetTest.java
===================================================================
--- sandbox/modules/spreadsheet/src/test/java/org/jboss/seam/spreadsheet/model/formatting/SpreadsheetTest.java 2010-07-21 11:17:50 UTC (rev 13458)
+++ sandbox/modules/spreadsheet/src/test/java/org/jboss/seam/spreadsheet/model/formatting/SpreadsheetTest.java 2010-07-21 11:45:02 UTC (rev 13459)
@@ -5,9 +5,11 @@
import java.util.ArrayList;
import java.util.List;
+import javax.inject.Inject;
+
import jxl.read.biff.BiffException;
-import org.jboss.seam.spreadsheet.jxl.JXLSpreadsheetWriter;
+import org.jboss.seam.spreadsheet.SpreadsheetWriter;
import org.jboss.seam.spreadsheet.model.Cell;
import org.jboss.seam.spreadsheet.model.Coordinate;
import org.jboss.seam.spreadsheet.model.Range;
@@ -23,13 +25,13 @@
public abstract class SpreadsheetTest
{
+ @Inject SpreadsheetWriter sw;
protected jxl.Workbook getWorkbook(Workbook workbook)
{
try
{
- JXLSpreadsheetWriter writer = new JXLSpreadsheetWriter();
- byte[] data = writer.writeWorkbook(workbook);
+ byte[] data = sw.writeWorkbook(workbook);
return jxl.Workbook.getWorkbook(new ByteArrayInputStream(data));
}
catch (BiffException e)
14 years, 5 months
Seam SVN: r13458 - branches/enterprise/JBPAPP_5_0/src/test/ftest/examples/excel/src/org/jboss/seam/example/excel/test/selenium.
by seam-commits＠lists.jboss.org
Author: mgencur(a)redhat.com
Date: 2010-07-21 07:17:50 -0400 (Wed, 21 Jul 2010)
New Revision: 13458
Modified:
branches/enterprise/JBPAPP_5_0/src/test/ftest/examples/excel/src/org/jboss/seam/example/excel/test/selenium/SeleniumExcelTest.java
Log:
JBPAPP-4258 excel test fixed so that it will not contains special characters causing problems on windows
Modified: branches/enterprise/JBPAPP_5_0/src/test/ftest/examples/excel/src/org/jboss/seam/example/excel/test/selenium/SeleniumExcelTest.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/test/ftest/examples/excel/src/org/jboss/seam/example/excel/test/selenium/SeleniumExcelTest.java 2010-07-21 10:41:19 UTC (rev 13457)
+++ branches/enterprise/JBPAPP_5_0/src/test/ftest/examples/excel/src/org/jboss/seam/example/excel/test/selenium/SeleniumExcelTest.java 2010-07-21 11:17:50 UTC (rev 13458)
@@ -3,12 +3,12 @@
import org.jboss.seam.example.common.test.selenium.SeamSeleniumTest;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertTrue;
public class SeleniumExcelTest extends SeamSeleniumTest
{
public static final String HOME_PAGE = "/home.seam";
- public static final String HOME_PAGE_TITLE = "Microsoft® Excel® Export examples";
+ public static final String[] HOME_PAGE_TITLE = new String[] {"Microsoft", "Excel", "Export examples"};
@BeforeMethod
@Override
@@ -22,6 +22,8 @@
*/
@Test
public void homePageLoadTest() {
- assertEquals("Unexpected page title.", HOME_PAGE_TITLE, browser.getTitle());
+ boolean result = browser.getTitle().contains(HOME_PAGE_TITLE[0]) && browser.getTitle().contains(HOME_PAGE_TITLE[1]) &&
+ browser.getTitle().contains(HOME_PAGE_TITLE[2]);
+ assertTrue("Unexpected page title.", result);
}
}
14 years, 5 months