You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by ag...@apache.org on 2006/08/14 20:47:20 UTC

svn commit: r431407 - in /incubator/roller/branches/roller_3.0: build.xml tests/org/apache/roller/business/FileManagerTest.java tests/org/apache/roller/business/PlanetManagerTest.java

Author: agilliland
Date: Mon Aug 14 11:47:19 2006
New Revision: 431407

URL: http://svn.apache.org/viewvc?rev=431407&view=rev
Log:
fixing up unit tests.


Modified:
    incubator/roller/branches/roller_3.0/build.xml
    incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/FileManagerTest.java
    incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/PlanetManagerTest.java

Modified: incubator/roller/branches/roller_3.0/build.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/build.xml?rev=431407&r1=431406&r2=431407&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/build.xml (original)
+++ incubator/roller/branches/roller_3.0/build.xml Mon Aug 14 11:47:19 2006
@@ -883,8 +883,6 @@
         tofile="${build.tests}/WEB-INF/velocity.properties" />
     <copy file="${basedir}/web/WEB-INF/classes/rome.properties"
         tofile="${build.tests}/WEB-INF/classes/rome.properties" />
-    <copy file="${basedir}/web/WEB-INF/toolbox.xml"
-        tofile="${build.tests}/WEB-INF/toolbox.xml" />
     <copy file="${basedir}/web/WEB-INF/classes/blacklist.txt"
         tofile="${build.tests}/WEB-INF/classes/blacklist.txt" />
         	

Modified: incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/FileManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/FileManagerTest.java?rev=431407&r1=431406&r2=431407&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/FileManagerTest.java (original)
+++ incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/FileManagerTest.java Mon Aug 14 11:47:19 2006
@@ -1,20 +1,21 @@
 /*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-*  contributor license agreements.  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.  For additional information regarding
-* copyright in this work, please see the NOTICE file in the top level
-* directory of this distribution.
-*/
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  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.  For additional information regarding
+ * copyright in this work, please see the NOTICE file in the top level
+ * directory of this distribution.
+ */
+
 package org.apache.roller.business;
 
 import java.io.InputStream;
@@ -94,7 +95,7 @@
         // test quota functionality
         FileManager fmgr = RollerFactory.getRoller().getFileManager();
         RollerMessages msgs = new RollerMessages();
-        assertFalse(fmgr.canSave(testWeblog.getHandle(), "test.gif", 2500000, msgs));
+        assertFalse(fmgr.canSave(testWeblog.getHandle(), "test.gif", "text/plain", 2500000, msgs));
     }
     
     
@@ -116,7 +117,7 @@
         
         // store a file
         InputStream is = getClass().getResourceAsStream("/bookmarks.opml");
-        fmgr.saveFile(testWeblog.getHandle(), "bookmarks.opml", 1545, is);
+        fmgr.saveFile(testWeblog.getHandle(), "bookmarks.opml", "text/plain", 1545, is);
         
         // make sure file was stored successfully
         assertEquals(1, fmgr.getFiles(testWeblog.getHandle()).length);

Modified: incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/PlanetManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/PlanetManagerTest.java?rev=431407&r1=431406&r2=431407&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/PlanetManagerTest.java (original)
+++ incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/PlanetManagerTest.java Mon Aug 14 11:47:19 2006
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.roller.business;
 
 import java.io.File;
@@ -81,11 +82,11 @@
             assertNotNull(config);
             assertEquals("test_title", config.getTitle());
             assertEquals("test_admin_email", config.getAdminEmail());
-            assertNull(config.getSiteUrl());
+            assertNull(config.getSiteURL());
         }
         {   // save config
             PlanetConfigData config = planet.getConfiguration();
-            config.setSiteUrl("http://footest/lskdf/null");
+            config.setSiteURL("http://footest/lskdf/null");
             planet.saveConfiguration(config);
             TestUtils.endSession(true);
         }
@@ -93,7 +94,7 @@
             // make sure config was saved
             PlanetConfigData config = planet.getConfiguration();
             assertNotNull(config);
-            assertEquals("http://footest/lskdf/null", config.getSiteUrl());
+            assertEquals("http://footest/lskdf/null", config.getSiteURL());
         }
     }