svn commit: r674922 - in /incubator/shindig/trunk/java/gadgets/src: main/java/org/apache/shindig/gadgets/servlet/UrlGenerator.java test/java/org/apache/shindig/gadgets/servlet/UrlGeneratorTest.java

[etnu]

Author: etnu
Date: Tue Jul  8 12:28:58 2008
New Revision: 674922

URL: http://svn.apache.org/viewvc?rev=674922&view=rev
Log:
Ensured that the requested view is copied into gadget iframe metadata.


Modified:
    
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/UrlGenerator.java
    
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/UrlGeneratorTest.java

Modified: 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/UrlGenerator.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/UrlGenerator.java?rev=674922&r1=674921&r2=674922&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/UrlGenerator.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/UrlGenerator.java
 Tue Jul  8 12:28:58 2008
@@ -135,6 +135,7 @@
 
     buf.append("&lang=").append(context.getLocale().getLanguage());
     buf.append("&country=").append(context.getLocale().getCountry());
+    buf.append("&view=").append(context.getView());
 
     UserPrefs prefs = context.getUserPrefs();
     for (UserPref pref : gadget.getSpec().getUserPrefs()) {

Modified: 
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/UrlGeneratorTest.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/UrlGeneratorTest.java?rev=674922&r1=674921&r2=674922&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/UrlGeneratorTest.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/UrlGeneratorTest.java
 Tue Jul  8 12:28:58 2008
@@ -61,6 +61,7 @@
   private final static String UP_NAME = "user-pref-name";
   private final static String UP_VALUE = "user-pref-value";
   private final static String CONTAINER = "shindig";
+  private final static String VIEW = "canvas";
   private final static int MODULE_ID = 3435;
 
   private final ServletTestFixture fixture = new ServletTestFixture();
@@ -84,6 +85,7 @@
     expect(context.getUserPrefs()).andReturn(prefs).anyTimes();
     expect(context.getLocale()).andReturn(Locale.getDefault()).anyTimes();
     expect(context.getModuleId()).andReturn(MODULE_ID).anyTimes();
+    expect(context.getView()).andReturn(VIEW).anyTimes();
   }
 
   @Test
@@ -154,6 +156,7 @@
     StringAssert.assertContains("container=" + CONTAINER, 
iframeUrl.getQuery());
     StringAssert.assertContains("up_" + UP_NAME + "=" + UP_VALUE, 
iframeUrl.getQuery());
     StringAssert.assertContains("mid=" + MODULE_ID, iframeUrl.getQuery());
+    StringAssert.assertContains("view=" + VIEW, iframeUrl.getQuery());
   }
 
   @Test