Skip to content

Commit

Permalink
Merge pull request #331 from serguei-actuate/master
Browse files Browse the repository at this point in the history 
Miscellaneous unit test fixes
  • Loading branch information
Yulin Wang authored Jul 7, 2016
2 parents 1f729d2 + 5cba860 commit 99c9d79
Show file tree
Hide file tree
Showing 8 changed files with 125 additions and 87 deletions.
1 change: 1 addition & 0 deletions data/org.eclipse.birt.data.tests/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ Bundle-Localization: plugin
Require-Bundle: org.eclipse.birt.data,
org.apache.derby,
org.eclipse.birt.data.aggregation,
org.eclipse.datatools.connectivity.oda.flatfile,
org.junit;bundle-version="4.8.1"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Expand Down
140 changes: 73 additions & 67 deletions ...clipse.birt.data.tests/test/org/eclipse/birt/data/engine/odaconsumer/LargeObjectTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*
* Contributors:
* Actuate Corporation - initial API and implementation
*
*
*************************************************************************
*/

Expand All @@ -29,6 +29,7 @@
import org.eclipse.birt.data.engine.executor.ResultObject;
import org.eclipse.birt.data.engine.odi.IResultClass;
import org.eclipse.birt.data.engine.odi.IResultObject;
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.datatools.connectivity.oda.IBlob;
import org.eclipse.datatools.connectivity.oda.IClob;
import org.eclipse.datatools.connectivity.oda.OdaException;
Expand All @@ -40,7 +41,9 @@
import testutil.JDBCOdaDataSource;

import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.Ignore;
import static org.junit.Assert.*;
Expand All @@ -52,51 +55,56 @@
public class LargeObjectTest extends ConnectionTest
{

private static final String DTP_FLATFILE_DATASET_ID =
"org.eclipse.datatools.connectivity.oda.flatfile.dataSet";

private static final String DTP_FLATFILE_DATASOURCE_ID =
"org.eclipse.datatools.connectivity.oda.flatfile";

private static final String BIRT_FLATFILE_DATASOURCE_ID =
"org.eclipse.birt.report.data.oda.flatfile";
private static final String DTP_FLATFILE_DATASET_ID = "org.eclipse.datatools.connectivity.oda.flatfile.dataSet";
private static final String DTP_FLATFILE_DATASOURCE_ID = "org.eclipse.datatools.connectivity.oda.flatfile";
private static final String BIRT_FLATFILE_DATASOURCE_ID = "org.eclipse.birt.report.data.oda.flatfile";

private Connection m_flatFileConnection = null;
private static Connection m_flatFileConnection = null;

private static String sm_pluginFile = null;
private static String sm_manifestsDir = null;
private static String sm_pluginFileName = "plugin.xml"; //$NON-NLS-1$
private static String sm_dtpFlatfileId = DTP_FLATFILE_DATASOURCE_ID;
private static String sm_birtFlatfileId = BIRT_FLATFILE_DATASOURCE_ID;
private static boolean sm_pluginTest = org.eclipse.core.runtime.Platform.isRunning();
@Before
public void largeObjectSetUp() throws Exception

private static final Bundle dataBundle = org.eclipse.core.runtime.Platform.getBundle( "org.eclipse.birt.data" );
private static final Bundle driverBundle = org.eclipse.core.runtime.Platform.getBundle( sm_dtpFlatfileId );

@BeforeClass
public static void largeObjectSetUp() throws Exception
{
setupDirectories();

// only the last two runs require custom plugin manifests
/* if ( getName().equals( "testFlatfileGetBlob" ) ||
getName().equals( "testFlatfileGetClob" ) )
setPluginFile();
*/
*/
// set up flatfile test tables
TestUtil.createTestFile();
Properties prop = new Properties();
System.out.println("Test database: " + new File("testdatabase").getAbsolutePath());
prop.setProperty( TestUtil.CONN_HOME_DIR_PROP, new File("testdatabase").getAbsolutePath() );
prop.setProperty( TestUtil.CONN_CHARSET, TestUtil.CHARSET );
m_flatFileConnection = ConnectionManager.getInstance().openConnection(
DTP_FLATFILE_DATASOURCE_ID, prop, null );
}
@After
public void largeObjectTearDown() throws Exception
{
m_flatFileConnection.close();

@AfterClass
public static void largeObjectTearDown() throws Exception
{
if( m_flatFileConnection != null && m_flatFileConnection.isOpen( ) )
{
m_flatFileConnection.close( );
}


// if a backup plugin manifest exists, restore it
/* if ( getName().equals( "testFlatfileGetBlob" ) ||
getName().equals( "testFlatfileGetClob" ) )
restorePluginFile();
*/
*/
}

/*
Expand Down Expand Up @@ -129,15 +137,15 @@ public void testJdbc() throws Exception
assertEquals( "CLOB", resultClass.getFieldNativeTypeName( 2 ) );
assertEquals( IBlob.class, resultClass.getFieldValueClass( 1 ) );
assertEquals( IClob.class, resultClass.getFieldValueClass( 2 ) );

Object obj = resultObject.getFieldValue( 1 );
assertNull( obj );

obj = resultObject.getFieldValue( 2 );
assertTrue( obj instanceof String );
assertEquals( "abcdefg", obj.toString( ) );
assertEquals( "bcd", obj.toString( ).substring( 1, 4 ) );
assertEquals( "bcd", obj.toString( ).substring( 1, 4 ) );

stmt.close();
}

Expand All @@ -159,7 +167,7 @@ public void testJdbc() throws Exception
// }
// return subString;
// }
//
//
// private String getClobValue( IClob clob )
// {
// BufferedReader in = null;
Expand Down Expand Up @@ -188,7 +196,7 @@ public void testJdbc() throws Exception
// }
// return buffer.toString( );
// }

/*
* Tests implementation of blob data type in flatfile driver. The blob
* native type is mapped to the oda data type String.
Expand All @@ -211,12 +219,12 @@ public void testFlatfileBlob() throws Exception
assertEquals( "blob_col", names[0] );
assertEquals( "BLOB", resultClass.getFieldNativeTypeName( 1 ) );
assertEquals( String.class, resultClass.getFieldValueClass( 1 ) );

IResultObject resultObject = resultSet.fetch();
Object obj = resultObject.getFieldValue( 1 );
assertTrue( obj instanceof String );
assertEquals( "0123456789", obj.toString() );

stmt.close();
}

Expand Down Expand Up @@ -245,14 +253,14 @@ public void testFlatfileClob() throws Exception
assertEquals( "CLOB", resultClass.getFieldNativeTypeName( 1 ) );

assertEquals( String.class, resultClass.getFieldValueClass( 1 ) );

Object obj = resultObject.getFieldValue( 1 );
assertTrue( obj instanceof String );
assertEquals( "abcdefghijklmnopqrstuvwxyz", obj.toString() );

stmt.close();
}
}

/*
* Tests implementation of blob data type in flatfile driver
* by hardcoding an IBlob value returned from the resultset.
Expand All @@ -262,7 +270,7 @@ public void testFlatfileClob() throws Exception
public void testFlatfileGetBlob() throws Exception
{
/* TODO - replace with customized test driver, instead of
* using a testing plugin.xml
* using a testing plugin.xml
String command = "select blob_col from table1";
PreparedStatement stmt = m_flatFileConnection.prepareStatement(
command, DTP_FLATFILE_DATASET_ID );
Expand All @@ -282,16 +290,16 @@ public void testFlatfileGetBlob() throws Exception
assertEquals( org.eclipse.datatools.connectivity.oda.IBlob.class,
resultClass.getFieldValueClass( 1 ) );
Object obj = resultObject.getFieldValue( 1 );
assertTrue( obj instanceof byte[] );
byte[] objValue = (byte[]) obj;
for ( int i = 0; i < objValue.length; i += 1 )
assertEquals( i, objValue[i] );
assertEquals( i, objValue[i] );
// IBlob blob = (IBlob) obj;
// InputStream stream = blob.getBinaryStream();
// for( int i = 0 , c = stream.read(); c != -1; i += 1, c = stream.read() )
// assertEquals( i, c );
// assertEquals( i, c );
stmt.close();
*/ }

Expand All @@ -302,9 +310,9 @@ public void testFlatfileGetBlob() throws Exception
*/
@Test
public void testFlatfileGetClob() throws Exception
{
{
/* TODO - replace with customized test driver, instead of
* using a testing plugin.xml
* using a testing plugin.xml
String command = "select clob_col from table1";
PreparedStatement stmt = m_flatFileConnection.prepareStatement(
command, DTP_FLATFILE_DATASET_ID );
Expand All @@ -324,18 +332,18 @@ public void testFlatfileGetClob() throws Exception
assertEquals( org.eclipse.datatools.connectivity.oda.IClob.class,
resultClass.getFieldValueClass( 1 ) );
Object obj = resultObject.getFieldValue( 1 );
assertTrue( obj instanceof String );
char[] chs = obj.toString( ).toCharArray( );
for ( int i = 0; i < chs.length; i += 1 )
{
assertEquals( 'a' + i, chs[i] );
}
// assertTrue( obj instanceof IClob );
// IClob clob = (IClob) obj;
// Reader reader = clob.getCharacterStream();
// Reader reader = clob.getCharacterStream();
// assertEquals( 26, clob.length() );
// for ( int i = 0; i < clob.length(); i += 1)
// {
Expand All @@ -345,38 +353,36 @@ public void testFlatfileGetClob() throws Exception
stmt.close();
*/ }

private void setupDirectories() throws IOException
private static void setupDirectories() throws IOException
{
String dataDir;

if ( sm_pluginFile != null && sm_manifestsDir != null )
return; // already set, so return early

if ( sm_pluginTest )
{
// set directory where test plugin.xml files are stored
Bundle dataBundle = org.eclipse.core.runtime.Platform.getBundle( "org.eclipse.birt.data" );
{
// set directory where test plugin.xml files are stored
URL url = dataBundle.getEntry( "/" );
dataDir = org.eclipse.core.runtime.Platform.asLocalURL( url ).getPath();
dataDir = FileLocator.toFileURL( url ).getPath();

// set location where plugin.xml will be parsed
Bundle driverBundle = org.eclipse.core.runtime.Platform.getBundle( sm_dtpFlatfileId );
// set location where plugin.xml will be parsed
URL jdbcUrl = driverBundle.getEntry( "/" );
sm_pluginFile = org.eclipse.core.runtime.Platform.asLocalURL( jdbcUrl ).getPath() + sm_pluginFileName;
sm_pluginFile = FileLocator.toFileURL( jdbcUrl ).getPath() + sm_pluginFileName;
}
else
{
// set directory where test plugin.xml files are stored
dataDir = ".";

// set location where plugin.xml will be parsed
sm_pluginFile = dataDir + "/test/plugins/" + sm_dtpFlatfileId + "/" + sm_pluginFileName;
System.setProperty( "BIRT_HOME", dataDir + "/test" );
System.setProperty( "BIRT_HOME", dataDir + "/test" );
}

sm_manifestsDir = dataDir + "/test/plugins/" + sm_birtFlatfileId + "/manifests/";
}

/*
* This class is used to access the protected member variable 'platform' in
* the Platform class. This testclass uses the 'setPlatform' method to create
Expand All @@ -389,40 +395,40 @@ private void setupDirectories() throws IOException
// platform = p;
// }
// }

/*
* ResultSetLob test class for hard-coded BLOB and CLOB values
*/
private class ResultSetLob extends ResultSet
{
private IResultClass m_resultClass = null;

public ResultSetLob( IResultClass resultClass )
{
// create a placeholder IResultSet object,
// which isn't used in this test
super( new SimpleResultSet(), resultClass );

m_resultClass = resultClass;
}

public IResultObject fetch() throws DataException
{
{
int columnCount = m_resultClass.getFieldCount();
int[] driverPositions =
int[] driverPositions =
( (ResultClass) m_resultClass ).getFieldDriverPositions();
assert( columnCount == driverPositions.length );

Object[] fields = new Object[ columnCount ];

for( int i = 1; i <= columnCount; i++ )
{
if ( m_resultClass.isCustomField( i ) == true )
continue;

Class dataType = m_resultClass.getFieldValueClass( i );
Object colValue = null;

if( dataType == IClob.class )
colValue = getClob();
else if( dataType == IBlob.class )
Expand All @@ -432,24 +438,24 @@ else if( dataType == IBlob.class )

fields[i - 1] = colValue;
}

IResultObject ret = new ResultObject( m_resultClass, fields );

return ret;
}

private Object getBlob()
{
byte[] bytes = new byte[] { 0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9 };
return new Blob( bytes );
}

private Object getClob()
{
return new Clob( "abcdefghijklmnopqrstuvwxyz" );
return new Clob( "abcdefghijklmnopqrstuvwxyz" );
}
}

/*
* TestUtil class for generating test data, taken from flatfile test package
*/
Expand Down
8 changes: 5 additions & 3 deletions ...report.data.oda.jdbc.tests/test/org/eclipse/birt/report/data/oda/jdbc/ConnectionTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -256,11 +256,13 @@ public void testOpen( ) throws Exception
conn.open( props );
fail( "Open Connection with wrong property should throw exception" );
}
catch ( OdaException e )
catch ( Throwable e1 )
{

if ( !( e1 instanceof OdaException || e1 instanceof NoClassDefFoundError ) )
{
throw new OdaException(e1);
}
}

}

/*
Expand Down
Loading

0 comments on commit 99c9d79

Please sign in to comment.