This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new 48cff413b3 Cleanup merge conflicts
48cff413b3 is described below
commit 48cff413b362700d00c2cb56b55f4efbc0a3ad51
Author: mseidel <[email protected]>
AuthorDate: Tue Jul 22 00:33:47 2025 +0200
Cleanup merge conflicts
---
.../comphelper/SequenceOutputStreamUnitTest.java | 16 ++--
.../connectivity/hsqldb/DatabaseMetaData.java | 48 +++++------
main/qadevOOo/runner/helper/StreamSimulator.java | 93 ++++++++++------------
main/qadevOOo/tests/java/ifc/i18n/_XCalendar.java | 23 +++---
.../tests/java/ifc/i18n/_XExtendedCalendar.java | 37 +++------
.../ifc/i18n/_XExtendedIndexEntrySupplier.java | 66 ++++++---------
6 files changed, 111 insertions(+), 172 deletions(-)
diff --git
a/main/comphelper/qa/complex/comphelper/SequenceOutputStreamUnitTest.java
b/main/comphelper/qa/complex/comphelper/SequenceOutputStreamUnitTest.java
index 6543cdd182..262a417236 100644
--- a/main/comphelper/qa/complex/comphelper/SequenceOutputStreamUnitTest.java
+++ b/main/comphelper/qa/complex/comphelper/SequenceOutputStreamUnitTest.java
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you 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.
- *
+ *
*************************************************************/
@@ -66,7 +66,6 @@ public class SequenceOutputStreamUnitTest /* extends
ComplexTestCase*/ {
private XMultiServiceFactory m_xMSF = null;
TestHelper m_aTestHelper = null;
-<<<<<<< HEAD
// public String[] getTestMethodNames() {
// return new String[] {
@@ -77,9 +76,6 @@ public class SequenceOutputStreamUnitTest /* extends
ComplexTestCase*/ {
// return "SequenceOutputStreamUnitTest";
// }
-=======
-
->>>>>>> 3309286857 (pre-commit auto remove trailing whitespace from java files
(#382))
// public static String getShortTestDescription() {
// return "tests the SequenceOutput/InputStream implementations";
// }
@@ -95,11 +91,11 @@ public class SequenceOutputStreamUnitTest /* extends
ComplexTestCase*/ {
fail ("Cannot create service factory!");
}
}
-
+
@After public void after() {
m_xMSF = null;
}
-
+
// @Test public void ExecuteTest01() {
// Test01 aTest = new Test01 (m_xMSF);
// assertTrue( "Test01 failed!", aTest.test() );
diff --git
a/main/connectivity/qa/complex/connectivity/hsqldb/DatabaseMetaData.java
b/main/connectivity/qa/complex/connectivity/hsqldb/DatabaseMetaData.java
index a06eb487bb..ff18ad197d 100644
--- a/main/connectivity/qa/complex/connectivity/hsqldb/DatabaseMetaData.java
+++ b/main/connectivity/qa/complex/connectivity/hsqldb/DatabaseMetaData.java
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you 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.
- *
+ *
*************************************************************/
/*
@@ -36,36 +36,28 @@ import java.lang.reflect.Method;
public class DatabaseMetaData {
-
+
private java.sql.DatabaseMetaData m_xMD;
-<<<<<<< HEAD
private HsqlDriverTest m_TestCase;
-=======
-
->>>>>>> 3309286857 (pre-commit auto remove trailing whitespace from java files
(#382))
/** Creates a new instance of DatabaseMetaData */
public DatabaseMetaData(HsqlDriverTest _testCase,java.sql.DatabaseMetaData
_xmd) {
m_TestCase = _testCase;
m_xMD = _xmd;
}
-<<<<<<< HEAD
protected void assure(String _sText,boolean btest){
m_TestCase.assurePublic(_sText,btest);
}
-=======
-
->>>>>>> 3309286857 (pre-commit auto remove trailing whitespace from java files
(#382))
protected void testMethod(String sName,Class[] params,Object[]
objParams,int nCount){
try {
System.out.println("test method " + sName);
-
+
Method aGet = ((Object)m_xMD).getClass().getDeclaredMethod(sName,
params);
if ( aGet != null ){
ResultSet rs = (ResultSet)aGet.invoke(m_xMD, objParams);
- ResultSetMetaData rsMD = rs.getMetaData();
+ ResultSetMetaData rsMD = rs.getMetaData();
assure( sName + " returns wrong column count" ,
rsMD.getColumnCount() == nCount);
}
@@ -80,14 +72,14 @@ public class DatabaseMetaData {
} catch( java.lang.reflect.InvocationTargetException ex ) {
assure("IllegalAccessException!",false);
} finally {
-
+
}
}
-
+
public void test(){
-
+
// try {
-
+
try{
ResultSet rs = m_xMD.getTables(null,null,"TESTCASE",null);
while ( rs.next() )
@@ -112,14 +104,14 @@ public class DatabaseMetaData {
}
} catch(Exception e){
-
+
}
//testMethod("getTypeInfo", zclass,empty,17);
/*
Class[] zclass = new Class[]{};
Object[] empty = new Object[]{};
testMethod("getCatalogs", zclass,empty,1);
-
+
testMethod("getSchemas", zclass,empty,2);
testMethod("getTableTypes", zclass,empty,1);
Class[] a4 = new Class[4];
@@ -137,7 +129,7 @@ public class DatabaseMetaData {
testMethod("getColumns", a4,o4,18);
testMethod("getProcedureColumns", a4,o4,13);
testMethod("getColumns", a4,o4,18);
-
+
Class[] a3 = new Class[3];
Object[] o3 = new Object[3];
a3[0] = Class.forName("java.lang.Object");
@@ -147,7 +139,7 @@ public class DatabaseMetaData {
o3[0] = null;
o3[1] = null;
o3[2] = "%";
-
+
testMethod("getExportedKeys", a3,o3,14);
testMethod("getImportedKeys", a3,o3,14);
testMethod("getPrimaryKeys", a3,o3,14);
@@ -155,24 +147,24 @@ public class DatabaseMetaData {
testMethod("getTablePrivileges", a3,o3,6);
testMethod("getVersionColumns", a3,o3,7);
// testMethod("getCrossReference", a3,o3,14);
-
+
} catch( java.lang.ClassNotFoundException ex) {
assure("ClassNotFoundException: " + ex.getMessage() ,false);
}
*/
}
-/*
+/*
public com.sun.star.sdbc.XResultSet getCrossReference(Object obj, String
str, String str2, Object obj3, String str4, String str5) {
}
public com.sun.star.sdbc.XResultSet getIndexInfo(Object obj, String str,
String str2, boolean param, boolean param4) {
}
-
+
public com.sun.star.sdbc.XResultSet getTables(Object obj, String str,
String str2, String[] str3) {
}
-
+
public com.sun.star.sdbc.XResultSet getUDTs(Object obj, String str, String
str2, int[] values) {
}
-
+
public com.sun.star.sdbc.XResultSet getBestRowIdentifier(Object obj,
String str, String str2, int param, boolean param4) throws
com.sun.star.sdbc.SQLException {
}
*/
diff --git a/main/qadevOOo/runner/helper/StreamSimulator.java
b/main/qadevOOo/runner/helper/StreamSimulator.java
index 50287c5a3e..1d447e46dc 100644
--- a/main/qadevOOo/runner/helper/StreamSimulator.java
+++ b/main/qadevOOo/runner/helper/StreamSimulator.java
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you 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.
- *
+ *
*************************************************************/
@@ -83,13 +83,8 @@ public class StreamSimulator implements
com.sun.star.io.XInputStream ,
* in case the internal streams to the file on disk couldn't
established.
* They are necessary. Otherwise this simulator can't really
work.
*/
-<<<<<<< HEAD:main/qadevOOo/runner/helper/StreamSimulator.java
public StreamSimulator( String sFileName , boolean bInput ,
lib.TestParameters param ) throws
com.sun.star.io.NotConnectedException
-=======
- public StreamSimulator( String sFileName , boolean bInput ,
- XMultiServiceFactory xMSF ) throws
com.sun.star.io.NotConnectedException
->>>>>>> 3309286857 (pre-commit auto remove trailing whitespace from java files
(#382)):main/qadevOOo/java/OOoRunner/src/main/java/helper/StreamSimulator.java
{
////m_aProtocol = new ComplexTestEnvironment();
m_sFileName = sFileName ;
@@ -98,15 +93,9 @@ public class StreamSimulator implements
com.sun.star.io.XInputStream ,
try
{
-<<<<<<< HEAD:main/qadevOOo/runner/helper/StreamSimulator.java
XSimpleFileAccess xHelper = (XSimpleFileAccess)
UnoRuntime.queryInterface(XSimpleFileAccess.class,
((XMultiServiceFactory)param.getMSF()).createInstance("com.sun.star.ucb.SimpleFileAccess"));
-=======
- XSimpleFileAccess xHelper = (XSimpleFileAccess)
- UnoRuntime.queryInterface(XSimpleFileAccess.class,
- xMSF.createInstance("com.sun.star.ucb.SimpleFileAccess"));
->>>>>>> 3309286857 (pre-commit auto remove trailing whitespace from java files
(#382)):main/qadevOOo/java/OOoRunner/src/main/java/helper/StreamSimulator.java
/* com.sun.star.ucb.XSimpleFileAccess xHelper =
(com.sun.star.ucb.XSimpleFileAccess)OfficeConnect.createRemoteInstance(
com.sun.star.ucb.XSimpleFileAccess.class,
"com.sun.star.ucb.SimpleFileAccess");*/
@@ -167,13 +156,13 @@ public class StreamSimulator implements
com.sun.star.io.XInputStream ,
{
nRead = m_xInStream.readBytes(lData,nBytesToRead);
}
- catch (com.sun.star.io.NotConnectedException exConnect) {
//m_aProtocol.log("\tgot NotConnectedException\n\tfailed\n}\n" ); throw
exConnect;
+ catch (com.sun.star.io.NotConnectedException exConnect) {
//m_aProtocol.log("\tgot NotConnectedException\n\tfailed\n}\n" ); throw
exConnect;
}
- catch (com.sun.star.io.BufferSizeExceededException exBuffer ) {
//m_aProtocol.log("\tgot BufferSizeExceededException\n\tfailed\n}\n"); throw
exBuffer;
+ catch (com.sun.star.io.BufferSizeExceededException exBuffer ) {
//m_aProtocol.log("\tgot BufferSizeExceededException\n\tfailed\n}\n"); throw
exBuffer;
}
- catch (com.sun.star.io.IOException exIO ) {
//m_aProtocol.log("\tgot IOException\n\tfailed\n}\n" ); throw
exIO;
+ catch (com.sun.star.io.IOException exIO ) {
//m_aProtocol.log("\tgot IOException\n\tfailed\n}\n" ); throw
exIO;
}
- catch (com.sun.star.uno.RuntimeException exRuntime) {
//m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n" ); throw
exRuntime;
+ catch (com.sun.star.uno.RuntimeException exRuntime) {
//m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n" ); throw
exRuntime;
}
catch (com.sun.star.uno.Exception exUno ) {
//m_aProtocol.log("\tgot Exception\n\tfailed\n}\n" );
}
@@ -207,13 +196,13 @@ public class StreamSimulator implements
com.sun.star.io.XInputStream ,
{
nRead = m_xInStream.readSomeBytes(lData,nMaxBytesToRead);
}
- catch (com.sun.star.io.NotConnectedException exConnect) {
//m_aProtocol.log("\tgot NotConnectedException\n\tfailed\n}\n" ); throw
exConnect;
+ catch (com.sun.star.io.NotConnectedException exConnect) {
//m_aProtocol.log("\tgot NotConnectedException\n\tfailed\n}\n" ); throw
exConnect;
}
- catch (com.sun.star.io.BufferSizeExceededException exBuffer ) {
//m_aProtocol.log("\tgot BufferSizeExceededException\n\tfailed\n}\n"); throw
exBuffer;
+ catch (com.sun.star.io.BufferSizeExceededException exBuffer ) {
//m_aProtocol.log("\tgot BufferSizeExceededException\n\tfailed\n}\n"); throw
exBuffer;
}
- catch (com.sun.star.io.IOException exIO ) {
//m_aProtocol.log("\tgot IOException\n\tfailed\n}\n" ); throw
exIO;
+ catch (com.sun.star.io.IOException exIO ) {
//m_aProtocol.log("\tgot IOException\n\tfailed\n}\n" ); throw
exIO;
}
- catch (com.sun.star.uno.RuntimeException exRuntime) {
//m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n" ); throw
exRuntime;
+ catch (com.sun.star.uno.RuntimeException exRuntime) {
//m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n" ); throw
exRuntime;
}
catch (com.sun.star.uno.Exception exUno ) {
//m_aProtocol.log("\tgot Exception\n\tfailed\n}\n" );
}
@@ -245,13 +234,13 @@ public class StreamSimulator implements
com.sun.star.io.XInputStream ,
{
m_xInStream.skipBytes(nBytesToSkip);
}
- catch (com.sun.star.io.NotConnectedException exConnect) {
//m_aProtocol.log("\tgot NotConnectedException\n\tfailed\n}\n" ); throw
exConnect;
+ catch (com.sun.star.io.NotConnectedException exConnect) {
//m_aProtocol.log("\tgot NotConnectedException\n\tfailed\n}\n" ); throw
exConnect;
}
- catch (com.sun.star.io.BufferSizeExceededException exBuffer ) {
//m_aProtocol.log("\tgot BufferSizeExceededException\n\tfailed\n}\n"); throw
exBuffer;
+ catch (com.sun.star.io.BufferSizeExceededException exBuffer ) {
//m_aProtocol.log("\tgot BufferSizeExceededException\n\tfailed\n}\n"); throw
exBuffer;
}
- catch (com.sun.star.io.IOException exIO ) {
//m_aProtocol.log("\tgot IOException\n\tfailed\n}\n" ); throw
exIO;
+ catch (com.sun.star.io.IOException exIO ) {
//m_aProtocol.log("\tgot IOException\n\tfailed\n}\n" ); throw
exIO;
}
- catch (com.sun.star.uno.RuntimeException exRuntime) {
//m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n" ); throw
exRuntime;
+ catch (com.sun.star.uno.RuntimeException exRuntime) {
//m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n" ); throw
exRuntime;
}
catch (com.sun.star.uno.Exception exUno ) {
//m_aProtocol.log("\tgot Exception\n\tfailed\n}\n" );
}
@@ -278,11 +267,11 @@ public class StreamSimulator implements
com.sun.star.io.XInputStream ,
{
nAvailable = m_xInStream.available();
}
- catch (com.sun.star.io.NotConnectedException exConnect) {
//m_aProtocol.log("\tgot NotConnectedException\n\tfailed\n}\n"); throw
exConnect;
+ catch (com.sun.star.io.NotConnectedException exConnect) {
//m_aProtocol.log("\tgot NotConnectedException\n\tfailed\n}\n"); throw
exConnect;
}
- catch (com.sun.star.io.IOException exIO ) {
//m_aProtocol.log("\tgot IOException\n\tfailed\n}\n" ); throw exIO;
+ catch (com.sun.star.io.IOException exIO ) {
//m_aProtocol.log("\tgot IOException\n\tfailed\n}\n" ); throw exIO;
}
- catch (com.sun.star.uno.RuntimeException exRuntime) {
//m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n" ); throw
exRuntime;
+ catch (com.sun.star.uno.RuntimeException exRuntime) {
//m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n" ); throw
exRuntime;
}
catch (com.sun.star.uno.Exception exUno ) {
//m_aProtocol.log("\tgot Exception\n\tfailed\n}\n" );
}
@@ -309,11 +298,11 @@ public class StreamSimulator implements
com.sun.star.io.XInputStream ,
{
m_xInStream.closeInput();
}
- catch (com.sun.star.io.NotConnectedException exConnect) {
//m_aProtocol.log("\tgot NotConnectedException\n\tfailed\n}\n"); throw
exConnect;
+ catch (com.sun.star.io.NotConnectedException exConnect) {
//m_aProtocol.log("\tgot NotConnectedException\n\tfailed\n}\n"); throw
exConnect;
}
- catch (com.sun.star.io.IOException exIO ) {
//m_aProtocol.log("\tgot IOException\n\tfailed\n}\n" ); throw exIO;
+ catch (com.sun.star.io.IOException exIO ) {
//m_aProtocol.log("\tgot IOException\n\tfailed\n}\n" ); throw exIO;
}
- catch (com.sun.star.uno.RuntimeException exRuntime) {
//m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n" ); throw
exRuntime;
+ catch (com.sun.star.uno.RuntimeException exRuntime) {
//m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n" ); throw
exRuntime;
}
catch (com.sun.star.uno.Exception exUno ) {
//m_aProtocol.log("\tgot Exception\n\tfailed\n}\n" );
}
@@ -345,13 +334,13 @@ public class StreamSimulator implements
com.sun.star.io.XInputStream ,
{
m_xOutStream.writeBytes(lData);
}
- catch (com.sun.star.io.NotConnectedException exConnect) {
//m_aProtocol.log("\tgot NotConnectedException\n\tfailed\n}\n" ); throw
exConnect;
+ catch (com.sun.star.io.NotConnectedException exConnect) {
//m_aProtocol.log("\tgot NotConnectedException\n\tfailed\n}\n" ); throw
exConnect;
}
- catch (com.sun.star.io.BufferSizeExceededException exBuffer ) {
//m_aProtocol.log("\tgot BufferSizeExceededException\n\tfailed\n}\n"); throw
exBuffer;
+ catch (com.sun.star.io.BufferSizeExceededException exBuffer ) {
//m_aProtocol.log("\tgot BufferSizeExceededException\n\tfailed\n}\n"); throw
exBuffer;
}
- catch (com.sun.star.io.IOException exIO ) {
//m_aProtocol.log("\tgot IOException\n\tfailed\n}\n" ); throw
exIO;
+ catch (com.sun.star.io.IOException exIO ) {
//m_aProtocol.log("\tgot IOException\n\tfailed\n}\n" ); throw
exIO;
}
- catch (com.sun.star.uno.RuntimeException exRuntime) {
//m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n" ); throw
exRuntime;
+ catch (com.sun.star.uno.RuntimeException exRuntime) {
//m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n" ); throw
exRuntime;
}
catch (com.sun.star.uno.Exception exUno ) {
//m_aProtocol.log("\tgot Exception\n\tfailed\n}\n" );
}
@@ -378,13 +367,13 @@ public class StreamSimulator implements
com.sun.star.io.XInputStream ,
{
m_xOutStream.flush();
}
- catch (com.sun.star.io.NotConnectedException exConnect) {
//m_aProtocol.log("\tgot NotConnectedException\n\tfailed\n}\n" ); throw
exConnect;
+ catch (com.sun.star.io.NotConnectedException exConnect) {
//m_aProtocol.log("\tgot NotConnectedException\n\tfailed\n}\n" ); throw
exConnect;
}
- catch (com.sun.star.io.BufferSizeExceededException exBuffer ) {
//m_aProtocol.log("\tgot BufferSizeExceededException\n\tfailed\n}\n"); throw
exBuffer;
+ catch (com.sun.star.io.BufferSizeExceededException exBuffer ) {
//m_aProtocol.log("\tgot BufferSizeExceededException\n\tfailed\n}\n"); throw
exBuffer;
}
- catch (com.sun.star.io.IOException exIO ) {
//m_aProtocol.log("\tgot IOException\n\tfailed\n}\n" ); throw
exIO;
+ catch (com.sun.star.io.IOException exIO ) {
//m_aProtocol.log("\tgot IOException\n\tfailed\n}\n" ); throw
exIO;
}
- catch (com.sun.star.uno.RuntimeException exRuntime) {
//m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n" ); throw
exRuntime;
+ catch (com.sun.star.uno.RuntimeException exRuntime) {
//m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n" ); throw
exRuntime;
}
catch (com.sun.star.uno.Exception exUno ) {
//m_aProtocol.log("\tgot Exception\n\tfailed\n}\n" );
}
@@ -410,13 +399,13 @@ public class StreamSimulator implements
com.sun.star.io.XInputStream ,
{
m_xOutStream.closeOutput();
}
- catch (com.sun.star.io.NotConnectedException exConnect) {
//m_aProtocol.log("\tgot NotConnectedException\n\tfailed\n}\n" ); throw
exConnect;
+ catch (com.sun.star.io.NotConnectedException exConnect) {
//m_aProtocol.log("\tgot NotConnectedException\n\tfailed\n}\n" ); throw
exConnect;
}
- catch (com.sun.star.io.BufferSizeExceededException exBuffer ) {
//m_aProtocol.log("\tgot BufferSizeExceededException\n\tfailed\n}\n"); throw
exBuffer;
+ catch (com.sun.star.io.BufferSizeExceededException exBuffer ) {
//m_aProtocol.log("\tgot BufferSizeExceededException\n\tfailed\n}\n"); throw
exBuffer;
}
- catch (com.sun.star.io.IOException exIO ) {
//m_aProtocol.log("\tgot IOException\n\tfailed\n}\n" ); throw
exIO;
+ catch (com.sun.star.io.IOException exIO ) {
//m_aProtocol.log("\tgot IOException\n\tfailed\n}\n" ); throw
exIO;
}
- catch (com.sun.star.uno.RuntimeException exRuntime) {
//m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n" ); throw
exRuntime;
+ catch (com.sun.star.uno.RuntimeException exRuntime) {
//m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n" ); throw
exRuntime;
}
catch (com.sun.star.uno.Exception exUno ) {
//m_aProtocol.log("\tgot Exception\n\tfailed\n}\n" );
}
@@ -454,11 +443,11 @@ public class StreamSimulator implements
com.sun.star.io.XInputStream ,
{
m_xSeek.seek(nLocation);
}
- catch (com.sun.star.lang.IllegalArgumentException exArg ) {
//m_aProtocol.log("\tgot IllegalArgumentException\n\tfailed\n}\n" ); throw
exArg;
+ catch (com.sun.star.lang.IllegalArgumentException exArg ) {
//m_aProtocol.log("\tgot IllegalArgumentException\n\tfailed\n}\n" ); throw
exArg;
}
- catch (com.sun.star.io.IOException exIO ) {
//m_aProtocol.log("\tgot IOException\n\tfailed\n}\n" ); throw exIO;
+ catch (com.sun.star.io.IOException exIO ) {
//m_aProtocol.log("\tgot IOException\n\tfailed\n}\n" ); throw
exIO;
}
- catch (com.sun.star.uno.RuntimeException exRuntime) {
//m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n" ); throw
exRuntime;
+ catch (com.sun.star.uno.RuntimeException exRuntime) {
//m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n" ); throw
exRuntime;
}
catch (com.sun.star.uno.Exception exUno ) {
//m_aProtocol.log("\tgot Exception\n\tfailed\n}\n" );
}
@@ -491,9 +480,9 @@ public class StreamSimulator implements
com.sun.star.io.XInputStream ,
{
nPos = m_xSeek.getPosition();
}
- catch (com.sun.star.io.IOException exIO ) {
//m_aProtocol.log("\tgot IOException\n\tfailed\n}\n" ); throw exIO;
+ catch (com.sun.star.io.IOException exIO ) {
//m_aProtocol.log("\tgot IOException\n\tfailed\n}\n" ); throw exIO;
}
- catch (com.sun.star.uno.RuntimeException exRuntime) {
//m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n"); throw exRuntime;
+ catch (com.sun.star.uno.RuntimeException exRuntime) {
//m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n"); throw exRuntime;
}
catch (com.sun.star.uno.Exception exUno ) {
//m_aProtocol.log("\tgot Exception\n\tfailed\n}\n" );
}
@@ -527,9 +516,9 @@ public class StreamSimulator implements
com.sun.star.io.XInputStream ,
{
nLen = m_xSeek.getLength();
}
- catch (com.sun.star.io.IOException exIO ) {
//m_aProtocol.log("\tgot IOException\n\tfailed\n}\n" ); throw exIO;
+ catch (com.sun.star.io.IOException exIO ) {
//m_aProtocol.log("\tgot IOException\n\tfailed\n}\n" ); throw exIO;
}
- catch (com.sun.star.uno.RuntimeException exRuntime) {
//m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n"); throw exRuntime;
+ catch (com.sun.star.uno.RuntimeException exRuntime) {
//m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n"); throw exRuntime;
}
catch (com.sun.star.uno.Exception exUno ) {
//m_aProtocol.log("\tgot Exception\n\tfailed\n}\n" );
}
diff --git a/main/qadevOOo/tests/java/ifc/i18n/_XCalendar.java
b/main/qadevOOo/tests/java/ifc/i18n/_XCalendar.java
index fefa553f25..6c3acd102a 100644
--- a/main/qadevOOo/tests/java/ifc/i18n/_XCalendar.java
+++ b/main/qadevOOo/tests/java/ifc/i18n/_XCalendar.java
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you 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.
- *
+ *
*************************************************************/
@@ -89,13 +89,8 @@ public class _XCalendar extends MultiMethodTest {
count = new int[installed_locales.length];
oObj.loadDefaultCalendar(installed_locales[0]);
aOriginalDTime = oObj.getDateTime();
-<<<<<<< HEAD:main/qadevOOo/tests/java/ifc/i18n/_XCalendar.java
debug = tParam.getBool("DebugIsActive");
-=======
-
- debug = false;
->>>>>>> 3309286857 (pre-commit auto remove trailing whitespace from java files
(#382)):test/testuno/source/api/i18n/XCalendarTest.java
}
/**
@@ -106,7 +101,7 @@ public class _XCalendar extends MultiMethodTest {
oObj.loadDefaultCalendar(installed_locales[0]);
oObj.setDateTime(aOriginalDTime);
}
-
+
/**
* Loads default calendar for different locales. <p>
* Has <b> OK </b> status if method loads calendar, that is
@@ -321,15 +316,15 @@ public class _XCalendar extends MultiMethodTest {
CalendarFieldIndex.MONTH
};
for (int k=0; k<fields.length;k++) {
-
+
oObj.setDateTime(0.0);
-
+
// save the current values for debug purposes
short[] oldValues = new short[fields.length];
for (int n=0; n < oldValues.length; n++){
oldValues[n] = oObj.getValue(fields[n]);
}
-
+
short set = oObj.getValue(fields[k]);
if (fields[k] == CalendarFieldIndex.MONTH) set = newValue;
oObj.setValue(fields[k],set);
@@ -345,7 +340,7 @@ public class _XCalendar extends MultiMethodTest {
for (int n=0; n < fields.length;n++){
log.println(names[n] + ":" +
oObj.getValue(fields[n]));
}
-
+
error += "failed for "+names[k]+" expected "+
set+" gained "+get+" ; \n";
}
diff --git a/main/qadevOOo/tests/java/ifc/i18n/_XExtendedCalendar.java
b/main/qadevOOo/tests/java/ifc/i18n/_XExtendedCalendar.java
index df16b07eaf..34f5b56603 100644
--- a/main/qadevOOo/tests/java/ifc/i18n/_XExtendedCalendar.java
+++ b/main/qadevOOo/tests/java/ifc/i18n/_XExtendedCalendar.java
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you 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.
- *
+ *
*************************************************************/
@@ -60,7 +60,7 @@ public class _XExtendedCalendar extends MultiMethodTest {
Locale lo = installed_locales[0];
for (int i=0; i<installed_locales.length; i++) {
// search for "en" and "US"
- if (installed_locales[i].Language.equals("en") &&
+ if (installed_locales[i].Language.equals("en") &&
installed_locales[i].Country.equals("US")) {
lo = installed_locales[i];
useUSENLocale = true;
@@ -69,13 +69,8 @@ public class _XExtendedCalendar extends MultiMethodTest {
log.println("Choose Locale: '" + lo.Language + "', '" + lo.Country +
"'");
oObj.loadDefaultCalendar(lo);
}
-<<<<<<< HEAD:main/qadevOOo/tests/java/ifc/i18n/_XExtendedCalendar.java
-=======
-
- @Test
->>>>>>> 3309286857 (pre-commit auto remove trailing whitespace from java files
(#382)):test/testuno/source/api/i18n/XExtendedCalendarTest.java
public void _getDisplayString() {
// against regression: the current state is the right one.
boolean result = true;
@@ -84,13 +79,13 @@ public class _XExtendedCalendar extends MultiMethodTest {
String[] expectedStringResult = new String[6];
Calendar cal = new GregorianCalendar();
Date actualDate = cal.getTime();
-
+
SimpleDateFormat sdf = getSDF("yy");
expectedStringResult[0] = "AD" + sdf.format(actualDate);
-
+
sdf = getSDF("yyyy");
expectedStringResult[1] = "AD" + sdf.format(actualDate);
-
+
sdf = getSDF("MM");
expectedStringResult[2] = sdf.format(actualDate);
@@ -102,44 +97,36 @@ public class _XExtendedCalendar extends MultiMethodTest {
else if (month > 10 && month < 13) {quarter = "Q4"; longQuarter = "4th
quarter"; }
expectedStringResult[3] = quarter;
expectedStringResult[4] = longQuarter;
-
+
sdf = getSDF("MMMM");
expectedStringResult[5] = sdf.format(actualDate);
-
+
displayString[0] =
oObj.getDisplayString(CalendarDisplayCode.SHORT_YEAR_AND_ERA,
NativeNumberMode.NATNUM0);
displayString[1] =
oObj.getDisplayString(CalendarDisplayCode.LONG_YEAR_AND_ERA,
NativeNumberMode.NATNUM0);
displayString[2] =
oObj.getDisplayString(CalendarDisplayCode.LONG_MONTH, NativeNumberMode.NATNUM0);
displayString[3] =
oObj.getDisplayString(CalendarDisplayCode.SHORT_QUARTER,
NativeNumberMode.NATNUM0);
displayString[4] =
oObj.getDisplayString(CalendarDisplayCode.LONG_QUARTER,
NativeNumberMode.NATNUM0);
displayString[5] =
oObj.getDisplayString(CalendarDisplayCode.LONG_MONTH_NAME,
NativeNumberMode.NATNUM0);
-
+
for (int i=0; i<displayString.length; i++) {
boolean locResult = false;
if (useUSENLocale) {
locResult = displayString[i].equals(expectedStringResult[i]);
if (!locResult)
-<<<<<<< HEAD:main/qadevOOo/tests/java/ifc/i18n/_XExtendedCalendar.java
log.println("getDisplayString() result " + i + ": '" +
displayString[i]
-=======
- System.out.println("getDisplayString() result " + i + ":
'" + displayString[i]
->>>>>>> 3309286857 (pre-commit auto remove trailing whitespace from java files
(#382)):test/testuno/source/api/i18n/XExtendedCalendarTest.java
+ "', expected: '" +
expectedStringResult[i] + "'");
result &= locResult;
}
else { // no defaults for other locales, just expect a String
locResult &= displayString[i] != null;
if (!locResult)
-<<<<<<< HEAD:main/qadevOOo/tests/java/ifc/i18n/_XExtendedCalendar.java
log.println("getDisplayString() result " + i + " was
'null'");
-=======
- System.out.println("getDisplayString() result " + i + "
was 'null'");
->>>>>>> 3309286857 (pre-commit auto remove trailing whitespace from java files
(#382)):test/testuno/source/api/i18n/XExtendedCalendarTest.java
result &= locResult;
}
}
tRes.tested("getDisplayString()", result);
}
-
+
private SimpleDateFormat getSDF(String format){
if (useUSENLocale) return new SimpleDateFormat(format,
java.util.Locale.US);
return new SimpleDateFormat(format);
diff --git
a/main/qadevOOo/tests/java/ifc/i18n/_XExtendedIndexEntrySupplier.java
b/main/qadevOOo/tests/java/ifc/i18n/_XExtendedIndexEntrySupplier.java
index ab92794a88..40214c846a 100644
--- a/main/qadevOOo/tests/java/ifc/i18n/_XExtendedIndexEntrySupplier.java
+++ b/main/qadevOOo/tests/java/ifc/i18n/_XExtendedIndexEntrySupplier.java
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you 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.
- *
+ *
*************************************************************/
@@ -44,13 +44,8 @@ public class _XExtendedIndexEntrySupplier extends
MultiMethodTest {
short result1 = oObj.compareIndexEntry(val1, "", locale, val1, "",
locale);
short result2 = oObj.compareIndexEntry(val1, "", locale, val2, "",
locale);
short result3 = oObj.compareIndexEntry(val2, "", locale, val1, "",
locale);
-<<<<<<<
HEAD:main/qadevOOo/tests/java/ifc/i18n/_XExtendedIndexEntrySupplier.java
tRes.tested("compareIndexEntry()", result1 == 0 && result2 + result3
== 0);
-=======
-
- Assert.assertTrue("compareIndexEntry()", result1 == 0 && result2 +
result3 == 0);
->>>>>>> 3309286857 (pre-commit auto remove trailing whitespace from java files
(#382)):test/testuno/source/api/i18n/XExtendedIndexEntrySupplierTest.java
}
/*
@@ -61,25 +56,21 @@ public class _XExtendedIndexEntrySupplier extends
MultiMethodTest {
requiredMethod("getLocaleList()");
boolean result = true;
- boolean locResult = false;
-
+ boolean locResult = false;
+
for (int i = 0; i < locales.length; i++) {
String[] algNames = oObj.getAlgorithmList(locales[i]);
algorithms.put(new Integer(i), algNames);
locResult = algNames != null && algNames.length > 0;
System.out.println("Locale " + i + ": " +
locales[i].Country+","+locales[i].Language);
-
+
for (int j=0; j<algNames.length; j++) {
System.out.println("\tAlgorithm " + j + ": " + algNames[j]);
}
-
+
if (!locResult) {
-<<<<<<<
HEAD:main/qadevOOo/tests/java/ifc/i18n/_XExtendedIndexEntrySupplier.java
log.println("No Algorithm found for " + locales[i].Country +
-=======
- System.out.println("No Algorithm found for " +
locales[i].Country +
->>>>>>> 3309286857 (pre-commit auto remove trailing whitespace from java files
(#382)):test/testuno/source/api/i18n/XExtendedIndexEntrySupplierTest.java
"," + locales[i].Language);
}
@@ -99,17 +90,10 @@ public class _XExtendedIndexEntrySupplier extends
MultiMethodTest {
for (int j = 0; j < algorithms.size(); j++) {
String[] algs = (String[])algorithms.get(new Integer(j));
for (int k=0;k<algs.length;k++) {
-<<<<<<<
HEAD:main/qadevOOo/tests/java/ifc/i18n/_XExtendedIndexEntrySupplier.java
log.println("\t Algorithm :" +
algs[k]);
oObj.loadAlgorithm(locales[i], algs[k],
CollatorOptions.CollatorOptions_IGNORE_CASE);
log.println("\t\t Get: " +
-=======
- System.out.println("\t Algorithm :" +
- algs[k]);
- oObj.loadAlgorithm(locales[i], algs[k],
CollatorOptions.CollatorOptions_IGNORE_CASE);
- System.out.println("\t\t Get: " +
->>>>>>> 3309286857 (pre-commit auto remove trailing whitespace from java files
(#382)):test/testuno/source/api/i18n/XExtendedIndexEntrySupplierTest.java
oObj.getIndexKey(getIndexFor, "", locales[i]));
}
}
@@ -135,8 +119,8 @@ public class _XExtendedIndexEntrySupplier extends
MultiMethodTest {
boolean res = true;
Locale loc = new Locale("zh", "CN", "");
-
- for (int i = 0;i<UnicodeStringPair.getValCount();i++) {
+
+ for (int i = 0;i<UnicodeStringPair.getValCount();i++) {
char[] c = new char[]{UnicodeStringPair.getUnicodeValue(i)};
@@ -156,8 +140,8 @@ public class _XExtendedIndexEntrySupplier extends
MultiMethodTest {
}
/*
- * loads all algorithms available in all language.
- * Is OK if no exception occurs and the method returns
+ * loads all algorithms available in all language.
+ * Is OK if no exception occurs and the method returns
* true for each valid algorithm and false otherwise
*/
public void _loadAlgorithm() {
@@ -167,17 +151,13 @@ public class _XExtendedIndexEntrySupplier extends
MultiMethodTest {
for (int i = 0; i < algorithms.size(); i++) {
String[] names = (String[]) algorithms.get(new Integer(i));
-<<<<<<<
HEAD:main/qadevOOo/tests/java/ifc/i18n/_XExtendedIndexEntrySupplier.java
log.println("loading algorithms for " + locales[i].Country +
-=======
- System.out.println("loading algorithms for " + locales[i].Country +
->>>>>>> 3309286857 (pre-commit auto remove trailing whitespace from java files
(#382)):test/testuno/source/api/i18n/XExtendedIndexEntrySupplierTest.java
"," + locales[i].Language);
for (int j = 0; j < names.length; j++) {
log.println("\t Loading " + names[j]);
- boolean localres = oObj.loadAlgorithm(locales[i], names[j],
+ boolean localres = oObj.loadAlgorithm(locales[i], names[j],
CollatorOptions.CollatorOptions_IGNORE_CASE);
if (!localres) {
@@ -191,7 +171,7 @@ public class _XExtendedIndexEntrySupplier extends
MultiMethodTest {
/* log.println("\tTrying to load 'dummy' algorithm");
- boolean localres = !oObj.loadAlgorithm(locales[i], "dummy",
+ boolean localres = !oObj.loadAlgorithm(locales[i], "dummy",
CollatorOptions.CollatorOptions_IGNORE_WIDTH);
if (!localres) {
@@ -207,7 +187,7 @@ public class _XExtendedIndexEntrySupplier extends
MultiMethodTest {
}
/*
- * checks the method usePhoneticEntry(). Only the languages ja, ko and zh
+ * checks the method usePhoneticEntry(). Only the languages ja, ko and zh
* should return true. Has OK state if exactly this is the case.
*/
public void _usePhoneticEntry() {
@@ -218,8 +198,8 @@ public class _XExtendedIndexEntrySupplier extends
MultiMethodTest {
for (int i = 0; i < locales.length; i++) {
boolean expected = false;
- if (locales[i].Language.equals("ja") ||
- locales[i].Language.equals("ko") ||
+ if (locales[i].Language.equals("ja") ||
+ locales[i].Language.equals("ko") ||
locales[i].Language.equals("zh")) {
expected = true;
}
@@ -237,7 +217,7 @@ public class _XExtendedIndexEntrySupplier extends
MultiMethodTest {
tRes.tested("usePhoneticEntry()", res);
}
-
+
/**
* Helper class to handle the phonetic equivalence of unicode characters
* This class delivers an amount of unicode characters and the equivalent
phonetics
@@ -247,27 +227,27 @@ public class _XExtendedIndexEntrySupplier extends
MultiMethodTest {
final static int valCount = 78;
static String[] sStringEquivalence = null;
static char[] iUnicodeEquivalence = null;
-
+
static {
sStringEquivalence = new String[valCount];
iUnicodeEquivalence = new char[valCount];
fillValues();
}
-
+
public static int getValCount() {
return valCount;
}
-
+
public static String getExpectedPhoneticString(int index) {
if (index >= valCount) return null;
return sStringEquivalence[index];
}
-
+
public static char getUnicodeValue(int index) {
if (index > valCount) return 0;
return iUnicodeEquivalence[index];
}
-
+
private static void fillValues() {
iUnicodeEquivalence[0] = 20049; sStringEquivalence[0] = "zhong";
iUnicodeEquivalence[1] = 19968; sStringEquivalence[1] = "yi";
