Author: jcian
Date: Thu Nov 17 16:11:39 2011
New Revision: 1203233
URL: http://svn.apache.org/viewvc?rev=1203233&view=rev
Log:
I realized that I had forgotten to include the ASF license header in a file I
added in an previous commit -- adding the header now...
Modified:
shindig/trunk/java/common/src/test/java/org/apache/shindig/config/JsonContainerConfigLoaderTest.java
shindig/trunk/java/common/src/test/resources/classpath-accessible-test-file.txt
Modified:
shindig/trunk/java/common/src/test/java/org/apache/shindig/config/JsonContainerConfigLoaderTest.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/common/src/test/java/org/apache/shindig/config/JsonContainerConfigLoaderTest.java?rev=1203233&r1=1203232&r2=1203233&view=diff
==============================================================================
---
shindig/trunk/java/common/src/test/java/org/apache/shindig/config/JsonContainerConfigLoaderTest.java
(original)
+++
shindig/trunk/java/common/src/test/java/org/apache/shindig/config/JsonContainerConfigLoaderTest.java
Thu Nov 17 16:11:39 2011
@@ -285,7 +285,11 @@ public class JsonContainerConfigLoaderTe
createConfigForTest(createTemporaryFile(json, ".json").getAbsolutePath());
- assertEquals(testFile, config.getString(DEFAULT_CONTAINER,
DYNAMICALLY_LOADED_VALUE_KEY).trim());
+ //Make sure that the file was properly loaded from the classpath... If it
doesnt start with the
+ //resource prefix and it does contain the expected text then it was loaded
properly.
+ assertFalse(config.getString(DEFAULT_CONTAINER,
DYNAMICALLY_LOADED_VALUE_KEY).
+ startsWith(ResourceLoader.RESOURCE_PREFIX));
+ assertTrue(config.getString(DEFAULT_CONTAINER,
DYNAMICALLY_LOADED_VALUE_KEY).contains(testFile));
}
@Test
Modified:
shindig/trunk/java/common/src/test/resources/classpath-accessible-test-file.txt
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/common/src/test/resources/classpath-accessible-test-file.txt?rev=1203233&r1=1203232&r2=1203233&view=diff
==============================================================================
---
shindig/trunk/java/common/src/test/resources/classpath-accessible-test-file.txt
(original)
+++
shindig/trunk/java/common/src/test/resources/classpath-accessible-test-file.txt
Thu Nov 17 16:11:39 2011
@@ -1 +1,18 @@
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+
classpath-accessible-test-file.txt
\ No newline at end of file
