summaryrefslogtreecommitdiffstats
path: root/comphelper/qa/complex/comphelper
diff options
context:
space:
mode:
Diffstat (limited to 'comphelper/qa/complex/comphelper')
-rw-r--r--comphelper/qa/complex/comphelper/Map.java12
-rw-r--r--comphelper/qa/complex/comphelper/SequenceOutputStreamUnitTest.java132
2 files changed, 6 insertions, 138 deletions
diff --git a/comphelper/qa/complex/comphelper/Map.java b/comphelper/qa/complex/comphelper/Map.java
index d01d1bef362b..51f731732071 100644
--- a/comphelper/qa/complex/comphelper/Map.java
+++ b/comphelper/qa/complex/comphelper/Map.java
@@ -461,23 +461,23 @@ public class Map
@Test public void testSpecialValues() throws com.sun.star.uno.Exception
{
- final Double[] keys = new Double[] { new Double( 0 ), Double.POSITIVE_INFINITY, Double.NEGATIVE_INFINITY };
- final Double[] values = new Double[] { Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY, new Double( 0 ) };
+ final Double[] keys = new Double[] { Double.valueOf( 0 ), Double.POSITIVE_INFINITY, Double.NEGATIVE_INFINITY };
+ final Double[] values = new Double[] { Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY, Double.valueOf( 0 ) };
XEnumerableMap map = com.sun.star.container.EnumerableMap.create( connection.getComponentContext(), new Type( Double.class ), new Type( Double.class ) );
impl_putAll( map, keys, values );
assertTrue( "containsKey( Double.+INF failed", map.containsKey( Double.POSITIVE_INFINITY ) );
assertTrue( "containsKey( Double.-INF failed", map.containsKey( Double.NEGATIVE_INFINITY ) );
- assertTrue( "containsKey( 0 ) failed", map.containsKey( new Double( 0 ) ) );
+ assertTrue( "containsKey( 0 ) failed", map.containsKey( Double.valueOf( 0 ) ) );
assertTrue( "containsValue( Double.+INF ) failed", map.containsValue( Double.POSITIVE_INFINITY ) );
assertTrue( "containsValue( Double.-INF ) failed", map.containsValue( Double.NEGATIVE_INFINITY ) );
- assertTrue( "containsValue( 0 ) failed", map.containsValue( new Double( 0 ) ) );
+ assertTrue( "containsValue( 0 ) failed", map.containsValue( Double.valueOf( 0 ) ) );
// put and containsKey should reject Double.NaN as key
//? assureException( "Double.NaN should not be allowed as key in a call to 'put'", map, "put",
-//? new Class[] { Object.class, Object.class }, new Object[] { Double.NaN, new Double( 0 ) },
+//? new Class[] { Object.class, Object.class }, new Object[] { Double.NaN, Double.valueOf( 0 ) },
//? com.sun.star.lang.IllegalArgumentException.class );
//? assureException( "Double.NaN should not be allowed as key in a call to 'containsKey'", map, "containsKey",
//? new Class[] { Object.class }, new Object[] { Double.NaN },
@@ -485,7 +485,7 @@ public class Map
// ditto for put and containsValue
//? assureException( "Double.NaN should not be allowed as value in a call to 'put'", map, "put",
-//? new Class[] { Object.class, Object.class }, new Object[] { new Double( 0 ), Double.NaN },
+//? new Class[] { Object.class, Object.class }, new Object[] { Double.valueOf( 0 ), Double.NaN },
//? com.sun.star.lang.IllegalArgumentException.class );
//? assureException( "Double.NaN should not be allowed as key in a call to 'containsValue'", map, "containsValue",
//? new Class[] { Object.class }, new Object[] { Double.NaN },
diff --git a/comphelper/qa/complex/comphelper/SequenceOutputStreamUnitTest.java b/comphelper/qa/complex/comphelper/SequenceOutputStreamUnitTest.java
deleted file mode 100644
index 03906134b9f7..000000000000
--- a/comphelper/qa/complex/comphelper/SequenceOutputStreamUnitTest.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * 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 regarding copyright
- * ownership. The ASF licenses this file 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 .
- */
-package complex.comphelper;
-
-import com.sun.star.lang.XMultiServiceFactory;
-import com.sun.star.uno.UnoRuntime;
-
-import com.sun.star.io.XSequenceOutputStream;
-import com.sun.star.io.XSeekableInputStream;
-
-import java.util.Random;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.openoffice.test.OfficeConnection;
-import static org.junit.Assert.*;
-
-/* Document.
- */
-
-public class SequenceOutputStreamUnitTest
-{
- private XMultiServiceFactory m_xMSF = null;
-
- @Before public void before() {
- try {
- m_xMSF = getMSF();
- } catch (Exception e) {
- fail ("Cannot create service factory!");
- }
- if (m_xMSF==null) {
- fail ("Cannot create service factory!");
- }
- }
-
- @After public void after() {
- m_xMSF = null;
- }
-
- @Test public void test () {
- try {
- final int nBytesCnt = 20;
-
- //create SequenceOutputStream
- Object oSequenceOutputStream = m_xMSF.createInstance (
- "com.sun.star.io.SequenceOutputStream" );
- XSequenceOutputStream xSeqOutStream =
- UnoRuntime.queryInterface (
- XSequenceOutputStream.class, oSequenceOutputStream );
-
- //write something to the stream
- byte pBytesOriginal[] = new byte [nBytesCnt];
- Random oRandom = new Random();
- oRandom.nextBytes (pBytesOriginal);
- xSeqOutStream.writeBytes (pBytesOriginal);
-
- // Append the same content once again
- xSeqOutStream.writeBytes (pBytesOriginal);
-
- byte pBytesWritten[] = xSeqOutStream.getWrittenBytes ();
- assertTrue( "SequenceOutputStream::getWrittenBytes() - wrong amount of bytes returned",
- pBytesWritten.length == nBytesCnt * 2 );
-
- //create SequenceInputstream
- Object pArgs[] = new Object[1];
- pArgs[0] = pBytesWritten;
- Object oSequenceInputStream = m_xMSF.createInstanceWithArguments (
- "com.sun.star.io.SequenceInputStream", pArgs );
- XSeekableInputStream xSeekableInStream =
- UnoRuntime.queryInterface (
- XSeekableInputStream.class, oSequenceInputStream );
-
- //read from the stream
- byte pBytesRead[][] = new byte [1][nBytesCnt*2];
- int nBytesCountRead = xSeekableInStream.readBytes ( pBytesRead, pBytesRead[0].length + 1 );
-
- assertTrue( "SequenceInputStream::readBytes() - wrong amount of bytes returned " + pBytesRead[0].length + " vs " + (nBytesCountRead),
- pBytesRead[0].length == nBytesCountRead);
-
- //close the streams
- xSeqOutStream.closeOutput ();
- xSeekableInStream.closeInput ();
-
- //compare the original, written and read arrays
- for ( int i = 0; i < nBytesCnt * 2; ++i ) {
- assertTrue( "Written array not identical to original array. Position: " + i,
- pBytesOriginal[i % nBytesCnt] == pBytesWritten[i] );
- assertTrue( "Read array not identical to original array. Position: " + i,
- pBytesOriginal[i % nBytesCnt] == pBytesRead[0][i] );
- }
- } catch ( Exception e ) {
- fail ( "Exception: " + e );
- }
- }
-
- private static XMultiServiceFactory getMSF()
- {
- return UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
- }
-
- // setup and close connections
- @BeforeClass public static void setUpConnection() throws Exception {
- System.out.println("setUpConnection()");
- connection.setUp();
- }
-
- @AfterClass public static void tearDownConnection()
- throws InterruptedException, com.sun.star.uno.Exception
- {
- System.out.println("tearDownConnection()");
- connection.tearDown();
- }
-
- private static final OfficeConnection connection = new OfficeConnection();
-}