From ded1ee8ac3d3051bf099b698508a7e1b232d25b5 Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Mon, 10 May 2004 16:25:19 +0000 Subject: INTEGRATION: CWS fwkbugfix02 (1.2.28); FILE MERGED 2004/04/01 14:33:46 mav 1.2.28.1: #116056# adopt implementation to the design change --- package/qa/storages/Test02.java | 14 +++++++------- package/qa/storages/Test03.java | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'package') diff --git a/package/qa/storages/Test02.java b/package/qa/storages/Test02.java index 8079efca1f18..def7dbc7f853 100644 --- a/package/qa/storages/Test02.java +++ b/package/qa/storages/Test02.java @@ -40,7 +40,7 @@ public class Test02 implements StorageTest { // create storage based on the temporary stream Object pArgs[] = new Object[2]; pArgs[0] = (Object) xTempFileStream; - pArgs[1] = new Integer( ElementModes.ELEMENT_WRITE ); + pArgs[1] = new Integer( ElementModes.WRITE ); Object oTempStorage = m_xStorageFactory.createInstanceWithArguments( pArgs ); XStorage xTempStorage = (XStorage) UnoRuntime.queryInterface( XStorage.class, oTempStorage ); @@ -53,7 +53,7 @@ public class Test02 implements StorageTest { // open a new substorage XStorage xTempSubStorage = m_aTestHelper.openSubStorage( xTempStorage, "SubStorage1", - ElementModes.ELEMENT_WRITE ); + ElementModes.WRITE ); if ( xTempSubStorage == null ) { m_aTestHelper.Error( "Can't create substorage!" ); @@ -70,14 +70,14 @@ public class Test02 implements StorageTest { if ( !m_aTestHelper.setStorageTypeAndCheckProps( xTempStorage, "MediaType2", true, - ElementModes.ELEMENT_WRITE ) ) + ElementModes.WRITE ) ) return false; // set "MediaType" property for storages and check that "IsRoot" and "OpenMode" properties are set correctly if ( !m_aTestHelper.setStorageTypeAndCheckProps( xTempSubStorage, "MediaType3", false, - ElementModes.ELEMENT_WRITE ) ) + ElementModes.WRITE ) ) return false; // commit substorage first @@ -120,20 +120,20 @@ public class Test02 implements StorageTest { return false; } - if ( !m_aTestHelper.checkStorageProperties( xResultStorage, "MediaType2", true, ElementModes.ELEMENT_READ ) ) + if ( !m_aTestHelper.checkStorageProperties( xResultStorage, "MediaType2", true, ElementModes.READ ) ) return false; // open existing substorage XStorage xResultSubStorage = m_aTestHelper.openSubStorage( xResultStorage, "SubStorage1", - ElementModes.ELEMENT_READ ); + ElementModes.READ ); if ( xResultSubStorage == null ) { m_aTestHelper.Error( "Can't open existing substorage!" ); return false; } - if ( !m_aTestHelper.checkStorageProperties( xResultSubStorage, "MediaType3", false, ElementModes.ELEMENT_READ ) ) + if ( !m_aTestHelper.checkStorageProperties( xResultSubStorage, "MediaType3", false, ElementModes.READ ) ) return false; if ( !m_aTestHelper.checkStream( xResultSubStorage, "SubStream1", "MediaType1", pBytes1 ) ) diff --git a/package/qa/storages/Test03.java b/package/qa/storages/Test03.java index 4aa073144de3..80259500778b 100644 --- a/package/qa/storages/Test03.java +++ b/package/qa/storages/Test03.java @@ -45,7 +45,7 @@ public class Test03 implements StorageTest { // open a new substorage XStorage xTempSubStorage = m_aTestHelper.openSubStorage( xTempStorage, "SubStorage1", - ElementModes.ELEMENT_WRITE ); + ElementModes.WRITE ); if ( xTempSubStorage == null ) { m_aTestHelper.Error( "Can't create substorage!" ); @@ -68,7 +68,7 @@ public class Test03 implements StorageTest { if ( !m_aTestHelper.setStorageTypeAndCheckProps( xTempSubStorage, "MediaType3", false, - ElementModes.ELEMENT_WRITE ) ) + ElementModes.WRITE ) ) return false; if ( !m_aTestHelper.commitStorage( xTempSubStorage ) ) @@ -159,7 +159,7 @@ public class Test03 implements StorageTest { if ( xResultSubStorage == null ) return false; - if ( !m_aTestHelper.checkStorageProperties( xResultSubStorage, "MediaType3", false, ElementModes.ELEMENT_READ ) ) + if ( !m_aTestHelper.checkStorageProperties( xResultSubStorage, "MediaType3", false, ElementModes.READ ) ) return false; XNameAccess xChildAccess = (XNameAccess) UnoRuntime.queryInterface( XNameAccess.class, xResultSubStorage ); -- cgit v1.2.3