Author: lindner
Date: Mon Jun 14 14:27:22 2010
New Revision: 954482
URL: http://svn.apache.org/viewvc?rev=954482&view=rev
Log:
SHINDIG-1244 | Allow gadgets without a title param per the specification
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/ModulePrefs.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/ModulePrefsTest.java
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/ModulePrefs.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/ModulePrefs.java?rev=954482&r1=954481&r2=954482&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/ModulePrefs.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/ModulePrefs.java
Mon Jun 14 14:27:22 2010
@@ -97,10 +97,6 @@ public class ModulePrefs {
attributes.put(node.getNodeName(), node.getNodeValue());
}
- if (getTitle() == null) {
- throw new SpecParserException("modulepr...@title is required.");
- }
-
categories = ImmutableList.of(getAttribute(ATTR_CATEGORY, ""),
getAttribute(ATTR_CATEGORY2, ""));
// Eventually use a list of classes
@@ -175,7 +171,8 @@ public class ModulePrefs {
* User Pref + Message Bundle + Bidi
*/
public String getTitle() {
- return getAttribute(ATTR_TITLE);
+ String title = getAttribute(ATTR_TITLE);
+ return title == null ? "" : title;
}
/**
Modified:
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/ModulePrefsTest.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/ModulePrefsTest.java?rev=954482&r1=954481&r2=954482&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/ModulePrefsTest.java
(original)
+++
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/ModulePrefsTest.java
Mon Jun 14 14:27:22 2010
@@ -21,6 +21,7 @@ package org.apache.shindig.gadgets.spec;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
@@ -220,10 +221,12 @@ public class ModulePrefsTest {
assertEquals(0, prefs.getIntAttribute("arbitrary"));
}
- @Test(expected = SpecParserException.class)
- public void missingTitleThrows() throws Exception {
+ @Test
+ public void missingTitleOkay() throws Exception {
String xml = "<ModulePrefs/>";
- new ModulePrefs(XmlUtil.parse(xml), SPEC_URL);
+ ModulePrefs prefs = new ModulePrefs(XmlUtil.parse(xml), SPEC_URL);
+ assertNotNull("Empty ModulePrefs Parses", prefs);
+ assertEquals("Title is empty string", "", prefs.getTitle());
}
@Test