[TEST] - More load/save tests for step metas

engine/src/org/pentaho/di/trans/steps/checksum/CheckSumMeta.java

@@ -59,25 +59,13 @@
 public class CheckSumMeta extends BaseStepMeta implements StepMetaInterface {
   private static Class<?> PKG = CheckSumMeta.class; // for i18n purposes, needed by Translator2!!
 
-  /** by which fields to display? */
-  private String[] fieldName;
-
-  private String resultfieldName;
-
   public static final String TYPE_CRC32 = "CRC32";
   public static final String TYPE_ADLER32 = "ADLER32";
   public static final String TYPE_MD5 = "MD5";
   public static final String TYPE_SHA1 = "SHA-1";
 
   public static String[] checksumtypeCodes = { TYPE_CRC32, TYPE_ADLER32, TYPE_MD5, TYPE_SHA1 };
 
-  private String checksumtype;
-
-  private boolean compatibilityMode;
-
-  /** result type */
-  private int resultType;
-
   /**
    * The result type description
    */
@@ -94,6 +82,18 @@ public class CheckSumMeta extends BaseStepMeta implements StepMetaInterface {
   public static final int result_TYPE_HEXADECIMAL = 1;
   public static final int result_TYPE_BINARY = 2;
 
+  /** by which fields to display? */
+  private String[] fieldName;
+
+  private String resultfieldName;
+
+  private String checksumtype;
+
+  private boolean compatibilityMode;
+
+  /** result type */
+  private int resultType;
+
   public CheckSumMeta() {
     super(); // allocate BaseStepMeta
   }
@@ -180,10 +180,12 @@ public void setResultFieldName( String resultfieldName ) {
     this.resultfieldName = resultfieldName;
   }
 
+  @Override
   public void loadXML( Node stepnode, List<DatabaseMeta> databases, IMetaStore metaStore ) throws KettleXMLException {
     readData( stepnode );
   }
 
+  @Override
   public Object clone() {
     CheckSumMeta retval = (CheckSumMeta) super.clone();
 
@@ -249,6 +251,7 @@ private static String getResultTypeCode( int i ) {
     return resultTypeCode[i];
   }
 
+  @Override
   public String getXML() {
     StringBuilder retval = new StringBuilder( 200 );
     retval.append( "      " ).append( XMLHandler.addTagValue( "checksumtype", checksumtype ) );
@@ -267,6 +270,7 @@ public String getXML() {
     return retval.toString();
   }
 
+  @Override
   public void setDefault() {
     resultfieldName = null;
     checksumtype = checksumtypeCodes[0];
@@ -280,6 +284,7 @@ public void setDefault() {
     }
   }
 
+  @Override
   public void readRep( Repository rep, IMetaStore metaStore, ObjectId id_step, List<DatabaseMeta> databases ) throws KettleException {
     try {
       checksumtype = rep.getStepAttributeString( id_step, "checksumtype" );
@@ -300,6 +305,7 @@ public void readRep( Repository rep, IMetaStore metaStore, ObjectId id_step, Lis
     }
   }
 
+  @Override
   public void saveRep( Repository rep, IMetaStore metaStore, ObjectId id_transformation, ObjectId id_step ) throws KettleException {
     try {
       rep.saveStepAttribute( id_transformation, id_step, "checksumtype", checksumtype );
@@ -316,6 +322,7 @@ public void saveRep( Repository rep, IMetaStore metaStore, ObjectId id_transform
     }
   }
 
+  @Override
   public void getFields( RowMetaInterface inputRowMeta, String name, RowMetaInterface[] info, StepMeta nextStep,
     VariableSpace space, Repository repository, IMetaStore metaStore ) throws KettleStepException {
     // Output field (String)
@@ -338,6 +345,7 @@ public void getFields( RowMetaInterface inputRowMeta, String name, RowMetaInterf
     }
   }
 
+  @Override
   public void check( List<CheckResultInterface> remarks, TransMeta transMeta, StepMeta stepMeta,
     RowMetaInterface prev, String[] input, String[] output, RowMetaInterface info, VariableSpace space,
     Repository repository, IMetaStore metaStore ) {
@@ -410,15 +418,18 @@ public void check( List<CheckResultInterface> remarks, TransMeta transMeta, Step
     }
   }
 
+  @Override
   public StepInterface getStep( StepMeta stepMeta, StepDataInterface stepDataInterface, int cnr, TransMeta tr,
     Trans trans ) {
     return new CheckSum( stepMeta, stepDataInterface, cnr, tr, trans );
   }
 
+  @Override
   public StepDataInterface getStepData() {
     return new CheckSumData();
   }
 
+  @Override
   public boolean supportsErrorHandling() {
     return true;
   }

engine/test-src/org/pentaho/di/trans/steps/abort/AbortMetaTest.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
  *
  *******************************************************************************
  *
@@ -48,7 +48,6 @@ public void testRoundTrip() throws KettleException {
     setterMap.put( "always_log_rows", "setAlwaysLogRows" );
 
     LoadSaveTester loadSaveTester = new LoadSaveTester( AbortMeta.class, attributes, getterMap, setterMap );
-    loadSaveTester.testRepoRoundTrip();
-    loadSaveTester.testXmlRoundTrip();
+    loadSaveTester.testSerialization();
   }
 }

engine/test-src/org/pentaho/di/trans/steps/accessinput/AccessInputMetaTest.java

@@ -100,8 +100,7 @@ public void testRoundTrip() throws KettleException {
 
     LoadSaveTester loadSaveTester =
       new LoadSaveTester( AccessInputMeta.class, attributes, getterMap, setterMap, fieldValidators, typeValidators );
-    loadSaveTester.testXmlRoundTrip();
-    loadSaveTester.testRepoRoundTrip();
+    loadSaveTester.testSerialization();
   }
 
   public class FileRequiredLoadSaveValidator implements FieldLoadSaveValidator<String> {

engine/test-src/org/pentaho/di/trans/steps/accessoutput/AccessOutputMetaTest.java

@@ -0,0 +1,63 @@
+/*! ******************************************************************************
+ *
+ * Pentaho Data Integration
+ *
+ * Copyright (C) 2002-2016 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.trans.steps.accessoutput;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.pentaho.di.core.KettleEnvironment;
+import org.pentaho.di.core.exception.KettleException;
+import org.pentaho.di.core.plugins.PluginRegistry;
+import org.pentaho.di.trans.steps.loadsave.LoadSaveTester;
+import org.pentaho.di.trans.steps.loadsave.validator.FieldLoadSaveValidator;
+
+public class AccessOutputMetaTest {
+  LoadSaveTester loadSaveTester;
+  Class<AccessOutputMeta> testMetaClass = AccessOutputMeta.class;
+
+  @Before
+  public void setUpLoadSave() throws Exception {
+    KettleEnvironment.init();
+    PluginRegistry.init( true );
+    List<String> attributes =
+        Arrays.asList( "filename", "fileCreated", "tablename", "tableCreated", "tableTruncated", "commitSize", "addToResultFiles", "DoNotOpenNewFileInit" );
+
+    Map<String, String> getterMap = new HashMap<String, String>();
+    Map<String, String> setterMap = new HashMap<String, String>();
+
+    Map<String, FieldLoadSaveValidator<?>> attrValidatorMap = new HashMap<String, FieldLoadSaveValidator<?>>();
+
+    Map<String, FieldLoadSaveValidator<?>> typeValidatorMap = new HashMap<String, FieldLoadSaveValidator<?>>();
+
+    loadSaveTester =
+        new LoadSaveTester( testMetaClass, attributes, getterMap, setterMap, attrValidatorMap, typeValidatorMap );
+  }
+
+  @Test
+  public void testSerialization() throws KettleException {
+    loadSaveTester.testSerialization();
+  }
+}

engine/test-src/org/pentaho/di/trans/steps/addsequence/AddSequenceMetaTest.java

@@ -55,7 +55,6 @@ public void testRoundTrip() throws KettleException {
 
     LoadSaveTester loadSaveTester =
       new LoadSaveTester( AddSequenceMeta.class, attributes, getterMap, setterMap, fieldValidators, typeValidators );
-    loadSaveTester.testXmlRoundTrip();
-    loadSaveTester.testRepoRoundTrip();
+    loadSaveTester.testSerialization();
   }
 }

engine/test-src/org/pentaho/di/trans/steps/analyticquery/AnalyticQueryMetaTest.java

@@ -63,7 +63,6 @@ public void testRoundTrip() throws KettleException {
 
     LoadSaveTester loadSaveTester =
       new LoadSaveTester( AnalyticQueryMeta.class, attributes, getterMap, setterMap, fieldValidators, typeValidators );
-    loadSaveTester.testXmlRoundTrip();
-    loadSaveTester.testRepoRoundTrip();
+    loadSaveTester.testSerialization();
   }
 }

engine/test-src/org/pentaho/di/trans/steps/autodoc/AutoDocMetaTest.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
  *
  *******************************************************************************
  *
@@ -63,12 +63,7 @@ public void setUp() throws Exception {
   }
 
   @Test
-  public void testLoadSaveXML() throws KettleException {
-    loadSaveTester.testXmlRoundTrip();
-  }
-
-  @Test
-  public void testLoadSaveRepo() throws KettleException {
-    loadSaveTester.testRepoRoundTrip();
+  public void testSerialization() throws KettleException {
+    loadSaveTester.testSerialization();
   }
 }

engine/test-src/org/pentaho/di/trans/steps/blockingstep/BlockingStepMetaTest.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
  *
  *******************************************************************************
  *
@@ -57,7 +57,6 @@ public void testRoundTrip() throws KettleException {
     setterMap.put( "compress", "setCompress" );
 
     LoadSaveTester loadSaveTester = new LoadSaveTester( BlockingStepMeta.class, attributes, getterMap, setterMap );
-    loadSaveTester.testRepoRoundTrip();
-    loadSaveTester.testXmlRoundTrip();
+    loadSaveTester.testSerialization();
   }
 }

engine/test-src/org/pentaho/di/trans/steps/blockuntilstepsfinish/BlockUntilStepsFinishMetaTest.java

@@ -21,11 +21,68 @@
  ******************************************************************************/
 package org.pentaho.di.trans.steps.blockuntilstepsfinish;
 
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
 import java.util.Arrays;
-import static org.junit.Assert.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.pentaho.di.core.KettleEnvironment;
+import org.pentaho.di.core.exception.KettleException;
+import org.pentaho.di.core.plugins.PluginRegistry;
+import org.pentaho.di.trans.step.StepMetaInterface;
+import org.pentaho.di.trans.steps.loadsave.LoadSaveTester;
+import org.pentaho.di.trans.steps.loadsave.initializer.InitializerInterface;
+import org.pentaho.di.trans.steps.loadsave.validator.ArrayLoadSaveValidator;
+import org.pentaho.di.trans.steps.loadsave.validator.FieldLoadSaveValidator;
+import org.pentaho.di.trans.steps.loadsave.validator.StringLoadSaveValidator;
+
+public class BlockUntilStepsFinishMetaTest implements InitializerInterface<StepMetaInterface> {
+  LoadSaveTester loadSaveTester;
+  Class<BlockUntilStepsFinishMeta> testMetaClass = BlockUntilStepsFinishMeta.class;
+
+  @Before
+  public void setUpLoadSave() throws Exception {
+    KettleEnvironment.init();
+    PluginRegistry.init( true );
+    List<String> attributes =
+        Arrays.asList( "stepName", "stepCopyNr" );
+
+    Map<String, String> getterMap = new HashMap<String, String>();
+    Map<String, String> setterMap = new HashMap<String, String>();
+    FieldLoadSaveValidator<String[]> stringArrayLoadSaveValidator =
+        new ArrayLoadSaveValidator<String>( new StringLoadSaveValidator(), 5 );
+
 
-public class BlockUntilStepsFinishMetaTest {
+    Map<String, FieldLoadSaveValidator<?>> attrValidatorMap = new HashMap<String, FieldLoadSaveValidator<?>>();
+    attrValidatorMap.put( "stepName", stringArrayLoadSaveValidator );
+    attrValidatorMap.put( "stepCopyNr", stringArrayLoadSaveValidator );
+
+    Map<String, FieldLoadSaveValidator<?>> typeValidatorMap = new HashMap<String, FieldLoadSaveValidator<?>>();
+
+    loadSaveTester =
+        new LoadSaveTester( testMetaClass, attributes, new ArrayList<String>(), new ArrayList<String>(),
+            getterMap, setterMap, attrValidatorMap, typeValidatorMap, this );
+  }
+
+  // Call the allocate method on the LoadSaveTester meta class
+  @Override
+  public void modify( StepMetaInterface someMeta ) {
+    if ( someMeta instanceof BlockUntilStepsFinishMeta ) {
+      ( (BlockUntilStepsFinishMeta) someMeta ).allocate( 5 );
+    }
+  }
+
+  @Test
+  public void testSerialization() throws KettleException {
+    loadSaveTester.testSerialization();
+  }
 
   @Test
   public void cloneTest() throws Exception {