You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by jd...@apache.org on 2008/07/05 09:59:31 UTC
svn commit: r674159 - in
/archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src:
main/java/org/apache/maven/archiva/web/action/admin/appearance/
test/java/org/apache/maven/archiva/web/action/admin/appearance/
Author: jdumay
Date: Sat Jul 5 00:59:30 2008
New Revision: 674159
URL: http://svn.apache.org/viewvc?rev=674159&view=rev
Log:
Unit tests! huh!
Added:
archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/
archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/EditOrganizationInfoActionTest.java
archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/OrganizationInfoActionTest.java
Modified:
archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/AbstractAppearanceAction.java
Modified: archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/AbstractAppearanceAction.java
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/AbstractAppearanceAction.java?rev=674159&r1=674158&r2=674159&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/AbstractAppearanceAction.java (original)
+++ archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/AbstractAppearanceAction.java Sat Jul 5 00:59:30 2008
@@ -47,6 +47,11 @@
private String organisationUrl;
private String organisationName;
+
+ public void setConfiguration(ArchivaConfiguration configuration)
+ {
+ this.configuration = configuration;
+ }
public String getOrganisationLogo()
{
Added: archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/EditOrganizationInfoActionTest.java
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/EditOrganizationInfoActionTest.java?rev=674159&view=auto
==============================================================================
--- archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/EditOrganizationInfoActionTest.java (added)
+++ archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/EditOrganizationInfoActionTest.java Sat Jul 5 00:59:30 2008
@@ -0,0 +1,69 @@
+package org.apache.maven.archiva.web.action.admin.appearance;
+
+/*
+ * 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.
+ */
+
+import com.opensymphony.xwork.Action;
+import org.apache.maven.archiva.configuration.ArchivaConfiguration;
+import org.apache.maven.archiva.configuration.Configuration;
+import org.apache.maven.archiva.configuration.OrganisationInformation;
+import org.apache.maven.archiva.web.action.AbstractWebworkTestCase;
+import org.easymock.MockControl;
+
+/**
+ * @author <a href="mailto:james@atlassian.com">James William Dumay</a>
+ */
+public class EditOrganizationInfoActionTest extends AbstractOrganizationInfoActionTest
+{
+ public void testOrganisationInfoSaves()
+ throws Exception
+ {
+ config.setOrganisationInfo(new OrganisationInformation());
+ OrganisationInformation orginfo = config.getOrganisationInfo();
+ orginfo.setLogoLocation("LOGO");
+ orginfo.setName("NAME");
+ orginfo.setUrl("URL");
+
+ configuration.save(config);
+
+ reloadAction();
+
+ action.prepare();
+
+ assertEquals("LOGO", action.getOrganisationLogo());
+ assertEquals("NAME", action.getOrganisationName());
+ assertEquals("URL", action.getOrganisationUrl());
+
+ action.setOrganisationLogo("LOGO1");
+ action.setOrganisationName("NAME1");
+ action.setOrganisationUrl("URL1");
+
+ action.execute();
+
+ assertEquals("LOGO1", orginfo.getLogoLocation());
+ assertEquals("NAME1", orginfo.getName());
+ assertEquals("URL1", orginfo.getUrl());
+ }
+
+ @Override
+ protected AbstractAppearanceAction getAction()
+ {
+ return (EditOrganisationInfoAction) lookup( Action.class.getName(), "editOrganisationInfo" );
+ }
+}
Added: archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/OrganizationInfoActionTest.java
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/OrganizationInfoActionTest.java?rev=674159&view=auto
==============================================================================
--- archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/OrganizationInfoActionTest.java (added)
+++ archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/OrganizationInfoActionTest.java Sat Jul 5 00:59:30 2008
@@ -0,0 +1,58 @@
+package org.apache.maven.archiva.web.action.admin.appearance;
+
+/*
+ * 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.
+ */
+
+import com.opensymphony.xwork.Action;
+import org.apache.maven.archiva.configuration.ArchivaConfiguration;
+import org.apache.maven.archiva.configuration.OrganisationInformation;
+import org.apache.maven.archiva.configuration.Configuration;
+import org.apache.maven.archiva.web.action.AbstractWebworkTestCase;
+
+/**
+ * @author <a href="mailto:james@atlassian.com">James William Dumay</a>
+ */
+public class OrganizationInfoActionTest extends AbstractOrganizationInfoActionTest
+{
+ public void testOrganisationInfoLoads()
+ throws Exception
+ {
+ config.setOrganisationInfo(new OrganisationInformation());
+ OrganisationInformation orginfo = config.getOrganisationInfo();
+ orginfo.setLogoLocation("LOGO");
+ orginfo.setName("NAME");
+ orginfo.setUrl("URL");
+
+ configuration.save(config);
+
+ reloadAction();
+
+ action.prepare();
+
+ assertEquals("URL", action.getOrganisationUrl());
+ assertEquals("NAME", action.getOrganisationName());
+ assertEquals("LOGO", action.getOrganisationLogo());
+ }
+
+ @Override
+ protected AbstractAppearanceAction getAction()
+ {
+ return (OrganisationInfoAction) lookup( Action.class.getName(), "organisationInfo" );
+ }
+}