You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by ss...@apache.org on 2012/02/27 00:43:33 UTC
svn commit: r1293966 [7/12] - in /shindig/trunk:
extras/src/main/java/org/apache/shindig/extras/
java/common/src/main/java/org/apache/shindig/auth/
java/common/src/main/java/org/apache/shindig/common/
java/common/src/main/java/org/apache/shindig/common...
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/variables/MessageSubstituter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/variables/MessageSubstituter.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/variables/MessageSubstituter.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/variables/MessageSubstituter.java Sun Feb 26 23:43:20 2012
@@ -42,7 +42,7 @@ public class MessageSubstituter implemen
throws GadgetException {
MessageBundle bundle = messageBundleFactory.getBundle(spec, context.getLocale(),
context.getIgnoreCache(), context.getContainer(), context.getView());
-
+
substituter.addSubstitutions(Substitutions.Type.MESSAGE, bundle.getMessages());
}
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/variables/Substituter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/variables/Substituter.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/variables/Substituter.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/variables/Substituter.java Sun Feb 26 23:43:20 2012
@@ -31,7 +31,7 @@ public interface Substituter {
/**
* Add the substitutions from this Substituter to the {@link Substitutions}.
- *
+ *
* @param substituter container for the new substitutions, containing any existing substitutions
* @param context the context in which this gadget is being rendered
* @param spec the gadget specification being substituted
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/variables/Substitutions.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/variables/Substitutions.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/variables/Substitutions.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/variables/Substitutions.java Sun Feb 26 23:43:20 2012
@@ -44,7 +44,7 @@ public class Substitutions {
* User preferences.
*/
USER_PREF("UP"),
-
+
/**
* MODULE_ variables (i.e. MODULE_ID)
*/
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/variables/UserPrefSubstituter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/variables/UserPrefSubstituter.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/variables/UserPrefSubstituter.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/variables/UserPrefSubstituter.java Sun Feb 26 23:43:20 2012
@@ -30,7 +30,7 @@ public class UserPrefSubstituter impleme
public void addSubstitutions(Substitutions substituter, GadgetContext context, GadgetSpec spec) {
UserPrefs values = context.getUserPrefs();
-
+
for (UserPref pref : spec.getUserPrefs().values()) {
String name = pref.getName();
String value = values.getPref(name);
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/variables/VariableSubstituter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/variables/VariableSubstituter.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/variables/VariableSubstituter.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/variables/VariableSubstituter.java Sun Feb 26 23:43:20 2012
@@ -44,13 +44,13 @@ public class VariableSubstituter {
*
* @return A new GadgetSpec, with all fields substituted as needed.
*/
- public GadgetSpec substitute(GadgetContext context, GadgetSpec spec) throws GadgetException {
+ public GadgetSpec substitute(GadgetContext context, GadgetSpec spec) throws GadgetException {
Substitutions substitutions = new Substitutions();
-
+
for (Substituter substituter : substituters) {
substituter.addSubstitutions(substitutions, context, spec);
}
-
+
return spec.substitute(substitutions);
}
}
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactoryTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactoryTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactoryTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactoryTest.java Sun Feb 26 23:43:20 2012
@@ -293,9 +293,9 @@ public class DefaultGadgetSpecFactoryTes
try {
specFactory.getGadgetSpec(createContext(SPEC_URL, true));
} catch (GadgetException e) {
- // Expected condition.
+ // Expected condition.
}
-
+
// Now make sure the cache wasn't populated w/ the error.
specFactory.getGadgetSpec(createContext(SPEC_URL, false));
}
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/DefaultMessageBundleFactoryTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/DefaultMessageBundleFactoryTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/DefaultMessageBundleFactoryTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/DefaultMessageBundleFactoryTest.java Sun Feb 26 23:43:20 2012
@@ -192,7 +192,7 @@ public class DefaultMessageBundleFactory
assertNull(bundle.getMessages().get(MSG_2_NAME));
assertEquals(MSG_3_VALUE, bundle.getMessages().get(MSG_3_NAME));
}
-
+
@Test
public void getViewCountryBundle() throws Exception {
MessageBundle bundle = bundleFactory.getBundle(gadgetSpec, COUNTRY_LOCALE, true, ContainerConfig.DEFAULT_CONTAINER, "view1");
@@ -202,7 +202,7 @@ public class DefaultMessageBundleFactory
assertEquals(MSG_2_VIEW_VALUE, bundle.getMessages().get(MSG_2_NAME));
assertEquals(MSG_3_VALUE, bundle.getMessages().get(MSG_3_NAME));
}
-
+
@Test
public void getViewAllAllBundle() throws Exception {
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetELResolverTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetELResolverTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetELResolverTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetELResolverTest.java Sun Feb 26 23:43:20 2012
@@ -47,7 +47,7 @@ public class GadgetELResolverTest {
if ("view-params".equals(name)) {
return viewParams;
}
-
+
return null;
}
@@ -56,10 +56,10 @@ public class GadgetELResolverTest {
return userPrefs;
}
};
-
+
resolver = new GadgetELResolver(gadgetContext);
expressions = Expressions.forTesting();
-
+
context = expressions.newELContext(resolver);
}
@@ -67,7 +67,7 @@ public class GadgetELResolverTest {
public void getPrefs() {
userPrefs = new UserPrefs(ImmutableMap.of("foo", "bar"));
ValueExpression expression = expressions.parse("${UserPrefs.foo}", String.class);
-
+
assertEquals("bar", expression.getValue(context));
expression = expressions.parse("${UserPrefs.wrongKey}", String.class);
@@ -84,7 +84,7 @@ public class GadgetELResolverTest {
@Test
public void testViewParams() {
viewParams = "{foo: 'bar'}";
-
+
ValueExpression expression = expressions.parse("${ViewParams.foo}", String.class);
assertEquals("bar", expression.getValue(context));
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetTest.java Sun Feb 26 23:43:20 2012
@@ -89,7 +89,7 @@ public class GadgetTest extends EasyMock
assertSame(returned, requiredFeatures2);
verify();
}
-
+
@Test
public void testGetView1Features() throws Exception {
String xml = "<Module>" +
@@ -116,10 +116,10 @@ public class GadgetTest extends EasyMock
assertTrue(requiredFeatures.contains("requiredview1"));
assertTrue(requiredFeatures.contains("core"));
assertTrue(!requiredFeatures.contains("requiredview2"));
-
+
verify();
}
-
+
@Test
public void testGetView2Features() throws Exception {
String xml = "<Module>" +
@@ -150,7 +150,7 @@ public class GadgetTest extends EasyMock
assertTrue(requiredFeatures.contains("required"));
assertTrue(requiredFeatures.contains("core"));
assertTrue(requiredFeatures.contains("requiredview2"));
-
+
verify();
}
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/HashLockedDomainServiceTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/HashLockedDomainServiceTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/HashLockedDomainServiceTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/HashLockedDomainServiceTest.java Sun Feb 26 23:43:20 2012
@@ -67,7 +67,7 @@ public class HashLockedDomainServiceTest
gadgetFeatures.add("security-token");
}
}
-
+
String gadgetXml = "<Module><ModulePrefs title=''>" + requires + "</ModulePrefs><Content/></Module>";
GadgetSpec spec = null;
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/config/DefaultConfigProcessorTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/config/DefaultConfigProcessorTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/config/DefaultConfigProcessorTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/config/DefaultConfigProcessorTest.java Sun Feb 26 23:43:20 2012
@@ -48,16 +48,16 @@ public class DefaultConfigProcessorTest
private static final String CONTAINER = "container";
private static final String HOST = "host";
private static final Gadget GADGET = new Gadget();
-
+
private ContainerConfig config;
-
+
@Before
public void setUp() {
config = createMock(ContainerConfig.class);
expect(config.getMap(CONTAINER, DefaultConfigProcessor.GADGETS_FEATURES_KEY)).andReturn(CONFIG_FEATURE_MAP);
replay(config);
}
-
+
@Test
public void testGlobalConfig() {
ConfigContributor contrib = mockContrib(HOST);
@@ -69,7 +69,7 @@ public class DefaultConfigProcessorTest
processor.getConfig(CONTAINER, CONFIG_FEATURES, HOST, null);
verify(config, contrib, noContrib);
}
-
+
@Test
public void testFeatureConfigHost() {
ConfigContributor contrib = mockContrib(HOST);
@@ -82,7 +82,7 @@ public class DefaultConfigProcessorTest
processor.getConfig(CONTAINER, CONFIG_FEATURES, HOST, null);
verify(config, contrib, noContrib);
}
-
+
@Test
public void testFeatureConfigGadget() {
ConfigContributor contrib = mockContrib(GADGET);
@@ -95,7 +95,7 @@ public class DefaultConfigProcessorTest
processor.getConfig(CONTAINER, CONFIG_FEATURES, null, GADGET);
verify(config, contrib, noContrib);
}
-
+
@SuppressWarnings("unchecked")
private ConfigContributor mockContrib(String host) {
ConfigContributor contrib = EasyMock.createMock(ConfigContributor.class);
@@ -107,7 +107,7 @@ public class DefaultConfigProcessorTest
replay(contrib);
return contrib;
}
-
+
@SuppressWarnings("unchecked")
private ConfigContributor mockContrib(Gadget gadget) {
ConfigContributor contrib = EasyMock.createMock(ConfigContributor.class);
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/features/FeatureParserTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/features/FeatureParserTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/features/FeatureParserTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/features/FeatureParserTest.java Sun Feb 26 23:43:20 2012
@@ -67,14 +67,14 @@ public class FeatureParserTest {
" </other_type>" +
"</feature>";
FeatureParser.ParsedFeature parsed = new FeatureParser().parse(parent, featureXml);
-
+
// Top-level validation.
assertEquals("the_feature", parsed.getName());
assertEquals(2, parsed.getDeps().size());
assertEquals("myDep1", parsed.getDeps().get(0));
assertEquals("mySecondDep", parsed.getDeps().get(1));
assertEquals(4, parsed.getBundles().size());
-
+
// First gadget bundle.
FeatureParser.ParsedFeature.Bundle bundle1 = parsed.getBundles().get(0);
assertEquals("gadget", bundle1.getType());
@@ -105,7 +105,7 @@ public class FeatureParserTest {
assertEquals(ApiDirective.Type.JS, bundle1.getApis().get(4).getType());
assertTrue(bundle1.getApis().get(4).isUses());
assertEquals("last.symbol", bundle1.getApis().get(4).getValue());
-
+
// Second gadget bundle.
FeatureParser.ParsedFeature.Bundle bundle2 = parsed.getBundles().get(1);
assertEquals("gadget", bundle2.getType());
@@ -113,7 +113,7 @@ public class FeatureParserTest {
assertEquals("container1", bundle2.getAttribs().get("container"));
assertEquals(0, bundle2.getResources().size());
assertEquals(0, bundle2.getApis().size());
-
+
// Container bundle.
FeatureParser.ParsedFeature.Bundle bundle3 = parsed.getBundles().get(2);
assertEquals("container", bundle3.getType());
@@ -131,7 +131,7 @@ public class FeatureParserTest {
assertEquals("Inlined content", bundle3.getResources().get(1).getContent());
assertEquals(0, bundle3.getResources().get(1).getAttribs().size());
assertEquals(0, bundle3.getApis().size());
-
+
// Other_type bundle.
FeatureParser.ParsedFeature.Bundle bundle4 = parsed.getBundles().get(3);
assertEquals("other_type", bundle4.getType());
@@ -146,7 +146,7 @@ public class FeatureParserTest {
assertEquals(0, bundle4.getResources().get(0).getAttribs().size());
assertEquals(0, bundle4.getApis().size());
}
-
+
@Test(expected=GadgetException.class)
public void parseInvalidXml() throws GadgetException {
// Should failed to parse invalid XML");
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/features/FeatureRegistryTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/features/FeatureRegistryTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/features/FeatureRegistryTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/features/FeatureRegistryTest.java Sun Feb 26 23:43:20 2012
@@ -47,11 +47,11 @@ public class FeatureRegistryTest {
getFeatureTpl("top", new String[] { "mid_a", "mid_b" });
private static final String MID_A_TPL =
getFeatureTpl("mid_a", new String[] { "bottom" });
- private static final String MID_B_TPL =
+ private static final String MID_B_TPL =
getFeatureTpl("mid_b", new String[] { "bottom" });
- private static final String BOTTOM_TPL =
+ private static final String BOTTOM_TPL =
getFeatureTpl("bottom", new String[] {});
- private static final String LOOP_A_TPL =
+ private static final String LOOP_A_TPL =
getFeatureTpl("loop_a", new String[] { "loop_b" });
private static final String LOOP_B_TPL =
getFeatureTpl("loop_b", new String[] { "loop_c" });
@@ -59,21 +59,21 @@ public class FeatureRegistryTest {
getFeatureTpl("loop_c", new String[] { "loop_a" });
private static final String BAD_DEP_TPL =
getFeatureTpl("bad_dep", new String[] { "no-exists" });
-
+
private static String RESOURCE_BASE_PATH = "/resource/base/path";
private static int resourceIdx = 0;
private TestFeatureRegistry registry;
-
+
@Test
public void registerFromFileFeatureXmlFileScheme() throws Exception {
checkRegisterFromFileFeatureXml(true);
}
-
+
@Test
public void registerFromFileFeatureXmlNoScheme() throws Exception {
checkRegisterFromFileFeatureXml(false);
}
-
+
private void checkRegisterFromFileFeatureXml(boolean withScheme) throws Exception {
TestFeatureRegistry.Builder builder = TestFeatureRegistry.newBuilder();
String content = "content-" + (withScheme ? "withScheme" : "noScheme");
@@ -81,13 +81,13 @@ public class FeatureRegistryTest {
Uri featureFile = makeFile(xml(NODEP_TPL, "gadget",
withScheme ? resUri.toString() : resUri.getPath(), null));
registry = builder.build(withScheme ? featureFile.toString() : featureFile.getPath());
-
+
// Verify single resource works all the way through.
List<FeatureResource> resources = registry.getAllFeatures().getResources();
assertEquals(1, resources.size());
assertEquals(content, resources.get(0).getContent());
}
-
+
@Test
public void registerFromFileInNestedDirectoryFeatureXmlFile() throws Exception {
// Get the directory from dummyUri and create a subdir.
@@ -113,13 +113,13 @@ public class FeatureRegistryTest {
out.write(xml(NODEP_TPL, "gadget", resFile.toURI().toString(), null));
out.close();
registry = TestFeatureRegistry.newBuilder().build(childDir.toURI().toString());
-
+
// Verify single resource works all the way through.
List<FeatureResource> resources = registry.getAllFeatures().getResources();
assertEquals(1, resources.size());
assertEquals(content, resources.get(0).getContent());
}
-
+
@Test
public void registerFromResourceFeatureXml() throws Exception {
TestFeatureRegistry.Builder builder = TestFeatureRegistry.newBuilder();
@@ -128,13 +128,13 @@ public class FeatureRegistryTest {
Uri featureUri = builder.expectResource(xml(NODEP_TPL, "gadget", contentUri.getPath(), null));
builder.addFeatureFile(featureUri.toString());
registry = builder.build();
-
+
// Verify single resource works all the way through.
List<FeatureResource> resources = registry.getAllFeatures().getResources();
assertEquals(1, resources.size());
assertEquals(content, resources.get(0).getContent());
}
-
+
@Test
public void registerFromResourceFeatureXmlRelativeContent() throws Exception {
TestFeatureRegistry.Builder builder = TestFeatureRegistry.newBuilder();
@@ -143,17 +143,17 @@ public class FeatureRegistryTest {
String relativePath = contentUri.getPath().substring(contentUri.getPath().lastIndexOf('/') + 1);
Uri featureUri = builder.expectResource(xml(NODEP_TPL, "gadget", relativePath, null));
registry = builder.build(featureUri.toString());
-
+
// Verify single resource works all the way through.
List<FeatureResource> resources = registry.getAllFeatures().getResources();
assertEquals(1, resources.size());
assertEquals(content, resources.get(0).getContent());
}
-
+
@Test
public void registerFromResourceIndex() throws Exception {
TestFeatureRegistry.Builder builder = TestFeatureRegistry.newBuilder();
-
+
// One with extern resource loaded content...
String content1 = "content1()";
Uri content1Uri = builder.expectResource(content1);
@@ -162,20 +162,20 @@ public class FeatureRegistryTest {
// One feature with inline content (that it depends on)...
String content2 = "inline()";
Uri feature2Uri = builder.expectResource(xml(BOTTOM_TPL, "gadget", null, content2));
-
+
// .txt file to join the two
Uri txtFile = builder.expectResource(feature1Uri.toString() + '\n' + feature2Uri.toString(), ".txt");
-
+
// Load resources from the text file and do basic validation they're good.
registry = builder.build(txtFile.toString());
-
+
// Contents should be ordered based on the way they went in.
List<FeatureResource> resources = registry.getAllFeatures().getResources();
assertEquals(2, resources.size());
assertEquals(content2, resources.get(0).getContent());
assertEquals(content1, resources.get(1).getContent());
}
-
+
@Test
public void registerOverrideFeature() throws Exception {
TestFeatureRegistry.Builder builder = TestFeatureRegistry.newBuilder();
@@ -184,16 +184,16 @@ public class FeatureRegistryTest {
String content1 = "content1()";
Uri content1Uri = builder.expectResource(content1);
Uri feature1Uri = builder.expectResource(xml(BOTTOM_TPL, "gadget", content1Uri.getPath(), null));
-
+
String content2 = "content_two()";
Uri content2Uri = builder.expectResource(content2);
Uri feature2Uri = builder.expectResource(xml(BOTTOM_TPL, "gadget", content2Uri.getPath(), null));
-
+
registry = builder.build(feature1Uri.toString());
List<FeatureResource> resources1 = registry.getAllFeatures().getResources();
assertEquals(1, resources1.size());
assertEquals(content1, resources1.get(0).getContent());
-
+
// Register it again, different def.
registry = builder.build(feature2Uri.toString());
List<FeatureResource> resources2 = registry.getAllFeatures().getResources();
@@ -204,7 +204,7 @@ public class FeatureRegistryTest {
List<FeatureResource> resourcesAgain = registry.getAllFeatures().getResources();
assertSame(resources2, resourcesAgain);
}
-
+
@Test
public void cacheAccountsForUnsupportedState() throws Exception {
TestFeatureRegistry.Builder builder = TestFeatureRegistry.newBuilder();
@@ -215,20 +215,20 @@ public class FeatureRegistryTest {
String theContainer = "the-container";
attribs.put("container", theContainer);
Uri feature1Uri = builder.expectResource(xml(BOTTOM_TPL, "gadget", content1Uri.getPath(), null, attribs));
-
+
// Register it.
registry = builder.build(feature1Uri.toString());
-
+
// Retrieve content for matching context.
List<String> needed = Lists.newArrayList("bottom");
List<String> unsupported = Lists.newArrayList();
List<FeatureResource> resources = registry.getFeatureResources(
getCtx(RenderingContext.GADGET, theContainer), needed, unsupported).getResources();
-
+
// Retrieve again w/ no unsupported list.
List<FeatureResource> resourcesUnsup = registry.getFeatureResources(
getCtx(RenderingContext.GADGET, theContainer), needed, null).getResources();
-
+
assertNotSame(resources, resourcesUnsup);
assertEquals(resources, resourcesUnsup);
assertEquals(1, resources.size());
@@ -242,7 +242,7 @@ public class FeatureRegistryTest {
List<FeatureResource> resourcesUnsup2 = registry.getFeatureResources(
getCtx(RenderingContext.GADGET, theContainer), needed, null).getResources();
assertSame(resourcesUnsup, resourcesUnsup2);
-
+
// Lastly, ensure that ignoreCache is properly accounted.
List<FeatureResource> resourcesIgnoreCache = registry.getFeatureResources(
getCtx(RenderingContext.GADGET, theContainer, true), needed, unsupported).getResources();
@@ -250,7 +250,7 @@ public class FeatureRegistryTest {
assertEquals(1, resourcesIgnoreCache.size());
assertEquals(content1, resourcesIgnoreCache.get(0).getContent());
}
-
+
@Test
public void cacheAccountsForContext() throws Exception {
TestFeatureRegistry.Builder builder = TestFeatureRegistry.newBuilder();
@@ -261,52 +261,52 @@ public class FeatureRegistryTest {
String theContainer = "the-container";
attribs.put("container", theContainer);
Uri feature1Uri = builder.expectResource(xml(BOTTOM_TPL, "gadget", content1Uri.getPath(), null, attribs));
-
+
// Register it.
registry = builder.build(feature1Uri.toString());
-
+
// Retrieve content for matching context.
List<String> needed = Lists.newArrayList("bottom");
List<String> unsupported = Lists.newArrayList();
List<FeatureResource> resources = registry.getFeatureResources(
getCtx(RenderingContext.GADGET, theContainer), needed, unsupported).getResources();
-
+
// Retrieve again w/ mismatch container.
List<FeatureResource> resourcesNoMatch = registry.getFeatureResources(
getCtx(RenderingContext.GADGET, "foo"), needed, unsupported).getResources();
-
+
// Retrieve again w/ mismatched context.
List<FeatureResource> ctxMismatch = registry.getFeatureResources(
getCtx(RenderingContext.CONTAINER, theContainer), needed, unsupported).getResources();
assertNotSame(resources, resourcesNoMatch);
assertNotSame(resources, ctxMismatch);
-
+
assertEquals(1, resources.size());
assertEquals(content1, resources.get(0).getContent());
-
+
assertEquals(0, resourcesNoMatch.size());
assertEquals(0, ctxMismatch.size());
-
+
// Make sure caches work with appropriate matching.
List<FeatureResource> resources2 = registry.getFeatureResources(
getCtx(RenderingContext.GADGET, theContainer), needed, unsupported).getResources();
assertSame(resources, resources2);
-
+
List<FeatureResource> resourcesNoMatch2 = registry.getFeatureResources(
getCtx(RenderingContext.GADGET, "foo"), needed, unsupported).getResources();
assertSame(resourcesNoMatch, resourcesNoMatch2);
-
+
List<FeatureResource> ctxMismatch2 = registry.getFeatureResources(
getCtx(RenderingContext.CONTAINER, theContainer), needed, unsupported).getResources();
assertSame(ctxMismatch, ctxMismatch2);
-
+
// Check ignoreCache
List<FeatureResource> resourcesIC = registry.getFeatureResources(
getCtx(RenderingContext.GADGET, theContainer, true), needed, unsupported).getResources();
assertNotSame(resources, resourcesIC);
}
-
+
@Test
public void missingIndexResultsInException() throws Exception {
try {
@@ -317,7 +317,7 @@ public class FeatureRegistryTest {
assertEquals(GadgetException.Code.INVALID_PATH, e.getCode());
}
}
-
+
@Test
public void missingFileResultsInException() throws Exception {
try {
@@ -329,17 +329,17 @@ public class FeatureRegistryTest {
assertEquals(GadgetException.Code.INVALID_CONFIG, e.getCode());
}
}
-
+
@Test
public void selectExactFeatureResourcesGadget() throws Exception {
checkExactFeatureResources("gadget", RenderingContext.GADGET);
}
-
+
@Test
public void selectExactFeatureResourcesContainer() throws Exception {
checkExactFeatureResources("container", RenderingContext.CONTAINER);
}
-
+
private void checkExactFeatureResources(String type, RenderingContext rctx) throws Exception {
setupFullRegistry(type, null);
GadgetContext ctx = getCtx(rctx, null);
@@ -351,17 +351,17 @@ public class FeatureRegistryTest {
assertEquals("nodep", resources.get(0).getContent());
assertEquals("bottom", resources.get(1).getContent());
}
-
+
@Test
public void selectNoContentValidFeatureResourcesGadget() throws Exception {
checkNoContentValidFeatureResources("gadget", RenderingContext.CONTAINER);
}
-
+
@Test
public void selectNoContentValidFeatureResourcesContainer() throws Exception {
checkNoContentValidFeatureResources("container", RenderingContext.GADGET);
}
-
+
private void checkNoContentValidFeatureResources(
String type, RenderingContext rctx) throws Exception {
setupFullRegistry(type, null);
@@ -371,24 +371,24 @@ public class FeatureRegistryTest {
List<FeatureResource> resources = registry.getFeatureResources(ctx, needed, unsupported).getResources();
assertEquals(0, resources.size());
}
-
+
@Test
public void testTransitiveFeatureResourcesGadget() throws Exception {
checkTransitiveFeatureResources("gadget", RenderingContext.GADGET);
}
-
+
@Test
public void testTransitiveFeatureResourcesContainer() throws Exception {
checkTransitiveFeatureResources("container", RenderingContext.CONTAINER);
}
-
+
private void checkTransitiveFeatureResources(String type, RenderingContext rctx)
throws Exception {
setupFullRegistry(type, null);
GadgetContext ctx = getCtx(rctx, null);
List<String> needed = Lists.newArrayList("top", "nodep");
List<String> unsupported = Lists.newLinkedList();
-
+
// Should come back in insertable order (from bottom of the graph up),
// querying in feature.xml dependency order.
List<FeatureResource> resources = registry.getFeatureResources(ctx, needed, unsupported).getResources();
@@ -399,7 +399,7 @@ public class FeatureRegistryTest {
assertEquals("top", resources.get(3).getContent());
assertEquals("nodep", resources.get(4).getContent());
}
-
+
@Test
public void unsupportedFeaturesPopulated() throws Exception {
// Test only for gadget case; above tests are sufficient to ensure
@@ -414,7 +414,7 @@ public class FeatureRegistryTest {
assertEquals(1, unsupported.size());
assertEquals("does-not-exist", unsupported.get(0));
}
-
+
@Test
public void filterFeaturesByContainerMatch() throws Exception {
// Again test only for gadget case; above tests cover type <-> RenderingContext
@@ -428,7 +428,7 @@ public class FeatureRegistryTest {
assertEquals("bottom", resources.get(1).getContent());
assertEquals(0, unsupported.size());
}
-
+
@Test
public void filterFeaturesByContainerNoMatch() throws Exception {
// Again test only for gadget case; above tests cover type <-> RenderingContext
@@ -440,7 +440,7 @@ public class FeatureRegistryTest {
assertEquals(0, resources.size()); // no resource matches but all feature keys valid
assertEquals(0, unsupported.size());
}
-
+
@Test
public void getFeatureResourcesNoTransitiveSingle() throws Exception {
setupFullRegistry("gadget", null);
@@ -454,18 +454,18 @@ public class FeatureRegistryTest {
assertEquals("bottom", resources.get(1).getContent());
assertEquals(0, unsupported.size());
}
-
+
@Test
public void getAllFeatures() throws Exception {
setupFullRegistry("gadget", null);
List<FeatureResource> resources = registry.getAllFeatures().getResources();
-
+
// No guaranteed order (top/mid/bottom bundle may be before nodep)
// Just check that there are 5 resources around and let the above tests
// handle transitivity checks.
assertEquals(5, resources.size());
}
-
+
@Test
public void getFeaturesStringsNoTransitive() throws Exception {
setupFullRegistry("gadget", null);
@@ -475,7 +475,7 @@ public class FeatureRegistryTest {
assertEquals("nodep", featureNames.get(0));
assertEquals("bottom", featureNames.get(1));
}
-
+
@Test
public void getFeaturesStringsTransitive() throws Exception {
setupFullRegistry("gadget", null);
@@ -488,11 +488,11 @@ public class FeatureRegistryTest {
assertEquals("top", featureNames.get(3));
assertEquals("nodep", featureNames.get(4));
}
-
+
@Test
public void loopIsDetectedAndCrashes() throws Exception {
TestFeatureRegistry.Builder builder = TestFeatureRegistry.newBuilder();
-
+
// Set up a registry with features loop_a,b,c. C points back to A, which should
// cause an exception to be thrown by the register method.
String type = "gadget";
@@ -508,7 +508,7 @@ public class FeatureRegistryTest {
assertEquals(GadgetException.Code.INVALID_CONFIG, e.getCode());
}
}
-
+
@Test
public void unavailableFeatureCrashes() throws Exception {
TestFeatureRegistry.Builder builder = TestFeatureRegistry.newBuilder();
@@ -519,7 +519,7 @@ public class FeatureRegistryTest {
assertEquals(GadgetException.Code.INVALID_CONFIG, e.getCode());
}
}
-
+
@Test
public void returnOnlyContainerFilteredJs() throws Exception {
TestFeatureRegistry.Builder builder = TestFeatureRegistry.newBuilder();
@@ -539,7 +539,7 @@ public class FeatureRegistryTest {
assertEquals(1, resources.size());
assertEquals(containerContent, resources.get(0).getContent());
}
-
+
@Test
public void returnDefaultMatchJs() throws Exception {
TestFeatureRegistry.Builder builder = TestFeatureRegistry.newBuilder();
@@ -553,13 +553,13 @@ public class FeatureRegistryTest {
registry = builder.build(featureUri.toString());
List<String> needed = Lists.newArrayList(feature);
List<String> unsupported = Lists.newLinkedList();
- List<FeatureResource> resources =
+ List<FeatureResource> resources =
registry.getFeatureResources(
getCtx(RenderingContext.GADGET, "othercontainer"), needed, unsupported).getResources();
assertEquals(1, resources.size());
assertEquals(defaultContent, resources.get(0).getContent());
}
-
+
private String getContainerAndDefaultTpl(String name, String container, String c1, String c2) {
StringBuilder sb = new StringBuilder();
sb.append("<feature><name>").append(name).append("</name>");
@@ -570,7 +570,7 @@ public class FeatureRegistryTest {
sb.append("</feature>");
return sb.toString();
}
-
+
@Test
public void resourceGetsMergedAttribs() throws Exception {
TestFeatureRegistry.Builder builder = TestFeatureRegistry.newBuilder();
@@ -582,16 +582,16 @@ public class FeatureRegistryTest {
attribs.put("container", theContainer);
attribs.put("one", "bundle-one");
attribs.put("two", "bundle-two");
-
+
Map<String, String> resourceAttribs = Maps.newHashMap();
attribs.put("two", "attrib-two");
attribs.put("three", "attrib-three");
Uri feature1Uri = builder.expectResource(xml(BOTTOM_TPL, "gadget", content1Uri.getPath(),
null, attribs, resourceAttribs));
-
+
// Register it.
registry = builder.build(feature1Uri.toString());
-
+
// Retrieve the resource for matching context.
List<String> needed = Lists.newArrayList("bottom");
List<String> unsupported = Lists.newArrayList();
@@ -610,7 +610,7 @@ public class FeatureRegistryTest {
assertEquals("attrib-two", lastAttribs.get("two"));
assertEquals("attrib-three", lastAttribs.get("three"));
}
-
+
@Test
public void testGetGadgetFromMixedRegistry() throws Exception {
setupMixedFullRegistry();
@@ -618,16 +618,16 @@ public class FeatureRegistryTest {
GadgetContext ctx = getCtx(RenderingContext.GADGET, null);
List<String> needed = Lists.newArrayList("top");
List<String> unsupported = Lists.newLinkedList();
-
+
List<FeatureResource> resources = registry.getFeatureResources(ctx, needed, unsupported).getResources();
-
+
assertEquals(4, resources.size());
assertEquals("bottom();all();", resources.get(0).getContent());
assertEquals("mid_b();gadget();", resources.get(1).getContent());
assertEquals("mid_a();all();", resources.get(2).getContent());
assertEquals("top();gadget();", resources.get(3).getContent());
}
-
+
@Test
public void testGetContainerFromMixedRegistry() throws Exception {
setupMixedFullRegistry();
@@ -635,16 +635,16 @@ public class FeatureRegistryTest {
GadgetContext ctx = getCtx(RenderingContext.CONTAINER, null);
List<String> needed = Lists.newArrayList("top");
List<String> unsupported = Lists.newLinkedList();
-
+
List<FeatureResource> resources = registry.getFeatureResources(ctx, needed, unsupported).getResources();
-
+
assertEquals(4, resources.size());
assertEquals("bottom();all();", resources.get(0).getContent());
assertEquals("mid_b();container();", resources.get(1).getContent());
assertEquals("mid_a();container();", resources.get(2).getContent());
assertEquals("top();all();", resources.get(3).getContent());
}
-
+
@Test
public void testGetConfiguredGadgetFromMixedRegistry() throws Exception {
setupMixedFullRegistry();
@@ -652,20 +652,20 @@ public class FeatureRegistryTest {
GadgetContext ctx = getCtx(RenderingContext.CONFIGURED_GADGET, null);
List<String> needed = Lists.newArrayList("top");
List<String> unsupported = Lists.newLinkedList();
-
+
List<FeatureResource> resources = registry.getFeatureResources(ctx, needed, unsupported).getResources();
-
+
assertEquals(4, resources.size());
assertEquals("bottom();all();", resources.get(0).getContent());
assertEquals("mid_b();gadget();", resources.get(1).getContent());
assertEquals("mid_a();all();", resources.get(2).getContent());
assertEquals("top();gadget();", resources.get(3).getContent());
}
-
+
private GadgetContext getCtx(final RenderingContext rctx, final String container) {
return getCtx(rctx, container, false);
}
-
+
private GadgetContext getCtx(final RenderingContext rctx, final String container,
final boolean ignoreCache) {
return new GadgetContext() {
@@ -673,26 +673,26 @@ public class FeatureRegistryTest {
public RenderingContext getRenderingContext() {
return rctx;
}
-
+
@Override
public String getContainer() {
return container != null ? container : ContainerConfig.DEFAULT_CONTAINER;
}
-
+
@Override
public boolean getIgnoreCache() {
return ignoreCache;
}
};
}
-
+
private void setupMixedFullRegistry() throws Exception {
// Sets up a "full" gadget feature registry with several features registered in linear
// dependency order: top -> mid_a -> mid_b -> bottom
// The content registered for each is equal to the feature's name, for simplicity.
// Also, all content is loaded as inline, also for simplicity.
TestFeatureRegistry.Builder builder = TestFeatureRegistry.newBuilder();
-
+
Uri topUri = builder.expectResource(
"<feature>" +
"<name>top</name>" +
@@ -740,10 +740,10 @@ public class FeatureRegistryTest {
);
Uri txtFile = builder.expectResource(topUri.toString() + '\n' +
midAUri.toString() + '\n' + midBUri.toString() + '\n' + bottomUri.toString(), ".txt");
-
+
registry = builder.build(txtFile.toString());
}
-
+
private void setupFullRegistry(String type, String containers) throws Exception {
// Sets up a "full" gadget feature registry with several features registered:
// nodep - has no deps on anything else
@@ -753,12 +753,12 @@ public class FeatureRegistryTest {
// The content registered for each is equal to the feature's name, for simplicity.
// Also, all content is loaded as inline, also for simplicity.
TestFeatureRegistry.Builder builder = TestFeatureRegistry.newBuilder();
-
+
Map<String, String> attribs = Maps.newHashMap();
if (containers != null) {
attribs.put("container", containers);
}
-
+
Uri nodepUri = builder.expectResource(xml(NODEP_TPL, type, null, "nodep", attribs));
Uri topUri = builder.expectResource(xml(TOP_TPL, type, null, "top", attribs));
Uri midAUri = builder.expectResource(xml(MID_A_TPL, type, null, "mid_a", attribs));
@@ -768,7 +768,7 @@ public class FeatureRegistryTest {
midAUri.toString() + '\n' + midBUri.toString() + '\n' + bottomUri.toString(), ".txt");
registry = builder.build(txtFile.toString());
}
-
+
private static String getFeatureTpl(String name, String[] deps) {
StringBuilder sb = new StringBuilder();
sb.append("<feature><name>").append(name).append("</name>");
@@ -779,16 +779,16 @@ public class FeatureRegistryTest {
sb.append("</feature>");
return sb.toString();
}
-
+
private static String xml(String tpl, String type, String uri, String content) {
return xml(tpl, type, uri, content, Maps.<String, String>newHashMap());
}
-
+
private static String xml(String tpl, String type, String uri, String content,
Map<String, String> attribs) {
return xml(tpl, type, uri, content, attribs, Maps.<String, String>newHashMap());
}
-
+
private static String xml(String tpl, String type, String uri, String content,
Map<String, String> attribs, Map<String, String> resourceAttribs) {
StringBuilder sb = new StringBuilder();
@@ -805,7 +805,7 @@ public class FeatureRegistryTest {
.replace("%type_attribs%", sb.toString())
.replace("%res_attribs%", sbRes.toString());
}
-
+
private static Uri makeFile(String content) throws Exception {
// .xml suffix used even for js -- should be OK per FeatureResourceLoader tests
// which simply indicate not to attempt .opt.js loading in this case.
@@ -816,7 +816,7 @@ public class FeatureRegistryTest {
out.close();
return Uri.fromJavaUri(file.toURI());
}
-
+
private static Uri makeResourceUri(String suffix) {
return Uri.parse("res://" + RESOURCE_BASE_PATH + "/file" + (++resourceIdx) + suffix);
}
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/AbstractHttpFetcherTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/AbstractHttpFetcherTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/AbstractHttpFetcherTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/AbstractHttpFetcherTest.java Sun Feb 26 23:43:20 2012
@@ -62,7 +62,7 @@ public abstract class AbstractHttpFetche
} catch (GadgetException e) {
assertEquals(400, e.getHttpStatusCode());
assertTrue(e.getMessage().contains("Bad host name in request"));
- }
+ }
}
@Test public void testHttpBadPort() throws Exception {
@@ -74,7 +74,7 @@ public abstract class AbstractHttpFetche
} catch (GadgetException e) {
assertEquals(400, e.getHttpStatusCode());
assertTrue(e.getMessage().contains("Bad port number in request"));
- }
+ }
}
@Test public void testHttpBadUrl() throws Exception {
@@ -86,7 +86,7 @@ public abstract class AbstractHttpFetche
} catch (GadgetException e) {
assertEquals(400, e.getHttpStatusCode());
assertTrue(e.getMessage().contains("Missing domain name for request"));
- }
+ }
}
@Test public void testHttpNoSchema() throws Exception {
@@ -98,7 +98,7 @@ public abstract class AbstractHttpFetche
} catch (GadgetException e) {
assertEquals(400, e.getHttpStatusCode());
assertTrue(e.getMessage().contains("Missing schema for request"));
- }
+ }
}
@Test public void testHttpUnderscore() throws Exception {
@@ -232,7 +232,7 @@ public abstract class AbstractHttpFetche
assertEquals("POST", response.getHeader("x-method"));
ArrayAssert.assertEquals(body, response.getResponseAsBytes());
}
-
+
@Test public void testFollowRedirects() throws Exception {
String content = "";
Uri uri = new UriBuilder(BASE_URL)
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/BasicHttpFetcherTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/BasicHttpFetcherTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/BasicHttpFetcherTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/BasicHttpFetcherTest.java Sun Feb 26 23:43:20 2012
@@ -176,7 +176,7 @@ public class BasicHttpFetcherTest {
}
EasyMock.verify(mockEntity, mockInputStream);
}
-
+
/*
* https://issues.apache.org/jira/browse/SHINDIG-1425
*/
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseBuilderTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseBuilderTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseBuilderTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseBuilderTest.java Sun Feb 26 23:43:20 2012
@@ -188,9 +188,9 @@ public class HttpResponseBuilderTest {
HttpResponseBuilder builder = new HttpResponseBuilder()
.addHeader("Content-Type", "text/html; charset=Big5")
.setEncoding(Charsets.UTF_8);
-
+
Multimap<String, String> headers = builder.getHeaders();
- assertEquals("text/html; charset=UTF-8", headers.get("Content-Type").iterator().next());
+ assertEquals("text/html; charset=UTF-8", headers.get("Content-Type").iterator().next());
}
@Test
@@ -198,9 +198,9 @@ public class HttpResponseBuilderTest {
HttpResponseBuilder builder = new HttpResponseBuilder()
.addHeader("Content-Type", "text/html")
.setEncoding(Charsets.UTF_8);
-
+
Multimap<String, String> headers = builder.getHeaders();
- assertEquals("text/html; charset=UTF-8", headers.get("Content-Type").iterator().next());
+ assertEquals("text/html; charset=UTF-8", headers.get("Content-Type").iterator().next());
}
@Test
@@ -218,7 +218,7 @@ public class HttpResponseBuilderTest {
.setResponseString("foo")
.create();
Multimap<String, String> headers = resp.getHeaders();
- assertEquals("text/html; charset=UTF-8", headers.get("Content-Type").iterator().next());
+ assertEquals("text/html; charset=UTF-8", headers.get("Content-Type").iterator().next());
assertEquals("foo", resp.getResponseAsString());
}
@@ -255,7 +255,7 @@ public class HttpResponseBuilderTest {
// Insure that headers are stored in the order they are added
assertEquals(Joiner.on(",").join(resp.getHeaders("Soup")), Joiner.on(",").join(soupList));
}
-
+
@Test
public void noModsReturnsSameResponse() {
HttpResponseBuilder builder = new HttpResponseBuilder();
@@ -264,7 +264,7 @@ public class HttpResponseBuilderTest {
HttpResponse response = builder.create();
assertSame(response, builder.create());
}
-
+
@Test
public void noModsReturnsSameResponseBuilderCtor() {
HttpResponseBuilder builder = new HttpResponseBuilder();
@@ -272,7 +272,7 @@ public class HttpResponseBuilderTest {
HttpResponseBuilder nextBuilder = new HttpResponseBuilder(builder);
assertSame(builder.create(), nextBuilder.create());
}
-
+
@Test
public void noModsReturnsSameResponseBaseCtor() {
HttpResponse response = new HttpResponse("foo");
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseMetadataHelperTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseMetadataHelperTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseMetadataHelperTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseMetadataHelperTest.java Sun Feb 26 23:43:20 2012
@@ -30,23 +30,23 @@ public class HttpResponseMetadataHelperT
HttpResponse local = new HttpResponseBuilder()
.setResponseString("data1")
.create();
-
- HttpResponse compiled = HttpResponseMetadataHelper.updateMetadata(local,
+
+ HttpResponse compiled = HttpResponseMetadataHelper.updateMetadata(local,
ImmutableMap.<String, String>of("K", "V"));
assertEquals(1, compiled.getMetadata().size());
assertEquals("V", compiled.getMetadata().get("K"));
- HttpResponse compiled2 = HttpResponseMetadataHelper.updateMetadata(compiled,
+ HttpResponse compiled2 = HttpResponseMetadataHelper.updateMetadata(compiled,
ImmutableMap.<String, String>of("K2", "V2"));
assertEquals(2, compiled2.getMetadata().size());
assertEquals("V2", compiled2.getMetadata().get("K2"));
- HttpResponse compiled3 = HttpResponseMetadataHelper.updateMetadata(compiled2,
+ HttpResponse compiled3 = HttpResponseMetadataHelper.updateMetadata(compiled2,
ImmutableMap.<String, String>of("K", "V3"));
assertEquals(2, compiled3.getMetadata().size());
assertEquals("V3", compiled3.getMetadata().get("K"));
}
-
+
@Test
public void testHashCodeSimple() {
HttpResponse local = new HttpResponseBuilder()
@@ -82,7 +82,7 @@ public class HttpResponseMetadataHelperT
HttpResponseMetadataHelper metdataHelper = new HttpResponseMetadataHelper();
HttpResponse compiled = HttpResponseMetadataHelper.updateHash(resp, metdataHelper);
assertEquals(metadataSize, compiled.getMetadata().size());
- assertEquals(hash, compiled.getMetadata().get(HttpResponseMetadataHelper.DATA_HASH));
+ assertEquals(hash, compiled.getMetadata().get(HttpResponseMetadataHelper.DATA_HASH));
}
-
+
}
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/MultipleResourceHttpFetcherTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/MultipleResourceHttpFetcherTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/MultipleResourceHttpFetcherTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/MultipleResourceHttpFetcherTest.java Sun Feb 26 23:43:20 2012
@@ -78,7 +78,7 @@ public class MultipleResourceHttpFetcher
assertEquals(CSS_URI, futureTasks.get(1).one);
assertEquals(reqCxt2, futureTasks.get(1).two.get());
assertEquals(IMG_URI, futureTasks.get(2).one);
- assertEquals(reqCxt3, futureTasks.get(2).two.get());
+ assertEquals(reqCxt3, futureTasks.get(2).two.get());
verify();
}
@@ -94,7 +94,7 @@ public class MultipleResourceHttpFetcher
assertEquals(2, futureTasks.size());
assertTrue(futureTasks.containsKey(IMG_URI));
assertEquals(reqCxt1, futureTasks.get(IMG_URI).get());
- assertTrue(futureTasks.containsKey(CSS_URI));
+ assertTrue(futureTasks.containsKey(CSS_URI));
assertEquals(reqCxt2, futureTasks.get(CSS_URI).get());
verify();
}
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/AddJslInfoVariableProcessorTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/AddJslInfoVariableProcessorTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/AddJslInfoVariableProcessorTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/AddJslInfoVariableProcessorTest.java Sun Feb 26 23:43:20 2012
@@ -71,7 +71,7 @@ public class AddJslInfoVariableProcessor
assertEquals("", response.build().toJsString());
control.verify();
}
-
+
@Test
public void addsHint() throws Exception {
setJsUri(URI);
@@ -82,7 +82,7 @@ public class AddJslInfoVariableProcessor
AddJslInfoVariableProcessor.FEATURES_HINT_TEMPLATE,
URI_JS, LIBS_JS);
assertEquals(expected, response.build().toJsString());
- control.verify();
+ control.verify();
}
@Test
@@ -99,9 +99,9 @@ public class AddJslInfoVariableProcessor
assertEquals(expected, response.build().toJsString());
assertFalse(captureJsUri.getValue().isJsload());
assertTrue(captureJsUri.getValue().isNohint());
- control.verify();
+ control.verify();
}
-
+
@Test
public void addsHintWithoutUriIfBlank() throws Exception {
setJsUri("");
@@ -111,9 +111,9 @@ public class AddJslInfoVariableProcessor
AddJslInfoVariableProcessor.FEATURES_HINT_TEMPLATE,
LIBS_JS);
assertEquals(expected, response.build().toJsString());
- control.verify();
+ control.verify();
}
-
+
private void setJsUri(String uri) {
jsUri = new JsUri(UriStatus.VALID_UNVERSIONED, Uri.parse(uri), LIBS, null);
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/AnonFuncWrappingProcessorTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/AnonFuncWrappingProcessorTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/AnonFuncWrappingProcessorTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/AnonFuncWrappingProcessorTest.java Sun Feb 26 23:43:20 2012
@@ -33,17 +33,17 @@ public class AnonFuncWrappingProcessorTe
public void wrapCodeAllRunTime() throws Exception {
checkWrapCode(JsCompileMode.CONCAT_COMPILE_EXPORT_ALL, true);
}
-
+
@Test
public void wrapCodeExplicitRunTime() throws Exception {
checkWrapCode(JsCompileMode.CONCAT_COMPILE_EXPORT_EXPLICIT, true);
}
-
+
@Test
public void wrapCodeBuildTimeDoesNothing() throws Exception {
checkWrapCode(JsCompileMode.COMPILE_CONCAT, false);
}
-
+
private void checkWrapCode(JsCompileMode mode, boolean wraps) throws Exception {
IMocksControl control = createControl();
JsRequest request = control.createMock(JsRequest.class);
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/DefaultJsProcessorRegistryTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/DefaultJsProcessorRegistryTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/DefaultJsProcessorRegistryTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/DefaultJsProcessorRegistryTest.java Sun Feb 26 23:43:20 2012
@@ -81,13 +81,13 @@ public class DefaultJsProcessorRegistryT
registry.process(request, response);
control.verify();
}
-
+
@Test
public void testProcessorStopsProcessingWhenItReturnsFalse() throws Exception {
EasyMock.expect(processor1.process(request, response)).andReturn(false);
EasyMock.expect(processor3.process(request, response)).andReturn(true);
control.replay();
registry.process(request, response);
- control.verify();
+ control.verify();
}
}
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/ExportJsProcessorTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/ExportJsProcessorTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/ExportJsProcessorTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/ExportJsProcessorTest.java Sun Feb 26 23:43:20 2012
@@ -70,13 +70,13 @@ public class ExportJsProcessorTest {
"exportJs('shindig',[shindig]);" +
"exportJs('gadgets.rpc',[gadgets,gadgets.rpc],{call:'call',register:'register'});" +
"exportJs('shindig',[shindig],{random:'random'});";
-
+
private final String EXPORT_STRING_2 =
"exportJs('foo',[foo]);" +
"exportJs('foo.prototype',[foo,foo.prototype],{bar:'bar'});";
private final String EXPORT_STRING_3 = "";
-
+
private JsContent textJsContent1;
private JsContent textJsContent2;
private JsContent featureJsContent1;
@@ -119,7 +119,7 @@ public class ExportJsProcessorTest {
private JsUri mockJsUri(JsCompileMode mode) {
return mockJsUri(mode, false);
}
-
+
private JsUri mockJsUri(JsCompileMode mode, boolean isJsload) {
JsUri result = createMock(JsUri.class);
expect(result.getCompileMode()).andStubReturn(mode);
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/IfModifiedSinceProcessorTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/IfModifiedSinceProcessorTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/IfModifiedSinceProcessorTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/IfModifiedSinceProcessorTest.java Sun Feb 26 23:43:20 2012
@@ -49,7 +49,7 @@ public class IfModifiedSinceProcessorTes
response = new JsResponseBuilder();
processor = new IfModifiedSinceProcessor();
}
-
+
@Test
public void testDoesNothingAndContinuesProcessingWhenHeaderIsAbsent() throws Exception {
EasyMock.expect(request.isInCache()).andReturn(false);
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/JsRequestBuilderTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/JsRequestBuilderTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/JsRequestBuilderTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/JsRequestBuilderTest.java Sun Feb 26 23:43:20 2012
@@ -46,7 +46,7 @@ public class JsRequestBuilderTest {
private static final String HOST_HEADER_KEY = "Host";
private static final String IMS_HEADER_KEY = "If-Modified-Since";
private static final String HOST = "localhost";
-
+
private IMocksControl control;
private JsUriManager jsUriManager;
private JsUri jsUri;
@@ -62,7 +62,7 @@ public class JsRequestBuilderTest {
request = control.createMock(HttpServletRequest.class);
registry = control.createMock(FeatureRegistry.class);
builder = new JsRequestBuilder(jsUriManager, registry);
-
+
EasyMock.expect(request.getScheme()).andReturn("http");
EasyMock.expect(request.getServerPort()).andReturn(80);
EasyMock.expect(request.getServerName()).andReturn("HOST");
@@ -109,7 +109,7 @@ public class JsRequestBuilderTest {
}
control.verify();
}
-
+
@Test
public void testCreateRequestComputesDeps() throws Exception {
List<String> requested = Lists.newArrayList("req1", "req2");
@@ -129,7 +129,7 @@ public class JsRequestBuilderTest {
JsRequest jsRequest = builder.build(request);
assertSame(jsUri, jsRequest.getJsUri());
assertEquals(HOST, jsRequest.getHost());
-
+
List<String> allMatch =
Lists.newArrayList("dep-s1", "dep1", "dep2", "dep-s2", "load1", "load2", "req1", "req2");
assertEquals(allMatch, jsRequest.getAllFeatures());
@@ -137,11 +137,11 @@ public class JsRequestBuilderTest {
List<String> loadedMatch =
Lists.newArrayList("dep-s1", "dep-s2", "load1", "load2");
assertEquals(loadedMatch, jsRequest.getLoadedFeatures());
-
+
List<String> newMatch =
Lists.newArrayList("dep1", "dep2", "req1", "req2");
assertEquals(newMatch, jsRequest.getNewFeatures());
-
+
// Verify calls at the end, since they're made lazily in the context of .getFeatures() calls.
control.verify();
}
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/JsResponseBuilderTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/JsResponseBuilderTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/JsResponseBuilderTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/JsResponseBuilderTest.java Sun Feb 26 23:43:20 2012
@@ -51,7 +51,7 @@ public class JsResponseBuilderTest {
"var e = {};\ne.prototype.f = {};\n",
builder.build().getExterns());
}
-
+
@Test
public void skipsEmptyContent() throws Exception {
builder.appendJs("number 1", "num1");
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreTest.java Sun Feb 26 23:43:20 2012
@@ -140,19 +140,19 @@ public class BasicOAuthStoreTest {
assertEquals(provider, consumer.getConsumer().serviceProvider);
assertEquals("keyname", consumer.getKeyName());
assertEquals("default callback", consumer.getCallbackUrl());
-
+
cks = new BasicOAuthStoreConsumerKeyAndSecret(
"somekey", "default", KeyType.RSA_PRIVATE, "keyname", "callback");
store.setDefaultKey(cks);
consumer = store.getConsumerKeyAndSecret(t, "", provider);
assertEquals("callback", consumer.getCallbackUrl());
}
-
+
@Test
public void testNullCallback() throws Exception {
store = new BasicOAuthStore();
store.initFromConfigString(SAMPLE_FILE);
-
+
FakeGadgetToken t = new FakeGadgetToken();
t.setAppUrl("http://localhost:8080/samplecontainer/examples/oauth.xml");
OAuthServiceProvider provider = new OAuthServiceProvider("req", "authorize", "access");
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/GadgetTokenStoreTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/GadgetTokenStoreTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/GadgetTokenStoreTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/GadgetTokenStoreTest.java Sun Feb 26 23:43:20 2012
@@ -40,7 +40,7 @@ import org.junit.Assert;
public class GadgetTokenStoreTest {
private static final String GADGET_URL = "http://www.example.com/gadget.xml";
-
+
public static final String DEFAULT_CALLBACK = "http://www.example.com/oauthcallback";
public static final String GADGET_SPEC =
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthRequestTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthRequestTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthRequestTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthRequestTest.java Sun Feb 26 23:43:20 2012
@@ -125,10 +125,10 @@ public class OAuthRequestTest {
public String generateCallback(OAuthFetcherConfig fetcherConfig, String baseCallback,
HttpRequest request, OAuthResponseParams responseParams) {
return null;
- }
+ }
};
}
-
+
private OAuthCallbackGenerator createRealCallbackGenerator() {
return new OAuthCallbackGenerator() {
public String generateCallback(OAuthFetcherConfig fetcherConfig, String baseCallback,
@@ -142,7 +142,7 @@ public class OAuthRequestTest {
.setAuthority(activeUrl.getAuthority())
.setPath("/realcallback")
.toString();
- }
+ }
};
}
@@ -152,7 +152,7 @@ public class OAuthRequestTest {
public GadgetOAuthTokenStore getOAuthStore(BasicOAuthStore base) {
return getOAuthStore(base, new FakeGadgetSpecFactory());
}
-
+
private GadgetOAuthTokenStore getOAuthStore(BasicOAuthStore base,
GadgetSpecFactory specFactory) {
if (base == null) {
@@ -351,7 +351,7 @@ public class OAuthRequestTest {
assertEquals("User data is hello-oauth", response.getResponseAsString());
checkEmptyLog();
}
-
+
@Test
public void testOAuthFlow_badCallbackVerifier() throws Exception {
fetcherConfig = new OAuthFetcherConfig(
@@ -364,18 +364,18 @@ public class OAuthRequestTest {
HttpResponse response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
assertEquals("", response.getResponseAsString());
-
+
client.approveToken("user_data=hello-oauth");
client.setReceivedCallbackUrl("nonsense");
response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
assertEquals("", response.getResponseAsString());
assertNotNull(response.getMetadata().get("oauthErrorText"));
-
+
client.approveToken("user_data=try-again");
response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
assertEquals("User data is try-again", response.getResponseAsString());
}
-
+
@Test
public void testOAuthFlow_tokenReused() throws Exception {
MakeRequestClient client = makeNonSocialClient("owner", "owner", GADGET_URL);
@@ -430,7 +430,7 @@ public class OAuthRequestTest {
getOAuthStore(base, null),
clock, callbackGenerator,
false);
-
+
MakeRequestClient client = makeNonSocialClient("owner", "owner", GADGET_URL);
setNoSpecOptions(client);
@@ -442,7 +442,7 @@ public class OAuthRequestTest {
assertEquals("User data is hello-oauth", response.getResponseAsString());
checkEmptyLog();
}
-
+
private void setNoSpecOptions(MakeRequestClient client) {
client.getBaseArgs().setRequestOption(OAuthArguments.PROGRAMMATIC_CONFIG_PARAM, "true");
client.getBaseArgs().setRequestOption(OAuthArguments.PARAM_LOCATION_PARAM, "uri-query");
@@ -454,14 +454,14 @@ public class OAuthRequestTest {
client.getBaseArgs().setRequestOption(OAuthArguments.AUTHORIZATION_URL_PARAM,
FakeOAuthServiceProvider.APPROVAL_URL);
}
-
+
@Test
public void testOAuthFlow_noSpecNoRequestTokenUrl() throws Exception {
fetcherConfig = new OAuthFetcherConfig(
new BasicBlobCrypter("abcdefghijklmnop".getBytes()),
getOAuthStore(base, null),
clock, null, false);
-
+
MakeRequestClient client = makeNonSocialClient("owner", "owner", GADGET_URL);
setNoSpecOptions(client);
client.getBaseArgs().removeRequestOption(OAuthArguments.REQUEST_TOKEN_URL_PARAM);
@@ -476,21 +476,21 @@ public class OAuthRequestTest {
checkStringContains("should report no request token url", errorText,
"No request token URL specified");
}
-
+
@Test
public void testOAuthFlow_noSpecNoAccessTokenUrl() throws Exception {
fetcherConfig = new OAuthFetcherConfig(
new BasicBlobCrypter("abcdefghijklmnop".getBytes()),
getOAuthStore(base, null),
clock, callbackGenerator, false);
-
+
MakeRequestClient client = makeNonSocialClient("owner", "owner", GADGET_URL);
setNoSpecOptions(client);
client.getBaseArgs().removeRequestOption(OAuthArguments.ACCESS_TOKEN_URL_PARAM);
// Get the request token
HttpResponse response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
-
+
// try to swap for access token
response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
@@ -503,14 +503,14 @@ public class OAuthRequestTest {
checkStringContains("should report no access token url", errorText,
"No access token URL specified");
}
-
+
@Test
public void testOAuthFlow_noSpecNoApprovalUrl() throws Exception {
fetcherConfig = new OAuthFetcherConfig(
new BasicBlobCrypter("abcdefghijklmnop".getBytes()),
getOAuthStore(base, null),
clock, callbackGenerator, false);
-
+
MakeRequestClient client = makeNonSocialClient("owner", "owner", GADGET_URL);
setNoSpecOptions(client);
client.getBaseArgs().removeRequestOption(OAuthArguments.AUTHORIZATION_URL_PARAM);
@@ -526,7 +526,7 @@ public class OAuthRequestTest {
checkStringContains("should report no authorization url", errorText,
"No authorization URL specified");
}
-
+
@Test
public void testOAuthFlow_noSpecAuthHeader() throws Exception {
serviceProvider.setParamLocation(OAuthParamLocation.AUTH_HEADER);
@@ -534,7 +534,7 @@ public class OAuthRequestTest {
new BasicBlobCrypter("abcdefghijklmnop".getBytes()),
getOAuthStore(base, null),
clock, callbackGenerator, false);
-
+
MakeRequestClient client = makeNonSocialClient("owner", "owner", GADGET_URL);
setNoSpecOptions(client);
client.getBaseArgs().setRequestOption(OAuthArguments.PARAM_LOCATION_PARAM, "auth-header");
@@ -547,7 +547,7 @@ public class OAuthRequestTest {
assertEquals("User data is hello-oauth", response.getResponseAsString());
checkEmptyLog();
}
-
+
@Test
public void testOAuthFlow_noSpecPostBody() throws Exception {
serviceProvider.setParamLocation(OAuthParamLocation.POST_BODY);
@@ -555,7 +555,7 @@ public class OAuthRequestTest {
new BasicBlobCrypter("abcdefghijklmnop".getBytes()),
getOAuthStore(base, null),
clock, callbackGenerator, false);
-
+
MakeRequestClient client = makeNonSocialClient("owner", "owner", GADGET_URL);
setNoSpecOptions(client);
client.getBaseArgs().setRequestOption(OAuthArguments.REQUEST_METHOD_PARAM, "POST");
@@ -578,7 +578,7 @@ public class OAuthRequestTest {
new BasicBlobCrypter("abcdefghijklmnop".getBytes()),
getOAuthStore(base, null),
clock, callbackGenerator, false);
-
+
MakeRequestClient client = makeNonSocialClient("owner", "owner", GADGET_URL);
setNoSpecOptions(client);
client.getBaseArgs().setRequestOption(OAuthArguments.REQUEST_METHOD_PARAM, "POST");
@@ -599,7 +599,7 @@ public class OAuthRequestTest {
new BasicBlobCrypter("abcdefghijklmnop".getBytes()),
getOAuthStore(base, null),
clock, null, false);
-
+
MakeRequestClient client = makeNonSocialClient("owner", "owner", GADGET_URL);
setNoSpecOptions(client);
client.getBaseArgs().setRequestOption(OAuthArguments.REQUEST_TOKEN_URL_PARAM, "foo");
@@ -613,14 +613,14 @@ public class OAuthRequestTest {
assertNotNull(errorText);
checkStringContains("should report invalid url", errorText, "Invalid URL: foo");
}
-
+
@Test
public void testOAuthFlow_noSpecBlankUrl() throws Exception {
fetcherConfig = new OAuthFetcherConfig(
new BasicBlobCrypter("abcdefghijklmnop".getBytes()),
getOAuthStore(base, null),
clock, null, false);
-
+
MakeRequestClient client = makeNonSocialClient("owner", "owner", GADGET_URL);
setNoSpecOptions(client);
client.getBaseArgs().setRequestOption(OAuthArguments.REQUEST_TOKEN_URL_PARAM, "");
@@ -634,7 +634,7 @@ public class OAuthRequestTest {
assertNotNull(errorText);
checkStringContains("should report invalid url", errorText, "Invalid URL: ");
}
-
+
@Test
public void testAccessTokenNotUsedForSocialPage() throws Exception {
MakeRequestClient client = makeNonSocialClient("owner", "owner", GADGET_URL);
@@ -956,7 +956,7 @@ public class OAuthRequestTest {
assertEquals("User data is hello-oauth", response.getResponseAsString());
}
-
+
@Test
public void testConsumerThrottled() throws Exception {
assertEquals(0, serviceProvider.getRequestTokenCount());
@@ -1064,7 +1064,7 @@ public class OAuthRequestTest {
assertEquals(3, serviceProvider.getResourceAccessCount());
serviceProvider.setConsumersThrottled(false);
-
+
client.clearState(); // remove any cached oauth tokens
response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL + "?cachebust=3");
@@ -1199,14 +1199,14 @@ public class OAuthRequestTest {
assertTrue(contains(queryParams, "xoauth_public_key", "foo"));
assertFalse(contains(queryParams, "opensocial_proxied_content", "1"));
}
-
+
@Test
public void testSignedFetch_authHeader() throws Exception {
serviceProvider.setParamLocation(OAuthParamLocation.AUTH_HEADER);
MakeRequestClient client = makeSignedFetchClient("o", "v", "http://www.example.com/app");
client.getBaseArgs().setRequestOption(OAuthArguments.PROGRAMMATIC_CONFIG_PARAM, "true");
client.getBaseArgs().setRequestOption(OAuthArguments.PARAM_LOCATION_PARAM, "auth-header");
-
+
HttpResponse resp = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
String auth = resp.getHeader(FakeOAuthServiceProvider.AUTHZ_ECHO_HEADER);
assertNotNull("Should have echoed authz header", auth);
@@ -1228,7 +1228,7 @@ public class OAuthRequestTest {
assertTrue(contains(queryParams, "xoauth_public_key", "foo"));
assertTrue(contains(queryParams, "opensocial_proxied_content", "1"));
}
-
+
@Test
public void testPostBinaryData() throws Exception {
byte[] raw = { 0, 1, 2, 3, 4, 5 };
@@ -1255,7 +1255,7 @@ public class OAuthRequestTest {
byte[] echoedBytes = Base64.decodeBase64(CharsetUtil.getUtf8Bytes(echoed));
assertTrue(Arrays.equals(raw, echoedBytes));
}
-
+
@Test
public void testGetWithFormEncodedBody() throws Exception {
MakeRequestClient client = makeSignedFetchClient("o", "v", "http://www.example.com/app");
@@ -1263,7 +1263,7 @@ public class OAuthRequestTest {
OAuth.FORM_ENCODED, "war=peace&yes=no".getBytes());
assertEquals("war=peace&yes=no", resp.getHeader(FakeOAuthServiceProvider.BODY_ECHO_HEADER));
}
-
+
@Test
public void testGetWithRawBody() throws Exception {
MakeRequestClient client = makeSignedFetchClient("o", "v", "http://www.example.com/app");
@@ -1308,7 +1308,7 @@ public class OAuthRequestTest {
OAuth.FORM_ENCODED, "foo=bar".getBytes());
fail("Should have thrown with oauth signature mismatch");
}
-
+
@Test(expected=RuntimeException.class)
public void testGetTamperedRemoveRawContent() throws Exception {
byte[] raw = { 0, 1, 2, 3, 4, 5 };
@@ -1355,7 +1355,7 @@ public class OAuthRequestTest {
client.sendFormPost(FakeOAuthServiceProvider.RESOURCE_URL, "foo=bar");
fail("Should have thrown with oauth signature mismatch");
}
-
+
@Test(expected=RuntimeException.class)
public void testPostTamperedRemoveRawContent() throws Exception {
byte[] raw = { 0, 1, 2, 3, 4, 5 };
@@ -1372,7 +1372,7 @@ public class OAuthRequestTest {
"funky-content", raw);
fail("Should have thrown with body hash in form encoded request");
}
-
+
@Test
public void testSignedFetch_error401() throws Exception {
assertEquals(0, base.getAccessTokenRemoveCount());
@@ -1388,7 +1388,7 @@ public class OAuthRequestTest {
checkStringContains("Should return response", errorText, "some vague error");
assertEquals(0, base.getAccessTokenRemoveCount());
}
-
+
@Test
public void testSignedFetch_error403() throws Exception {
assertEquals(0, base.getAccessTokenRemoveCount());
@@ -1928,7 +1928,7 @@ public class OAuthRequestTest {
client.setTrustedParam("oauth_magic", "foo");
client.setTrustedParam("opensocial_magic", "bar");
client.setTrustedParam("xoauth_magic", "quux");
-
+
client.setTrustedParam("opensocial_owner_id", "overridden_opensocial_owner_id");
HttpResponse response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
@@ -1939,7 +1939,7 @@ public class OAuthRequestTest {
assertEquals("User data is hello-oauth", response.getResponseAsString());
assertEquals(12, serviceProvider.getTrustedParamCount());
}
-
+
/**
* Test different behaviors of trusted parameters.
* 1) pass two parameters with same name, the latter will win.
@@ -1952,10 +1952,10 @@ public class OAuthRequestTest {
MakeRequestClient client = makeNonSocialClient("owner", "owner", GADGET_URL);
client.setTrustedParam("oauth_magic", "foo");
client.setTrustedParam("opensocial_magic", "bar");
-
+
client.setTrustedParam("xoauth_magic", "quux_overridden");
client.setTrustedParam("xoauth_magic", "quux");
-
+
client.setTrustedParam("opensocial_owner_id", "overridden_opensocial_owner_id");
HttpResponse response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
@@ -1966,7 +1966,7 @@ public class OAuthRequestTest {
assertEquals("User data is hello-oauth", response.getResponseAsString());
assertEquals(12, serviceProvider.getTrustedParamCount());
}
-
+
/**
* Test trusted parameters will always be sent when signOwner and signViewer
* are false.
@@ -1978,7 +1978,7 @@ public class OAuthRequestTest {
client.setTrustedParam("oauth_magic", "foo");
client.setTrustedParam("opensocial_magic", "bar");
client.setTrustedParam("xoauth_magic", "quux");
-
+
client.setTrustedParam("opensocial_owner_id", "overridden_opensocial_owner_id");
HttpResponse response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
@@ -1989,9 +1989,9 @@ public class OAuthRequestTest {
assertEquals("User data is hello-oauth", response.getResponseAsString());
assertEquals(12, serviceProvider.getTrustedParamCount());
}
-
+
/**
- * Test invalid trusted parameters which are not prefixed with 'oauth' 'xoauth' or 'opensocial'.
+ * Test invalid trusted parameters which are not prefixed with 'oauth' 'xoauth' or 'opensocial'.
*/
@Test
public void testTrustedParamsInvalidParameter() throws Exception {
@@ -2006,8 +2006,8 @@ public class OAuthRequestTest {
HttpResponse response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
assertEquals(HttpResponse.SC_FORBIDDEN, response.getHttpStatusCode());
}
-
-
+
+
// Checks whether the given parameter list contains the specified
// key/value pair
@@ -2019,7 +2019,7 @@ public class OAuthRequestTest {
}
return false;
}
-
+
private void checkContains(List<Parameter> params, String key, String value) {
for (Parameter p : params) {
if (p.getKey().equals(key)) {
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/testing/FakeOAuthServiceProvider.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/testing/FakeOAuthServiceProvider.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/testing/FakeOAuthServiceProvider.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/testing/FakeOAuthServiceProvider.java Sun Feb 26 23:43:20 2012
@@ -364,7 +364,7 @@ public class FakeOAuthServiceProvider im
}
OAuthMessage msg = new OAuthMessage(null, null, null);
msg.addParameter("oauth_problem", code);
- msg.addParameter("oauth_problem_advice", text);
+ msg.addParameter("oauth_problem_advice", text);
return new HttpResponseBuilder()
.setHttpStatusCode(rc)
.addHeader("WWW-Authenticate", msg.getAuthorizationHeader("realm"))
@@ -421,10 +421,10 @@ public class FakeOAuthServiceProvider im
}
}
}
-
+
// Return the lot
info.message = new OAuthMessage(method, parsed.getLocation(), params);
-
+
// Check for trusted parameters
if (checkTrustedParams) {
if (!"foo".equals(OAuthUtil.getParameter(info.message, "oauth_magic"))) {
@@ -442,7 +442,7 @@ public class FakeOAuthServiceProvider im
}
trustedParamCount += 4;
}
-
+
return info;
}
@@ -506,7 +506,7 @@ public class FakeOAuthServiceProvider im
/**
* Used to fake a browser visit to approve a token.
- *
+ *
* @return a redirect URL, which may or may not include an oauth verifier
*/
public String browserVisit(String url) throws Exception {
@@ -584,7 +584,7 @@ public class FakeOAuthServiceProvider im
} else if (state == null) {
return makeOAuthProblemReport(OAuth.Problems.TOKEN_REJECTED,
"Unknown request token", HttpResponse.SC_UNAUTHORIZED);
- }
+ }
if (rejectExtraParams) {
String extra = hasExtraParams(info.message);
if (extra != null) {
@@ -723,12 +723,12 @@ public class FakeOAuthServiceProvider im
}
return resp.create();
}
-
+
private void validateMessage(OAuthAccessor accessor, MessageInfo info, boolean tokenEndpoint)
throws OAuthException, IOException, URISyntaxException {
OAuthValidator validator = new FakeTimeOAuthValidator();
validator.validateMessage(info.message,accessor);
-
+
String bodyHash = info.message.getParameter("oauth_body_hash");
if (tokenEndpoint && bodyHash != null) {
throw new RuntimeException("Can't have body hash on token endpoints");
@@ -753,12 +753,12 @@ public class FakeOAuthServiceProvider im
throw new RuntimeException("oauth_body_hash mismatch");
}
}
-
+
// Most OAuth service providers are much laxer than this about checking nonces (rapidly
// changing server-side state scales badly), but we are very strict in test cases.
String nonceKey = info.message.getConsumerKey() + ','
+ info.message.getParameter("oauth_nonce");
-
+
CachedObject<OAuthMessage> previousMessage = nonceCache.getElement(nonceKey);
if (previousMessage != null) {
throw new RuntimeException("Reused nonce, old message = " + previousMessage.obj
@@ -780,7 +780,7 @@ public class FakeOAuthServiceProvider im
.setResponseString("bad request")
.create();
}
-
+
private HttpResponse handleEchoUrl(HttpRequest request) throws Exception {
String query = request.getUri().getQuery();
if (query.contains("add_oauth_token")) {
@@ -795,7 +795,7 @@ public class FakeOAuthServiceProvider im
public void setConsumersThrottled(boolean throttled) {
this.throttled = throttled;
}
-
+
public void setConsumerUnauthorized(boolean unauthorized) {
this.unauthorized = unauthorized;
}
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/testing/MakeRequestClient.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/testing/MakeRequestClient.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/testing/MakeRequestClient.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/testing/MakeRequestClient.java Sun Feb 26 23:43:20 2012
@@ -91,7 +91,7 @@ public class MakeRequestClient {
public void setIgnoreCache(boolean ignoreCache) {
this.ignoreCache = ignoreCache;
}
-
+
public void setNextFetcher(HttpFetcher nextFetcher) {
this.nextFetcher = nextFetcher;
}
@@ -233,11 +233,11 @@ public class MakeRequestClient {
// This will throw if approvalUrl looks wrong.
receivedCallbackUrl = serviceProvider.browserVisit(approvalUrl + '&' + params);
}
-
+
public void setReceivedCallbackUrl(String receivedCallbackUrl) {
this.receivedCallbackUrl = receivedCallbackUrl;
}
-
+
public void clearState() {
this.oauthState = null;
}
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractParserAndSerializerTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractParserAndSerializerTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractParserAndSerializerTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractParserAndSerializerTest.java Sun Feb 26 23:43:20 2012
@@ -28,9 +28,9 @@ import org.junit.Test;
*/
public abstract class AbstractParserAndSerializerTest extends AbstractParsingTestBase {
protected GadgetHtmlParser parser;
-
+
protected abstract GadgetHtmlParser makeParser();
-
+
@Before
public void setUp() throws Exception {
parser = makeParser();
@@ -53,7 +53,7 @@ public abstract class AbstractParserAndS
assertNull(parser.parseDom(content).getDoctype());
parseAndCompareBalanced(content, expected, parser);
}
-
+
@Test
public void docStartsWithHeader() throws Exception {
String content = loadFile("org/apache/shindig/gadgets/parse/test-startswithcomment.html");
@@ -94,11 +94,11 @@ public abstract class AbstractParserAndS
loadFile("org/apache/shindig/gadgets/parse/test-with-ampersands-expected.html");
parseAndCompareBalanced(content, expected, parser);
}
-
+
@Test
public void textBeforeScript() throws Exception {
String content = loadFile("org/apache/shindig/gadgets/parse/test-text-before-script.html");
- String expected =
+ String expected =
loadFile("org/apache/shindig/gadgets/parse/test-text-before-script-expected.html");
parseAndCompareBalanced(content, expected, parser);
}
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractParsingTestBase.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractParsingTestBase.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractParsingTestBase.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractParsingTestBase.java Sun Feb 26 23:43:20 2012
@@ -56,7 +56,7 @@ public abstract class AbstractParsingTes
String serialized = HtmlSerialization.serialize(document);
assertHtmlEquals(expected, serialized);
}
-
+
private void assertHtmlEquals(String expected, String serialized) {
// Compute the diff of expected vs. serialized, and disregard constructs that we don't
// care about, such as whitespace deltas and differently-computed escape sequences.
@@ -98,7 +98,7 @@ public abstract class AbstractParsingTes
}
}
}
-
+
private boolean equivalentEntities(String prev, String cur) {
if (!prev.endsWith(";") && !cur.endsWith(";")) {
return false;