[Libreoffice-commits] core.git: unotools/JunitTest_unotools_complex.mk unotools/qa

Noel Grandin noel at peralex.com
Wed Dec 10 00:04:42 PST 2014


 unotools/JunitTest_unotools_complex.mk             |    1 
 unotools/qa/complex/tempfile/TempFileTest.java     |   22 ---------------------
 unotools/qa/complex/tempfile/TempFileUnitTest.java |    7 +-----
 unotools/qa/complex/tempfile/Test01.java           |    2 -
 unotools/qa/complex/tempfile/Test02.java           |    2 -
 5 files changed, 4 insertions(+), 30 deletions(-)

New commits:
commit 3e7f9e3a8fbb1a556c76d8be181de259793c4560
Author: Noel Grandin <noel at peralex.com>
Date:   Tue Dec 9 14:59:10 2014 +0200

    java: the TempFileTest interface is unnecessary
    
    Change-Id: Ic49f95117b54929f95984aff0f69e47b90daee7c
    Reviewed-on: https://gerrit.libreoffice.org/13404
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
    Tested-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/unotools/JunitTest_unotools_complex.mk b/unotools/JunitTest_unotools_complex.mk
index cbba725..b7a02f9 100644
--- a/unotools/JunitTest_unotools_complex.mk
+++ b/unotools/JunitTest_unotools_complex.mk
@@ -27,7 +27,6 @@ $(eval $(call gb_JunitTest_add_classes,unotools_complex,\
 ))
 
 $(eval $(call gb_JunitTest_add_sourcefiles,unotools_complex,\
-    unotools/qa/complex/tempfile/TempFileTest \
     unotools/qa/complex/tempfile/TempFileUnitTest \
     unotools/qa/complex/tempfile/Test01 \
     unotools/qa/complex/tempfile/Test02 \
diff --git a/unotools/qa/complex/tempfile/TempFileTest.java b/unotools/qa/complex/tempfile/TempFileTest.java
deleted file mode 100644
index 5a66da7..0000000
--- a/unotools/qa/complex/tempfile/TempFileTest.java
+++ /dev/null
@@ -1,22 +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.tempfile;
-
-public interface TempFileTest {
-    boolean test();
-}
diff --git a/unotools/qa/complex/tempfile/TempFileUnitTest.java b/unotools/qa/complex/tempfile/TempFileUnitTest.java
index 7c3034d..94f8975 100644
--- a/unotools/qa/complex/tempfile/TempFileUnitTest.java
+++ b/unotools/qa/complex/tempfile/TempFileUnitTest.java
@@ -29,9 +29,6 @@ import org.junit.Test;
 import org.openoffice.test.OfficeConnection;
 import static org.junit.Assert.*;
 
-/* Document.
- */
-
 public class TempFileUnitTest /* extends ComplexTestCase */ {
     private XMultiServiceFactory m_xMSF = null;
     private XSimpleFileAccess m_xSFA = null;
@@ -61,12 +58,12 @@ public class TempFileUnitTest /* extends ComplexTestCase */ {
     }
 
     @Test public void ExecuteTest01() {
-        TempFileTest aTest = new Test01( m_xMSF, m_xSFA );
+        Test01 aTest = new Test01( m_xMSF, m_xSFA );
         assertTrue( "Test01 failed!", aTest.test() );
     }
 
     @Test public void ExecuteTest02() {
-        TempFileTest aTest = new Test02( m_xMSF, m_xSFA );
+        Test02 aTest = new Test02( m_xMSF, m_xSFA );
         assertTrue( "Test02 failed!", aTest.test() );
     }
 
diff --git a/unotools/qa/complex/tempfile/Test01.java b/unotools/qa/complex/tempfile/Test01.java
index ae4d80d..b64c3e2 100644
--- a/unotools/qa/complex/tempfile/Test01.java
+++ b/unotools/qa/complex/tempfile/Test01.java
@@ -25,7 +25,7 @@ import java.util.Random;
 
 import share.LogWriter;
 
-public class Test01 implements TempFileTest {
+public class Test01 {
     LogWriter m_aLogWriter;
     XMultiServiceFactory m_xMSF = null;
     XSimpleFileAccess m_xSFA = null;
diff --git a/unotools/qa/complex/tempfile/Test02.java b/unotools/qa/complex/tempfile/Test02.java
index b1c0f70..29855d4 100644
--- a/unotools/qa/complex/tempfile/Test02.java
+++ b/unotools/qa/complex/tempfile/Test02.java
@@ -25,7 +25,7 @@ import com.sun.star.io.*;
 import com.sun.star.uno.UnoRuntime;
 import java.util.Random;
 
-public class Test02 implements TempFileTest {
+public class Test02 {
 
     XMultiServiceFactory m_xMSF;
     XSimpleFileAccess m_xSFA;


More information about the Libreoffice-commits mailing list