Changeset 2249

Timestamp:

May 12, 2006, 10:37:04 AM (17 years ago)

Author:

Nicklas Nordborg

Message:

Added first version of automated tests for roles. References #221 and #222.

Location:

trunk

Files:

• build.xml (modified) (1 diff)
• doc/test/permissions/firstpage.tex (modified) (1 diff)
• src/test.platemapping.mirror.txt (added)
• src/test/net (added)
• src/test/net/sf (added)
• src/test/net/sf/basedb (added)
• src/test/net/sf/basedb/test (added)
• src/test/net/sf/basedb/test/TestUtil.java (added)
• src/test/net/sf/basedb/test/roles (added)
• src/test/net/sf/basedb/test/roles/AdminTest.java (added)
• src/test/net/sf/basedb/test/roles/GuestTest.java (added)
• src/test/net/sf/basedb/test/roles/PowerUserTest.java (added)
• src/test/net/sf/basedb/test/roles/RootTest.java (added)
• src/test/net/sf/basedb/test/roles/Run.java (added)
• src/test/net/sf/basedb/test/roles/UserTest.java (added)
• src/test/net/sf/basedb/test/roles/Util.java (added)
• src/test/run.sh (modified) (2 diffs)
• src/test/set_classpath.sh (added)
• src/test/test.sh (added)

trunk/build.xml

@@ -249 +249 @@
       </fileset>
     </copy>
-    <chmod file="${test.build}/run.sh" perm="a+x"/>
+    <chmod dir="${test.build}" includes="*.sh" perm="a+x"/>
     <copy todir="${test.build}">
       <fileset dir="${src}">

trunk/doc/test/permissions/firstpage.tex

@@ -54 +54 @@
 \end{enumerate}
 
+These tests can also be run in automated mode by test programs. This will of 
+course not test the web client, but are useful if one quickly needs to do the
+parts of the test and then continue with for example the user tests on the
+web. To run the tests you must first compile the test programs with "ant test".
+
+Then execute: ./test.sh roles <cmds>
+
+where <cmds> is a list specifying which tests to run. The following values
+can be used:
+
+\begin{itemize}
+\item all: Run all tests
+\item root: Run the root user tests
+\item admin: Run the administrator tests
+\item power: Run the power user tests
+\item user: Run the regular user tests
+\item guest: Run the guest user tests
+\end{itemize}
+
+
+
 \newpage

trunk/src/test/run.sh

@@ -3 +3 @@
 # BioArray Software Environment (BASE) - http://base.thep.lu.se/
 # Copyright (C) 2002-2004 Lao Saal, Carl Troein,
-# Johan Vallon-Christersson, Jari H�kkinen, Nicklas Nordborg
+# Johan Vallon-Christersson, Jari Häkkinen, Nicklas Nordborg
 #
 # This file is part of BASE.
@@ -23 +23 @@
 # ----------------------------------------
 
-# Set up the classpath
-CP=.
-
-# Base2 core
-CP=$CP:../core
-
-# Hibernate
-CP=$CP:../../lib/compile/hibernate3.jar
-CP=$CP:../../lib/dist/cglib-2.1.3.jar
-CP=$CP:../../lib/dist/asm.jar
-CP=$CP:../../lib/dist/asm-attrs.jar
-CP=$CP:../../lib/dist/commons-collections-2.1.1.jar
-CP=$CP:../../lib/dist/commons-logging-1.0.4.jar
-CP=$CP:../../lib/dist/dom4j-1.6.1.jar
-CP=$CP:../../lib/dist/ehcache-1.1.jar
-CP=$CP:../../lib/dist/jta.jar
-CP=$CP:../../lib/dist/antlr-2.7.6rc1.jar
-
-# Log4j logging system (also used by Hibernate)
-CP=$CP:../../lib/compile/log4j-1.2.11.jar
-
-# C3P0 Connection pool manager
-CP=$CP:../../lib/dist/c3p0-0.9.0.jar
-
-# MySQL JDBC driver
-CP=$CP:../../lib/dist/mysql-connector-java-3.1.12-bin.jar
-
-# Postgres JDBC driver
-CP=$CP:../../lib/dist/postgresql-8.0-313.jdbc3.jar
-
-# Oracle JDBC driver (experimental)
-CP=$CP:../../lib/dist/ojdbc14.jar
-
-# JDOM and Xerces XML parser
-CP=$CP:../../lib/compile/jdom.jar
-CP=$CP:../../lib/dist/jaxen-1.1-beta-7.jar
-CP=$CP:../../lib/dist/saxpath.jar
-CP=$CP:../../lib/dist/xerces-2.6.2.jar
-CP=$CP:../../lib/dist/xml-apis.jar
-
-# Java Advanced Imaging
-CP=$CP:../../lib/compile/jai_codec.jar
-CP=$CP:../../lib/compile/jai_core.jar
-CP=$CP:../../lib/compile/mlibwrapper_jai.jar
-
-# Java Math Expression Parser
-CP=$CP:../../lib/compile/jep-2.3.0.jar
-
-# JFreeChart
-CP=$CP:../../lib/compile/jfreechart-1.0.0.jar
-CP=$CP:../../lib/compile/jcommon-1.0.0.jar
-
+# Import CLASSPATH($CP)
+. ./set_classpath.sh
 
 # Execute test class