[TEST] - Add more load/save tests, move ConditionLoadSaveTester for o…

…ther

tests

engine/src/org/pentaho/di/trans/steps/groupby/GroupByMeta.java

@@ -302,6 +302,7 @@ public void setValueField( String[] valueField ) {
     this.valueField = valueField;
   }
 
+  @Override
   public void loadXML( Node stepnode, List<DatabaseMeta> databases, IMetaStore metaStore ) throws KettleXMLException {
     readData( stepnode );
   }
@@ -314,8 +315,25 @@ public void allocate( int sizegroup, int nrfields ) {
     valueField = new String[ nrfields ];
   }
 
+  @Override
   public Object clone() {
-    Object retval = super.clone();
+    GroupByMeta retval = (GroupByMeta) super.clone();
+
+    int szGroup = 0, szFields = 0;
+    if ( groupField != null ) {
+      szGroup = groupField.length;
+    }
+    if ( valueField != null ) {
+      szFields = valueField.length;
+    }
+    retval.allocate( szGroup, szFields );
+
+    System.arraycopy( groupField, 0, retval.groupField, 0, szGroup );
+    System.arraycopy( aggregateField, 0, retval.aggregateField, 0, szFields );
+    System.arraycopy( subjectField, 0, retval.subjectField, 0, szFields );
+    System.arraycopy( aggregateType, 0, retval.aggregateType, 0, szFields );
+    System.arraycopy( valueField, 0, retval.valueField, 0, szFields );
+
     return retval;
   }
 
@@ -399,6 +417,7 @@ public static final String getTypeDescLong( int i ) {
     return typeGroupLongDesc[ i ];
   }
 
+  @Override
   public void setDefault() {
     directory = "%%java.io.tmpdir%%";
     prefix = "grp";
@@ -413,6 +432,7 @@ public void setDefault() {
     allocate( sizeGroup, numberOfFields );
   }
 
+  @Override
   public void getFields( RowMetaInterface rowMeta, String origin, RowMetaInterface[] info, StepMeta nextStep,
                          VariableSpace space, Repository repository, IMetaStore metaStore ) {
     // re-assemble a new row of metadata
@@ -523,6 +543,7 @@ public void getFields( RowMetaInterface rowMeta, String origin, RowMetaInterface
     rowMeta.addRowMeta( fields );
   }
 
+  @Override
   public String getXML() {
     StringBuilder retval = new StringBuilder( 500 );
 
@@ -557,6 +578,7 @@ public String getXML() {
     return retval.toString();
   }
 
+  @Override
   public void readRep( Repository rep, IMetaStore metaStore, ObjectId id_step, List<DatabaseMeta> databases )
     throws KettleException {
     try {
@@ -597,6 +619,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 {
@@ -626,6 +649,7 @@ public void saveRep( Repository rep, IMetaStore metaStore, ObjectId id_transform
     }
   }
 
+  @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 ) {
@@ -644,11 +668,13 @@ public void check( List<CheckResultInterface> remarks, TransMeta transMeta, Step
     }
   }
 
+  @Override
   public StepInterface getStep( StepMeta stepMeta, StepDataInterface stepDataInterface, int cnr,
                                 TransMeta transMeta, Trans trans ) {
     return new GroupBy( stepMeta, stepDataInterface, cnr, transMeta, trans );
   }
 
+  @Override
   public StepDataInterface getStepData() {
     return new GroupByData();
   }

engine/src/org/pentaho/di/trans/steps/infobrightoutput/InfobrightLoaderMeta.java

@@ -78,6 +78,7 @@ public InfobrightLoaderMeta() {
    * @see org.pentaho.di.trans.step.StepMetaInterface#getStep(org.pentaho.di.trans.step.StepMeta,
    *      org.pentaho.di.trans.step.StepDataInterface, int, org.pentaho.di.trans.TransMeta, org.pentaho.di.trans.Trans)
    */
+  @Override
   public StepInterface getStep( StepMeta stepMeta, StepDataInterface stepDataInterface, int cnr, TransMeta tr,
     Trans trans ) {
     InfobrightLoader loader = new InfobrightLoader( stepMeta, stepDataInterface, cnr, tr, trans );
@@ -89,6 +90,7 @@ public StepInterface getStep( StepMeta stepMeta, StepDataInterface stepDataInter
    *
    * @see org.pentaho.di.trans.step.StepMetaInterface#getStepData()
    */
+  @Override
   public StepDataInterface getStepData() {
     return new InfobrightLoaderData();
   }
@@ -98,6 +100,7 @@ public StepDataInterface getStepData() {
    *
    * @see org.pentaho.di.trans.step.BaseStepMeta#clone()
    */
+  @Override
   public Object clone() {
     InfobrightLoaderMeta retval = (InfobrightLoaderMeta) super.clone();
     return retval;
@@ -111,6 +114,11 @@ public void setDataFormat( DataFormat dataFormat ) {
     this.dataFormat = dataFormat;
   }
 
+  public DataFormat getDataFormat() {
+    return this.dataFormat;
+  }
+
+  @Override
   public void setDefault() {
     this.dataFormat = DataFormat.TXT_VARIABLE; // default for ICE
     // this.dataFormat = DataFormat.BINARY; // default for IEE

engine/src/org/pentaho/di/trans/steps/ivwloader/IngresVectorwiseLoaderMeta.java

@@ -133,6 +133,7 @@ public IngresVectorwiseLoaderMeta() {
    * @see org.pentaho.di.trans.step.StepMetaInterface#getStep(org.pentaho.di.trans.step.StepMeta,
    *      org.pentaho.di.trans.step.StepDataInterface, int, org.pentaho.di.trans.TransMeta, org.pentaho.di.trans.Trans)
    */
+  @Override
   public StepInterface getStep( StepMeta stepMeta, StepDataInterface stepDataInterface, int cnr, TransMeta tr,
     Trans trans ) {
     IngresVectorwiseLoader loader = new IngresVectorwiseLoader( stepMeta, stepDataInterface, cnr, tr, trans );
@@ -144,6 +145,7 @@ public StepInterface getStep( StepMeta stepMeta, StepDataInterface stepDataInter
    *
    * @see org.pentaho.di.trans.step.StepMetaInterface#getStepData()
    */
+  @Override
   public StepDataInterface getStepData() {
     return new IngresVectorwiseLoaderData();
   }
@@ -153,11 +155,13 @@ public StepDataInterface getStepData() {
    *
    * @see org.pentaho.di.trans.step.BaseStepMeta#clone()
    */
+  @Override
   public Object clone() {
     IngresVectorwiseLoaderMeta retval = (IngresVectorwiseLoaderMeta) super.clone();
     return retval;
   }
 
+  @Override
   public void setDefault() {
     allocate( 0 );
     sqlPath = "/opt/Ingres/IngresVW/ingres/bin/sql";
@@ -193,6 +197,7 @@ public void allocate( int nrRows ) {
     fieldDatabase = new String[nrRows];
   }
 
+  @Override
   public String getXML() {
     StringBuilder retval = new StringBuilder();
 
@@ -268,6 +273,7 @@ public void loadXML( Node stepnode, List<DatabaseMeta> databases, IMetaStore met
     }
   }
 
+  @Override
   public void readRep( Repository rep, IMetaStore metaStore, ObjectId id_step, List<DatabaseMeta> databases ) throws KettleException {
     try {
       databaseMeta = rep.loadDatabaseMetaFromStepAttribute( id_step, "id_connection", databases );
@@ -303,6 +309,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.saveDatabaseMetaStepAttribute( id_transformation, id_step, "id_connection", databaseMeta );
@@ -343,6 +350,7 @@ public void saveRep( Repository rep, IMetaStore metaStore, ObjectId id_transform
   /**
    * @return the databaseMeta
    */
+  @Override
   public DatabaseMeta getDatabaseMeta() {
     return databaseMeta;
   }
@@ -358,6 +366,7 @@ public void setDatabaseMeta( DatabaseMeta databaseMeta ) {
   /**
    * @return the tablename
    */
+  @Override
   public String getTableName() {
     return tablename;
   }
@@ -415,6 +424,7 @@ public void setFieldFormat( String[] fieldFormat ) {
     this.fieldFormat = fieldFormat;
   }
 
+  @Override
   public SQLStatement getSQLStatements( TransMeta transMeta, StepMeta stepMeta, RowMetaInterface prev,
     Repository repository, IMetaStore metaStore ) {
     SQLStatement retval = new SQLStatement( stepMeta.getName(), databaseMeta, null ); // default:
@@ -651,4 +661,14 @@ public String getSchemaName() {
   public String getMissingDatabaseConnectionInformationMessage() {
     return null;
   }
+
+  @Override
+  public DatabaseMeta[] getUsedDatabaseConnections() {
+    if ( databaseMeta != null ) {
+      return new DatabaseMeta[] { databaseMeta };
+    } else {
+      return super.getUsedDatabaseConnections();
+    }
+  }
+
 }

engine/test-src/org/pentaho/di/trans/steps/filterrows/FilterRowsMetaTest.java

@@ -25,16 +25,14 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Random;
-import java.util.UUID;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.pentaho.di.core.Condition;
 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.ConditionLoadSaveValidator;
 import org.pentaho.di.trans.steps.loadsave.validator.FieldLoadSaveValidator;
 
 public class FilterRowsMetaTest {
@@ -65,31 +63,4 @@ public void testSerialization() throws KettleException {
     loadSaveTester.testSerialization();
   }
 
-  public class ConditionLoadSaveValidator implements FieldLoadSaveValidator<Condition> {
-    final Random rand = new Random();
-    @Override
-    public Condition getTestObject() {
-      Condition rtn = new Condition();
-      rtn.setFunction( rand.nextInt( Condition.functions.length ) );
-      rtn.setLeftValuename( UUID.randomUUID().toString() );
-      rtn.setNegated( rand.nextBoolean() );
-      rtn.setOperator( rand.nextInt( Condition.operators.length ) );
-      rtn.setRightValuename( UUID.randomUUID().toString() );
-      return rtn;
-    }
-
-    @Override
-    public boolean validateTestObject( Condition testObject, Object actual ) {
-      if ( !( actual instanceof Condition ) ) {
-        return false;
-      }
-      Condition another = (Condition) actual;
-      try {
-        return ( testObject.getXML().equals( another.getXML() ) );
-      } catch ( KettleException ex ) {
-        throw new RuntimeException( ex );
-      }
-    }
-  }
-
 }

engine/test-src/org/pentaho/di/trans/steps/groupby/GroupByMetaTest.java

@@ -0,0 +1,95 @@
+/*! ******************************************************************************
+ *
+ * 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.groupby;
+
+import java.util.ArrayList;
+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.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.IntLoadSaveValidator;
+import org.pentaho.di.trans.steps.loadsave.validator.PrimitiveIntArrayLoadSaveValidator;
+import org.pentaho.di.trans.steps.loadsave.validator.StringLoadSaveValidator;
+
+public class GroupByMetaTest implements InitializerInterface<StepMetaInterface> {
+  LoadSaveTester loadSaveTester;
+  Class<GroupByMeta> testMetaClass = GroupByMeta.class;
+
+  @Before
+  public void setUpLoadSave() throws Exception {
+    KettleEnvironment.init();
+    PluginRegistry.init( true );
+    List<String> attributes =
+        Arrays.asList( "passAllRows", "directory", "prefix", "aggregateIgnored", "aggregateIgnoredField", "addingLineNrInGroup",
+            "lineNrInGroupField", "alwaysGivingBackOneRow", "groupField", "aggregateField", "subjectField",
+            "aggregateType", "valueField" );
+
+    Map<String, String> getterMap = new HashMap<String, String>() {
+      {
+        put( "passAllRows", "passAllRows" );
+      }
+    };
+    Map<String, String> setterMap = new HashMap<String, String>();
+
+    FieldLoadSaveValidator<String[]> stringArrayLoadSaveValidator =
+        new ArrayLoadSaveValidator<String>( new StringLoadSaveValidator(), 5 );
+
+
+    Map<String, FieldLoadSaveValidator<?>> attrValidatorMap = new HashMap<String, FieldLoadSaveValidator<?>>();
+    attrValidatorMap.put( "groupField", stringArrayLoadSaveValidator );
+    attrValidatorMap.put( "aggregateField", stringArrayLoadSaveValidator );
+    attrValidatorMap.put( "subjectField", stringArrayLoadSaveValidator );
+    attrValidatorMap.put( "valueField", stringArrayLoadSaveValidator );
+    attrValidatorMap.put( "aggregateType",
+        new PrimitiveIntArrayLoadSaveValidator( new IntLoadSaveValidator( GroupByMeta.typeGroupCode.length ), 5 ) );
+
+    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 GroupByMeta ) {
+      ( (GroupByMeta) someMeta ).allocate( 5, 5 );
+    }
+  }
+
+  @Test
+  public void testSerialization() throws KettleException {
+    loadSaveTester.testSerialization();
+  }
+}