Unit tests! huh!

git-svn-id: https://svn.apache.org/repos/asf/archiva/branches@674159 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/AbstractAppearanceAction.java b/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/AbstractAppearanceAction.java
index 75117e0adf072eff72c50e56e9bafd727f000748..f8d6bf73f841787c567e3a054293e6b97ed5adeb 100644 (file)
--- a/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/AbstractAppearanceAction.java
+++ b/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/AbstractAppearanceAction.java
@@ -47,6 +47,11 @@ public abstract class AbstractAppearanceAction
     private String organisationUrl;
 
     private String organisationName;
+
+    public void setConfiguration(ArchivaConfiguration configuration) 
+    {
+        this.configuration = configuration;
+    }
     
     public String getOrganisationLogo() 
     {

diff --git a/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/EditOrganizationInfoActionTest.java b/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/EditOrganizationInfoActionTest.java
new file mode 100644 (file)
index 0000000..66ca872
--- /dev/null
+++ b/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/EditOrganizationInfoActionTest.java
@@ -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" );
+    }
+}

diff --git a/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/OrganizationInfoActionTest.java b/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/OrganizationInfoActionTest.java
new file mode 100644 (file)
index 0000000..fec9e8f
--- /dev/null
+++ b/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/OrganizationInfoActionTest.java
@@ -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" );
+    }
+}