[TEST] LoadSaveTests for Job Entries

pentaho · May 19, 2016 · f42537b · f42537b
1 parent 6273fcb
commit f42537b
Show file tree

Hide file tree

Showing 56 changed files with 1,956 additions and 289 deletions.
diff --git a/engine/src/org/pentaho/di/job/entries/checkdbconnection/JobEntryCheckDbConnections.java b/engine/src/org/pentaho/di/job/entries/checkdbconnection/JobEntryCheckDbConnections.java
@@ -2,7 +2,7 @@
  *
  * Pentaho Data Integration
  *
- * Copyright (C) 2002-2013 by Pentaho : http://www.pentaho.com
+ * Copyright (C) 2002-2016 by Pentaho : http://www.pentaho.com
  *
  *******************************************************************************
  *
@@ -19,6 +19,7 @@
  * limitations under the License.
  *
  ******************************************************************************/
+
 package org.pentaho.di.job.entries.checkdbconnection;
 
 import org.pentaho.di.job.entry.validator.AndValidator;
@@ -60,7 +61,7 @@
 public class JobEntryCheckDbConnections extends JobEntryBase implements Cloneable, JobEntryInterface {
   private static Class<?> PKG = JobEntryCheckDbConnections.class; // for i18n purposes, needed by Translator2!!
 
-  public DatabaseMeta[] connections;
+  private DatabaseMeta[] connections;
 
   public static final String[] unitTimeDesc = new String[] {
     BaseMessages.getString( PKG, "JobEntryCheckDbConnections.UnitTimeMilliSecond.Label" ),
@@ -74,8 +75,8 @@ public class JobEntryCheckDbConnections extends JobEntryBase implements Cloneabl
   public static final int UNIT_TIME_MINUTE = 2;
   public static final int UNIT_TIME_HOUR = 3;
 
-  public String[] waitfors;
-  public int[] waittimes;
+  private String[] waitfors;
+  private int[] waittimes;
 
   public JobEntryCheckDbConnections( String n ) {
     super( n, "" );
@@ -93,6 +94,30 @@ public Object clone() {
     return je;
   }
 
+  public DatabaseMeta[] getConnections() {
+    return connections;
+  }
+
+  public void setConnections( DatabaseMeta[] connections ) {
+    this.connections = connections;
+  }
+
+  public String[] getWaitfors() {
+    return waitfors;
+  }
+
+  public void setWaitfors( String[] waitfors ) {
+    this.waitfors = waitfors;
+  }
+
+  public int[] getWaittimes() {
+    return waittimes;
+  }
+
+  public void setWaittimes( int[] waittimes ) {
+    this.waittimes = waittimes;
+  }
+
   private static String getWaitTimeCode( int i ) {
     if ( i < 0 || i >= unitTimeCode.length ) {
       return unitTimeCode[0];

diff --git a/engine/src/org/pentaho/di/job/entries/columnsexist/JobEntryColumnsExist.java b/engine/src/org/pentaho/di/job/entries/columnsexist/JobEntryColumnsExist.java
@@ -2,7 +2,7 @@
  *
  * Pentaho Data Integration
  *
- * Copyright (C) 2002-2013 by Pentaho : http://www.pentaho.com
+ * Copyright (C) 2002-2016 by Pentaho : http://www.pentaho.com
  *
  *******************************************************************************
  *
@@ -63,7 +63,7 @@ public class JobEntryColumnsExist extends JobEntryBase implements Cloneable, Job
   private String schemaname;
   private String tablename;
   private DatabaseMeta connection;
-  public String[] arguments;
+  private String[] arguments;
 
   public JobEntryColumnsExist( String n ) {
     super( n, "" );
@@ -198,6 +198,14 @@ public String getSchemaname() {
     return schemaname;
   }
 
+  public String[] getArguments() {
+    return arguments;
+  }
+
+  public void setArguments( String[] arguments ) {
+    this.arguments = arguments;
+  }
+
   public void setDatabase( DatabaseMeta database ) {
     this.connection = database;
   }

diff --git a/engine/src/org/pentaho/di/job/entries/copyfiles/JobEntryCopyFiles.java b/engine/src/org/pentaho/di/job/entries/copyfiles/JobEntryCopyFiles.java
@@ -2,7 +2,7 @@
  *
  * Pentaho Data Integration
  *
- * Copyright (C) 2002-2015 by Pentaho : http://www.pentaho.com
+ * Copyright (C) 2002-2016 by Pentaho : http://www.pentaho.com
  *
  *******************************************************************************
  *
@@ -721,7 +721,7 @@ private class TextFileSelector implements FileSelector {
     /**********************************************************
      *
      * @param selectedfile
-     * @param wildcard
+     * @param sourceWildcard
      * @return True if the selectedfile matches the wildcard
      **********************************************************/
     private boolean GetFileWildcard( String selectedfile ) {

diff --git a/...c/org/pentaho/di/job/entries/copymoveresultfilenames/JobEntryCopyMoveResultFilenames.java b/...c/org/pentaho/di/job/entries/copymoveresultfilenames/JobEntryCopyMoveResultFilenames.java
@@ -2,7 +2,7 @@
  *
  * Pentaho Data Integration
  *
- * Copyright (C) 2002-2013 by Pentaho : http://www.pentaho.com
+ * Copyright (C) 2002-2016 by Pentaho : http://www.pentaho.com
  *
  *******************************************************************************
  *
@@ -666,7 +666,7 @@ private String getDestinationFilename( String shortsourcefilename ) throws Excep
   /**********************************************************
    *
    * @param selectedfile
-   * @param wildcard
+   * @param sourceWildcard
    * @return True if the selectedfile matches the wildcard
    **********************************************************/
   private boolean CheckFileWildcard( String selectedfile, Pattern pattern, boolean include ) {