Return-Path: Delivered-To: apmail-maven-commits-archive@www.apache.org Received: (qmail 5129 invoked from network); 17 Oct 2007 22:57:06 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 17 Oct 2007 22:57:06 -0000 Received: (qmail 65169 invoked by uid 500); 17 Oct 2007 22:56:54 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 64936 invoked by uid 500); 17 Oct 2007 22:56:53 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 64923 invoked by uid 99); 17 Oct 2007 22:56:53 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Oct 2007 15:56:53 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Oct 2007 22:57:05 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 02B4D1A9832; Wed, 17 Oct 2007 15:56:15 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r585746 - in /maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/src: main/java/org/apache/maven/jxr/util/DotTask.java test/java/org/apache/maven/jxr/util/DotTaskTest.java Date: Wed, 17 Oct 2007 22:56:14 -0000 To: commits@maven.apache.org From: vsiveton@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071017225615.02B4D1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: vsiveton Date: Wed Oct 17 15:56:12 2007 New Revision: 585746 URL: http://svn.apache.org/viewvc?rev=585746&view=rev Log: o fixed exception signature o readd test due to 585744 Added: maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/src/test/java/org/apache/maven/jxr/util/DotTaskTest.java (with props) Modified: maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/src/main/java/org/apache/maven/jxr/util/DotTask.java Modified: maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/src/main/java/org/apache/maven/jxr/util/DotTask.java URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/src/main/java/org/apache/maven/jxr/util/DotTask.java?rev=585746&r1=585745&r2=585746&view=diff ============================================================================== --- maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/src/main/java/org/apache/maven/jxr/util/DotTask.java (original) +++ maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/src/main/java/org/apache/maven/jxr/util/DotTask.java Wed Oct 17 15:56:12 2007 @@ -398,7 +398,7 @@ /** * Signals that the dot executable is not present in the path */ - protected class DotNotPresentInPathBuildException + public class DotNotPresentInPathBuildException extends BuildException { /** Added: maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/src/test/java/org/apache/maven/jxr/util/DotTaskTest.java URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/src/test/java/org/apache/maven/jxr/util/DotTaskTest.java?rev=585746&view=auto ============================================================================== --- maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/src/test/java/org/apache/maven/jxr/util/DotTaskTest.java (added) +++ maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/src/test/java/org/apache/maven/jxr/util/DotTaskTest.java Wed Oct 17 15:56:12 2007 @@ -0,0 +1,129 @@ +package org.apache.maven.jxr.util; + +/* + * 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 java.io.File; + +import junit.framework.TestCase; + +import org.apache.maven.jxr.util.DotTask.DotNotPresentInPathBuildException; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; + +/** + * @author Vincent Siveton + * @version $Id$ + */ +public class DotTaskTest + extends TestCase +{ + /** + * Call Dot task + * + * @throws Exception if any. + */ + public void testDefaultExecute() + throws Exception + { + final String basedir = new File( "" ).getAbsolutePath(); + + File in = new File( basedir, "src/test/resources/dot/target.dot" ); + File out = new File( basedir, "target/unit/dot-default/" ); + + Project antProject = new Project(); + antProject.setBasedir( basedir ); + + DotTask task = new DotTask(); + task.setProject( antProject ); + task.setIn( in ); + task.setDestDir( out ); + try + { + task.execute(); + assertTrue( "DOT exists in the path", true ); + } + catch ( DotNotPresentInPathBuildException e ) + { + assertTrue( "DOT doesnt exist in the path. Ignored test", true ); + return; + } + catch ( BuildException e ) + { + if ( e.getMessage().indexOf( "Execute failed" ) != -1 ) + { + assertTrue( "Uncatch error:" + e.getMessage(), false ); + } + + assertEquals( "Error when calling dot.", e.getMessage() ); + } + + // Generated files + File generated = new File( out, "target.dot.svg" ); + assertTrue( generated.exists() ); + assertTrue( generated.length() > 0 ); + } + + /** + * Call Dot task + * + * @throws Exception if any. + */ + public void testErrorExecute() + throws Exception + { + final String basedir = new File( "" ).getAbsolutePath(); + + File in = new File( basedir, "src/test/resources/dot/graph.dot" ); + File out = new File( basedir, "target/unit/dot-default/" ); + + Project antProject = new Project(); + antProject.setBasedir( basedir ); + + DotTask task = new DotTask(); + task.setProject( antProject ); + task.setIn( in ); + task.setDestDir( out ); + try + { + task.execute(); + assertTrue( "DOT exists in the path", true ); + assertTrue( "Doesnt handle dot error", false ); + } + catch ( DotNotPresentInPathBuildException e ) + { + assertTrue( "DOT doesnt exist in the path. Ignored test", true ); + return; + } + catch ( BuildException e ) + { + if ( e.getMessage().indexOf( "Execute failed" ) != -1 ) + { + assertTrue( "Uncatch error:" + e.getMessage(), false ); + } + + assertEquals( "Error when calling dot.", e.getMessage() ); + } + + // Generated files + File generated = new File( out, "graph.dot.svg" ); + assertFalse( generated.exists() ); + assertFalse( generated.length() > 0 ); + } +} Propchange: maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/src/test/java/org/apache/maven/jxr/util/DotTaskTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/src/test/java/org/apache/maven/jxr/util/DotTaskTest.java ------------------------------------------------------------------------------ svn:keywords = "Author Date Id Revision"