Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[PDI-14179] - FTP put error when using ${Internal.Job.Filename.Direct…
…ory} internal variable - add a "localDirectory" parameter validation which fails on null value - introduce a package-local method for creating the client to alleviate testing - add unit tests for it - add integration tests with embedded FTP server
- Loading branch information
Andrey Khayrutdinov
committed
Oct 26, 2015
1 parent
f400847
commit 638ef5a
Showing
6 changed files
with
377 additions
and
104 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
91 changes: 91 additions & 0 deletions
91
engine/test-src/org/pentaho/di/job/entries/ftpput/JobEntryFTPPUTTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Original file line | Diff line number | Diff line change |
|---|---|---|---|
| @@ -0,0 +1,91 @@ | |||
| /*! ****************************************************************************** | |||
| * | |||
| * Pentaho Data Integration | |||
| * | |||
| * Copyright (C) 2002-2015 by Pentaho : http://www.pentaho.com | |||
| * | |||
| ******************************************************************************* | |||
| * | |||
| * Licensed 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. | |||
| * | |||
| ******************************************************************************/ | |||
|
|
|||
| package org.pentaho.di.job.entries.ftpput; | |||
|
|
|||
| import com.enterprisedt.net.ftp.FTPClient; | |||
| import org.junit.Before; | |||
| import org.junit.Test; | |||
| import org.mockito.ArgumentCaptor; | |||
|
|
|||
| import java.net.InetAddress; | |||
|
|
|||
| import static org.junit.Assert.*; | |||
| import static org.mockito.Mockito.*; | |||
|
|
|||
| /** | |||
| * @author Andrey Khayrutdinov | |||
| */ | |||
| public class JobEntryFTPPUTTest { | |||
|
|
|||
| private JobEntryFTPPUT entry; | |||
| private FTPClient ftpClient; | |||
|
|
|||
| @Before | |||
| public void setUp() throws Exception { | |||
| ftpClient = mock( FTPClient.class ); | |||
|
|
|||
| entry = spy( new JobEntryFTPPUT() ); | |||
| doReturn( ftpClient ).when( entry ).createFtpClient(); | |||
| } | |||
|
|
|||
| @Test | |||
| public void createFtpClient_SetsLocalhostByDefault() throws Exception { | |||
| entry.setServerName( null ); | |||
| entry.createAndSetUpFtpClient(); | |||
| assertEquals( "localhost", getHostFromClient() ); | |||
| } | |||
|
|
|||
| @Test | |||
| public void createFtpClient_DoesNotChangePortByDefault() throws Exception { | |||
| entry.setServerPort( null ); | |||
| entry.createAndSetUpFtpClient(); | |||
| verify( ftpClient, never() ).setRemotePort( anyInt() ); | |||
| } | |||
|
|
|||
| @Test | |||
| public void createFtpClient_UsesProxyIfSet() throws Exception { | |||
| entry.setProxyHost( "localhost" ); | |||
| entry.setProxyPort( "123" ); | |||
| entry.createAndSetUpFtpClient(); | |||
|
|
|||
| assertEquals( "localhost", getHostFromClient() ); | |||
| // we cannot distinguish values of proxy and target server, as both of them refers to localhost | |||
| // that is why I put invocation counter here | |||
| verify( ftpClient, times( 2 ) ).setRemoteAddr( InetAddress.getByName( "localhost" ) ); | |||
| verify( ftpClient ).setRemotePort( 123 ); | |||
| } | |||
|
|
|||
| @Test | |||
| public void createFtpClient_UsesTimeoutIfSet() throws Exception { | |||
| entry.setTimeout( 10 ); | |||
| entry.createAndSetUpFtpClient(); | |||
| verify( ftpClient ).setTimeout( 10 ); | |||
| } | |||
|
|
|||
|
|
|||
| private String getHostFromClient() throws Exception { | |||
| ArgumentCaptor<InetAddress> addrCaptor = ArgumentCaptor.forClass( InetAddress.class ); | |||
| verify( ftpClient, atLeastOnce() ).setRemoteAddr( addrCaptor.capture() ); | |||
| return addrCaptor.getValue().getHostName(); | |||
| } | |||
| } | |||
Oops, something went wrong.