You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2011/10/31 15:59:29 UTC
svn commit: r1195492 - in /maven/shared/trunk/maven-jarsigner/src:
main/java/org/apache/maven/shared/jarsigner/ test/ test/java/
test/java/org/ test/java/org/apache/ test/java/org/apache/maven/
test/java/org/apache/maven/shared/ test/java/org/apache/ma...
Author: olamy
Date: Mon Oct 31 14:59:28 2011
New Revision: 1195492
URL: http://svn.apache.org/viewvc?rev=1195492&view=rev
Log:
add unit test
Added:
maven/shared/trunk/maven-jarsigner/src/test/
maven/shared/trunk/maven-jarsigner/src/test/java/
maven/shared/trunk/maven-jarsigner/src/test/java/org/
maven/shared/trunk/maven-jarsigner/src/test/java/org/apache/
maven/shared/trunk/maven-jarsigner/src/test/java/org/apache/maven/
maven/shared/trunk/maven-jarsigner/src/test/java/org/apache/maven/shared/
maven/shared/trunk/maven-jarsigner/src/test/java/org/apache/maven/shared/jarsigner/
maven/shared/trunk/maven-jarsigner/src/test/java/org/apache/maven/shared/jarsigner/SimpleJarSignTest.java (with props)
maven/shared/trunk/maven-jarsigner/src/test/keystore
maven/shared/trunk/maven-jarsigner/src/test/simple.jar
Modified:
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/DefaultJarSigner.java
Modified: maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/DefaultJarSigner.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/DefaultJarSigner.java?rev=1195492&r1=1195491&r2=1195492&view=diff
==============================================================================
--- maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/DefaultJarSigner.java (original)
+++ maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/DefaultJarSigner.java Mon Oct 31 14:59:28 2011
@@ -30,6 +30,7 @@ import org.codehaus.plexus.util.cli.Stre
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
+import java.util.Arrays;
import java.util.Map;
/**
@@ -141,6 +142,15 @@ public class DefaultJarSigner
DefaultJarSignerResult result = new DefaultJarSignerResult();
result.setCommandline( cli );
+ if ( verbose )
+ {
+ getLogger().info( cli.toString() );
+ }
+ else
+ {
+ getLogger().debug( cli.toString() );
+ }
+
try
{
int resultCode = CommandLineUtils.executeCommandLine( cli, systemIn, systemOut, systemErr );
Added: maven/shared/trunk/maven-jarsigner/src/test/java/org/apache/maven/shared/jarsigner/SimpleJarSignTest.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-jarsigner/src/test/java/org/apache/maven/shared/jarsigner/SimpleJarSignTest.java?rev=1195492&view=auto
==============================================================================
--- maven/shared/trunk/maven-jarsigner/src/test/java/org/apache/maven/shared/jarsigner/SimpleJarSignTest.java (added)
+++ maven/shared/trunk/maven-jarsigner/src/test/java/org/apache/maven/shared/jarsigner/SimpleJarSignTest.java Mon Oct 31 14:59:28 2011
@@ -0,0 +1,95 @@
+package org.apache.maven.shared.jarsigner;
+/*
+ * 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.codehaus.plexus.PlexusTestCase;
+import org.codehaus.plexus.util.FileUtils;
+
+import java.io.File;
+
+/**
+ * @author Olivier Lamy
+ */
+public class SimpleJarSignTest
+ extends PlexusTestCase
+{
+
+ public void testSimpleSign()
+ throws Exception
+ {
+ File file = new File( "src/test/simple.jar" );
+ File target = new File( "target/simple.jar" );
+
+ if ( target.exists() )
+ {
+ FileUtils.forceDelete( target );
+ }
+
+ FileUtils.copyFile( file, target );
+
+ JarSignerSignRequest jarSignerRequest = buildJarSignerRequest( target );
+
+ JarSigner jarSigner = (JarSigner) lookup( JarSigner.class.getName() );
+
+ JarSignerResult jarSignerResult = jarSigner.execute( jarSignerRequest );
+ assertEquals( "not exit code 0 " + jarSignerResult.getExecutionException(), 0, jarSignerResult.getExitCode() );
+
+
+ }
+
+ public void testSimpleSignAdVerify()
+ throws Exception
+ {
+ File file = new File( "src/test/simple.jar" );
+ File target = new File( "target/simple.jar" );
+
+ if ( target.exists() )
+ {
+ FileUtils.forceDelete( target );
+ }
+
+ FileUtils.copyFile( file, target );
+
+ JarSignerSignRequest jarSignerRequest = buildJarSignerRequest( target );
+
+ JarSigner jarSigner = (JarSigner) lookup( JarSigner.class.getName() );
+
+ JarSignerResult jarSignerResult = jarSigner.execute( jarSignerRequest );
+
+ assertEquals( "not exit code 0 " + jarSignerResult.getExecutionException(), 0, jarSignerResult.getExitCode() );
+
+ JarSignerVerifyRequest request = new JarSignerVerifyRequest();
+ request.setArchive( target );
+
+ jarSigner.execute( request );
+
+ }
+
+ protected JarSignerSignRequest buildJarSignerRequest(File target)
+ {
+ JarSignerSignRequest jarSignerRequest = new JarSignerSignRequest();
+ jarSignerRequest.setArchive( target );
+ jarSignerRequest.setKeystore( "src/test/keystore" );
+ jarSignerRequest.setVerbose( true );
+ jarSignerRequest.setAlias( "foo_alias" );
+ jarSignerRequest.setKeypass( "key-passwd" );
+ jarSignerRequest.setStorepass( "changeit" );
+ return jarSignerRequest;
+ }
+}
Propchange: maven/shared/trunk/maven-jarsigner/src/test/java/org/apache/maven/shared/jarsigner/SimpleJarSignTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/shared/trunk/maven-jarsigner/src/test/java/org/apache/maven/shared/jarsigner/SimpleJarSignTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/shared/trunk/maven-jarsigner/src/test/keystore
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-jarsigner/src/test/keystore?rev=1195492&view=auto
==============================================================================
Files maven/shared/trunk/maven-jarsigner/src/test/keystore (added) and maven/shared/trunk/maven-jarsigner/src/test/keystore Mon Oct 31 14:59:28 2011 differ
Added: maven/shared/trunk/maven-jarsigner/src/test/simple.jar
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-jarsigner/src/test/simple.jar?rev=1195492&view=auto
==============================================================================
Files maven/shared/trunk/maven-jarsigner/src/test/simple.jar (added) and maven/shared/trunk/maven-jarsigner/src/test/simple.jar Mon Oct 31 14:59:28 2011 differ