Author: olamy
Date: Mon Mar 19 10:51:19 2012
New Revision: 1302369
URL: http://svn.apache.org/viewvc?rev=1302369&view=rev
Log:
unit test for RuntimeInfoService
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/java/
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/java/org/
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/java/org/apache/
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/java/org/apache/archiva/
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/java/org/apache/archiva/webapp/
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/java/org/apache/archiva/webapp/ui/
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/java/org/apache/archiva/webapp/ui/services/
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/java/org/apache/archiva/webapp/ui/services/api/
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/java/org/apache/archiva/webapp/ui/services/api/RuntimeInfoServiceTest.java
(with props)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/repository.xml
(with props)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/resources/
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/resources/META-INF/
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/resources/META-INF/spring-context-test.xml
(with props)
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/java/org/apache/archiva/webapp/ui/services/api/RuntimeInfoServiceTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/java/org/apache/archiva/webapp/ui/services/api/RuntimeInfoServiceTest.java?rev=1302369&view=auto
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/java/org/apache/archiva/webapp/ui/services/api/RuntimeInfoServiceTest.java
(added)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/java/org/apache/archiva/webapp/ui/services/api/RuntimeInfoServiceTest.java
Mon Mar 19 10:51:19 2012
@@ -0,0 +1,89 @@
+package org.apache.archiva.webapp.ui.services.api;
+/*
+ * 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 org.apache.archiva.webapp.ui.services.model.ApplicationRuntimeInfo;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.cxf.jaxrs.client.JAXRSClientFactory;
+import org.codehaus.jackson.jaxrs.JacksonJaxbJsonProvider;
+import org.codehaus.redback.rest.services.AbstractRestServicesTest;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.io.File;
+import java.util.Collections;
+
+/**
+ * @author Olivier Lamy
+ */
+public class RuntimeInfoServiceTest
+ extends AbstractRestServicesTest
+{
+ @Override
+ @Before
+ public void startServer()
+ throws Exception
+ {
+ File appServerBase = new File( System.getProperty( "appserver.base" )
);
+
+ File jcrDirectory = new File( appServerBase, "jcr" );
+
+ if ( jcrDirectory.exists() )
+ {
+ FileUtils.deleteDirectory( jcrDirectory );
+ }
+
+ super.startServer();
+ }
+
+ @Override
+ protected String getSpringConfigLocation()
+ {
+ return
"classpath*:META-INF/spring-context.xml,classpath*:META-INF/spring-context-test.xml";
+ }
+
+ protected String getRestServicesPath()
+ {
+ return "restServices";
+ }
+
+ protected String getBaseUrl()
+ {
+ String baseUrlSysProps = System.getProperty( "archiva.baseRestUrl" );
+ return StringUtils.isBlank( baseUrlSysProps ) ? "http://localhost:"; +
port : baseUrlSysProps;
+ }
+
+ @Test
+ public void runtimeInfoService()
+ throws Exception
+ {
+ RuntimeInfoService service =
+ JAXRSClientFactory.create( getBaseUrl() + "/" +
getRestServicesPath() + "/archivaUiServices/",
+ RuntimeInfoService.class,
+ Collections.singletonList( new
JacksonJaxbJsonProvider() ) );
+
+ ApplicationRuntimeInfo applicationRuntimeInfo =
service.getApplicationRuntimeInfo( "en" );
+
+ assertEquals( System.getProperty( "expectedVersion" ),
applicationRuntimeInfo.getVersion() );
+ assertFalse( applicationRuntimeInfo.isJavascriptLog() );
+ assertTrue( applicationRuntimeInfo.isLogMissingI18n() );
+
+ }
+}
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/java/org/apache/archiva/webapp/ui/services/api/RuntimeInfoServiceTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/java/org/apache/archiva/webapp/ui/services/api/RuntimeInfoServiceTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/repository.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/repository.xml?rev=1302369&view=auto
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/repository.xml
(added)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/repository.xml
Mon Mar 19 10:51:19 2012
@@ -0,0 +1,49 @@
+<!--
+ ~ 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.
+ -->
+
+<!DOCTYPE Repository PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit
1.6//EN"
+ "http://jackrabbit.apache.org/dtd/repository-1.6.dtd";>
+
+<Repository>
+ <FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem"/>
+ <!--<FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
+ <param name="path" value="${rep.home}/repository"/>
+</FileSystem> -->
+ <Security appName="Jackrabbit">
+ <SecurityManager
class="org.apache.jackrabbit.core.security.simple.SimpleSecurityManager"
workspaceName="security"/>
+ <AccessManager
class="org.apache.jackrabbit.core.security.simple.SimpleAccessManager"/>
+ <LoginModule
class="org.apache.jackrabbit.core.security.simple.SimpleLoginModule"/>
+ </Security>
+ <Workspaces rootPath="${rep.home}/workspaces" defaultWorkspace="default"/>
+ <Workspace name="${wsp.name}">
+ <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
+ <param name="path" value="${wsp.home}"/>
+ </FileSystem>
+ <PersistenceManager
class="org.apache.jackrabbit.core.persistence.bundle.BundleFsPersistenceManager"/>
+ <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+ <param name="path" value="${wsp.home}/index"/>
+ </SearchIndex>
+ </Workspace>
+ <Versioning rootPath="${rep.home}/version">
+ <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
+ <param name="path" value="${rep.home}/version"/>
+ </FileSystem>
+ <PersistenceManager
class="org.apache.jackrabbit.core.persistence.bundle.BundleFsPersistenceManager"/>
+ </Versioning>
+</Repository>
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/repository.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/repository.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/resources/META-INF/spring-context-test.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/resources/META-INF/spring-context-test.xml?rev=1302369&view=auto
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/resources/META-INF/spring-context-test.xml
(added)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/resources/META-INF/spring-context-test.xml
Mon Mar 19 10:51:19 2012
@@ -0,0 +1,87 @@
+<?xml version="1.0"?>
+
+<!--
+ ~ 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.
+ -->
+<beans xmlns="http://www.springframework.org/schema/beans";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xmlns:context="http://www.springframework.org/schema/context";
+ xmlns:jaxrs="http://cxf.apache.org/jaxrs";
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+ http://www.springframework.org/schema/context
+ http://www.springframework.org/schema/context/spring-context-3.0.xsd
+ http://cxf.apache.org/jaxrs
+ http://cxf.apache.org/schemas/jaxrs.xsd"; default-lazy-init="true">
+
+ <context:annotation-config/>
+ <context:component-scan
+ base-package="org.apache.archiva.rest.services.utils"/>
+
+ <bean name="scheduler"
class="org.codehaus.redback.components.scheduler.DefaultScheduler">
+ <property name="properties">
+ <props>
+ <prop key="org.quartz.scheduler.instanceName">scheduler1</prop>
+ <prop
key="org.quartz.threadPool.class">org.quartz.simpl.SimpleThreadPool</prop>
+ <prop key="org.quartz.threadPool.threadCount">2</prop>
+ <prop key="org.quartz.threadPool.threadPriority">4</prop>
+ <prop
key="org.quartz.jobStore.class">org.quartz.simpl.RAMJobStore</prop>
+ </props>
+ </property>
+ </bean>
+
+ <!-- wire up more basic configuration so it doesn't overwrite any config
files -->
+ <bean name="archivaConfiguration#default"
class="org.apache.archiva.configuration.DefaultArchivaConfiguration">
+ <property name="registry" ref="registry#default"/>
+ </bean>
+
+ <alias name="archivaConfiguration#default" alias="archivaConfiguration"/>
+
+ <bean name="registry#default"
class="org.codehaus.redback.components.registry.commons.CommonsConfigurationRegistry">
+ <property name="properties">
+ <value>
+ <![CDATA[
+ <configuration>
+ <system/>
+ <xml fileName="${appserver.base}/conf/archiva.xml"
config-forceCreate="true"
+ config-optional="true"
+ config-name="org.apache.archiva.base"
config-at="org.apache.archiva"/>
+ </configuration>
+ ]]>
+ </value>
+ </property>
+ </bean>
+
+ <bean name="taskQueueExecutor#repository-scanning"
+
class="org.codehaus.plexus.taskqueue.execution.ThreadedTaskQueueExecutor"
lazy-init="false">
+ <property name="name" value="repository-scanning"/>
+ <property name="executor" ref="taskExecutor#repository-scanning"/>
+ <property name="queue" ref="taskQueue#repository-scanning"/>
+ </bean>
+
+ <bean id="repository" class="org.apache.jackrabbit.core.RepositoryImpl"
destroy-method="shutdown">
+ <constructor-arg ref="config"/>
+ </bean>
+ <bean id="config" class="org.apache.jackrabbit.core.config.RepositoryConfig"
factory-method="create">
+ <constructor-arg value="${basedir}/src/test/repository.xml"/>
+ <constructor-arg value="${appserver.base}/jcr"/>
+ </bean>
+
+ <alias name="repositorySessionFactory#jcr" alias="repositorySessionFactory"/>
+
+</beans>
\ No newline at end of file
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/resources/META-INF/spring-context-test.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/resources/META-INF/spring-context-test.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
