qadevOOo/Jar_OOoRunner.mk | 82 qadevOOo/Jar_OOoRunnerLight.mk | 82 qadevOOo/runner/base/java_cmp.java | 74 qadevOOo/runner/complexlib/Assurance.java | 37 qadevOOo/runner/complexlib/MethodThread.java | 13 qadevOOo/runner/convwatch/BorderRemover.java | 261 -- qadevOOo/runner/convwatch/BuildID.java | 127 - qadevOOo/runner/convwatch/ConvWatch.java | 372 --- qadevOOo/runner/convwatch/ConvWatchCancelException.java | 32 qadevOOo/runner/convwatch/ConvWatchException.java | 33 qadevOOo/runner/convwatch/ConvWatchStarter.java | 387 --- qadevOOo/runner/convwatch/CrashLoopTest.java | 50 qadevOOo/runner/convwatch/DB.java | 254 -- qadevOOo/runner/convwatch/DBHelper.java | 29 qadevOOo/runner/convwatch/DateHelper.java | 48 qadevOOo/runner/convwatch/DirectoryHelper.java | 125 - qadevOOo/runner/convwatch/DocumentConverter.java | 242 -- qadevOOo/runner/convwatch/EnhancedComplexTestCase.java | 101 qadevOOo/runner/convwatch/FileHelper.java | 342 -- qadevOOo/runner/convwatch/FilenameHelper.java | 364 --- qadevOOo/runner/convwatch/GfxCompare.java | 177 - qadevOOo/runner/convwatch/GlobalLogWriter.java | 5 qadevOOo/runner/convwatch/GraphicalDifferenceCheck.java | 339 -- qadevOOo/runner/convwatch/GraphicalTestArguments.java | 682 ----- qadevOOo/runner/convwatch/HTMLOutputter.java | 178 - qadevOOo/runner/convwatch/INIOutputter.java | 190 - qadevOOo/runner/convwatch/ImageHelper.java | 98 qadevOOo/runner/convwatch/IniFile.java | 238 -- qadevOOo/runner/convwatch/LISTOutputter.java | 85 qadevOOo/runner/convwatch/MSOfficePrint.java | 867 ------- qadevOOo/runner/convwatch/NameHelper.java | 80 qadevOOo/runner/convwatch/OfficePrint.java | 1162 ---------- qadevOOo/runner/convwatch/PRNCompare.java | 504 ---- qadevOOo/runner/convwatch/PerformanceContainer.java | 221 - qadevOOo/runner/convwatch/PixelCounter.java | 138 - qadevOOo/runner/convwatch/PropertyName.java | 58 qadevOOo/runner/convwatch/ReferenceBuilder.java | 257 -- qadevOOo/runner/convwatch/ReportDesignerTest.java | 535 ---- qadevOOo/runner/convwatch/SimpleFileSemaphore.java | 180 - qadevOOo/runner/convwatch/StatusHelper.java | 88 qadevOOo/runner/convwatch/TimeHelper.java | 35 qadevOOo/runner/convwatch/TriState.java | 68 qadevOOo/runner/convwatch/ValueNotFoundException.java | 27 qadevOOo/runner/graphical/BuildID.java | 143 - qadevOOo/runner/graphical/DateHelper.java | 48 qadevOOo/runner/graphical/DirectoryHelper.java | 126 - qadevOOo/runner/graphical/EnhancedComplexTestCase.java | 454 --- qadevOOo/runner/graphical/FileHelper.java | 503 ---- qadevOOo/runner/graphical/GlobalLogWriter.java | 54 qadevOOo/runner/graphical/GraphicalComparator.java | 37 qadevOOo/runner/graphical/HTMLResult.java | 190 - qadevOOo/runner/graphical/IOffice.java | 43 qadevOOo/runner/graphical/ImageHelper.java | 102 qadevOOo/runner/graphical/IniFile.java | 544 ---- qadevOOo/runner/graphical/JPEGComparator.java | 653 ----- qadevOOo/runner/graphical/JPEGCreator.java | 356 --- qadevOOo/runner/graphical/JPEGEvaluator.java | 59 qadevOOo/runner/graphical/MSOfficePostscriptCreator.java | 686 ----- qadevOOo/runner/graphical/Office.java | 148 - qadevOOo/runner/graphical/OfficeException.java | 36 qadevOOo/runner/graphical/OpenOfficeDatabaseReportExtractor.java | 384 --- qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java | 631 ----- qadevOOo/runner/graphical/ParameterHelper.java | 347 -- qadevOOo/runner/graphical/PerformanceContainer.java | 237 -- qadevOOo/runner/graphical/PixelCounter.java | 155 - qadevOOo/runner/graphical/PostscriptCreator.java | 78 qadevOOo/runner/graphical/PropertyName.java | 39 qadevOOo/runner/graphical/TimeHelper.java | 68 qadevOOo/runner/graphical/Tolerance.java | 32 qadevOOo/runner/graphical/WrongEnvironmentException.java | 31 qadevOOo/runner/graphical/WrongSuffixException.java | 27 qadevOOo/runner/helper/ConfigurationRead.java | 16 qadevOOo/runner/helper/InetTools.java | 79 qadevOOo/runner/helper/OSHelper.java | 5 qadevOOo/runner/helper/ObjectInspectorModelImpl.java | 133 - qadevOOo/runner/helper/ProcessHandler.java | 134 - qadevOOo/runner/helper/PropertyHelper.java | 45 qadevOOo/runner/helper/SimpleMailSender.java | 162 - qadevOOo/runner/lib/MultiMethodTest.java | 10 qadevOOo/runner/lib/Parameters.java | 164 - qadevOOo/runner/lib/SimpleStatus.java | 7 qadevOOo/runner/lib/Status.java | 31 qadevOOo/runner/lib/TestResult.java | 8 qadevOOo/runner/share/ComplexTest.java | 2 qadevOOo/runner/share/LogWriter.java | 7 qadevOOo/runner/stats/ComplexDataBaseOutProducer.java | 172 - qadevOOo/runner/stats/DataBaseOutProducer.java | 183 - qadevOOo/runner/stats/FatDataBaseOutProducer.java | 135 - qadevOOo/runner/stats/FileLogWriter.java | 140 - qadevOOo/runner/stats/InternalLogWriter.java | 4 qadevOOo/runner/stats/SQLExecution.java | 332 -- qadevOOo/runner/stats/SimpleFileOutProducer.java | 109 qadevOOo/runner/stats/SimpleLogWriter.java | 4 qadevOOo/runner/stats/SimpleOutProducer.java | 4 qadevOOo/runner/util/BasicMacroTools.java | 218 - qadevOOo/runner/util/BookmarkDsc.java | 5 qadevOOo/runner/util/ControlDsc.java | 75 qadevOOo/runner/util/FootnoteDsc.java | 5 qadevOOo/runner/util/FrameDsc.java | 6 qadevOOo/runner/util/InstDescr.java | 6 qadevOOo/runner/util/ParagraphDsc.java | 5 qadevOOo/runner/util/ReferenceMarkDsc.java | 79 qadevOOo/runner/util/StyleFamilyDsc.java | 75 qadevOOo/runner/util/TableDsc.java | 6 qadevOOo/runner/util/TextSectionDsc.java | 5 qadevOOo/runner/util/UITools.java | 20 qadevOOo/runner/util/ValueChanger.java | 2 qadevOOo/runner/util/XMLTools.java | 60 qadevOOo/runner/util/compare/DocComparator.java | 31 qadevOOo/runner/util/compare/DocComparatorFactory.java | 47 qadevOOo/runner/util/compare/GraphicalComparator.java | 236 -- qadevOOo/runner/util/compare/PDFComparator.java | 38 qadevOOo/runner/util/db/DatabaseDocument.java | 5 qadevOOo/runner/util/utils.java | 19 114 files changed, 3 insertions(+), 18304 deletions(-)
New commits: commit 117a82cd090ddd8efbc500350dc6082730f04720 Author: Noel Grandin <n...@peralex.com> Date: Thu Dec 11 16:25:29 2014 +0200 java: remove dead code in qadevOOo found by running UCDetector over the code many times, like peeling an onion Change-Id: I54d5147eb1b5c921ad236331bc4c1f765b13ca83 Reviewed-on: https://gerrit.libreoffice.org/13445 Reviewed-by: Noel Grandin <noelgran...@gmail.com> Tested-by: Noel Grandin <noelgran...@gmail.com> diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk index 1dd5fbe..a39f64e 100644 --- a/qadevOOo/Jar_OOoRunner.mk +++ b/qadevOOo/Jar_OOoRunner.mk @@ -45,7 +45,6 @@ $(eval $(call gb_Jar_set_packageroot,OOoRunner,\ )) $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\ - qadevOOo/runner/base/java_cmp \ qadevOOo/runner/base/java_complex \ qadevOOo/runner/base/java_fat \ qadevOOo/runner/base/java_fat_service \ @@ -54,72 +53,10 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\ qadevOOo/runner/complexlib/ComplexTestCase \ qadevOOo/runner/complexlib/MethodThread \ qadevOOo/runner/complexlib/ShowTargets \ - qadevOOo/runner/convwatch/BorderRemover \ - qadevOOo/runner/convwatch/BuildID \ - qadevOOo/runner/convwatch/ConvWatch \ - qadevOOo/runner/convwatch/ConvWatchCancelException \ - qadevOOo/runner/convwatch/ConvWatchException \ - qadevOOo/runner/convwatch/ConvWatchStarter \ - qadevOOo/runner/convwatch/CrashLoopTest \ - qadevOOo/runner/convwatch/DateHelper \ qadevOOo/runner/convwatch/DB \ qadevOOo/runner/convwatch/DBHelper \ - qadevOOo/runner/convwatch/DirectoryHelper \ - qadevOOo/runner/convwatch/DocumentConverter \ - qadevOOo/runner/convwatch/EnhancedComplexTestCase \ - qadevOOo/runner/convwatch/FileHelper \ - qadevOOo/runner/convwatch/FilenameHelper \ - qadevOOo/runner/convwatch/GfxCompare \ qadevOOo/runner/convwatch/GlobalLogWriter \ - qadevOOo/runner/convwatch/GraphicalDifferenceCheck \ - qadevOOo/runner/convwatch/GraphicalTestArguments \ - qadevOOo/runner/convwatch/HTMLOutputter \ - qadevOOo/runner/convwatch/ImageHelper \ - qadevOOo/runner/convwatch/IniFile \ - qadevOOo/runner/convwatch/INIOutputter \ - qadevOOo/runner/convwatch/LISTOutputter \ - qadevOOo/runner/convwatch/MSOfficePrint \ - qadevOOo/runner/convwatch/NameHelper \ - qadevOOo/runner/convwatch/OfficePrint \ - qadevOOo/runner/convwatch/PerformanceContainer \ - qadevOOo/runner/convwatch/PixelCounter \ - qadevOOo/runner/convwatch/PRNCompare \ - qadevOOo/runner/convwatch/PropertyName \ - qadevOOo/runner/convwatch/ReferenceBuilder \ - qadevOOo/runner/convwatch/ReportDesignerTest \ - qadevOOo/runner/convwatch/SimpleFileSemaphore \ - qadevOOo/runner/convwatch/StatusHelper \ - qadevOOo/runner/convwatch/TimeHelper \ - qadevOOo/runner/convwatch/TriState \ - qadevOOo/runner/convwatch/ValueNotFoundException \ - qadevOOo/runner/graphical/BuildID \ - qadevOOo/runner/graphical/DateHelper \ - qadevOOo/runner/graphical/DirectoryHelper \ - qadevOOo/runner/graphical/EnhancedComplexTestCase \ qadevOOo/runner/graphical/FileHelper \ - qadevOOo/runner/graphical/GlobalLogWriter \ - qadevOOo/runner/graphical/GraphicalComparator \ - qadevOOo/runner/graphical/HTMLResult \ - qadevOOo/runner/graphical/ImageHelper \ - qadevOOo/runner/graphical/IniFile \ - qadevOOo/runner/graphical/IOffice \ - qadevOOo/runner/graphical/JPEGComparator \ - qadevOOo/runner/graphical/JPEGCreator \ - qadevOOo/runner/graphical/JPEGEvaluator \ - qadevOOo/runner/graphical/MSOfficePostscriptCreator \ - qadevOOo/runner/graphical/Office \ - qadevOOo/runner/graphical/OfficeException \ - qadevOOo/runner/graphical/OpenOfficeDatabaseReportExtractor \ - qadevOOo/runner/graphical/OpenOfficePostscriptCreator \ - qadevOOo/runner/graphical/ParameterHelper \ - qadevOOo/runner/graphical/PerformanceContainer \ - qadevOOo/runner/graphical/PixelCounter \ - qadevOOo/runner/graphical/PostscriptCreator \ - qadevOOo/runner/graphical/PropertyName \ - qadevOOo/runner/graphical/TimeHelper \ - qadevOOo/runner/graphical/Tolerance \ - qadevOOo/runner/graphical/WrongEnvironmentException \ - qadevOOo/runner/graphical/WrongSuffixException \ qadevOOo/runner/helper/APIDescGetter \ qadevOOo/runner/helper/AppProvider \ qadevOOo/runner/helper/BuildEnvTools \ @@ -131,9 +68,7 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\ qadevOOo/runner/helper/ContextMenuInterceptor \ qadevOOo/runner/helper/CwsDataExchangeImpl \ qadevOOo/runner/helper/FileTools \ - qadevOOo/runner/helper/InetTools \ qadevOOo/runner/helper/LoggingThread \ - qadevOOo/runner/helper/ObjectInspectorModelImpl \ qadevOOo/runner/helper/OfficeProvider \ qadevOOo/runner/helper/OfficeWatcher \ qadevOOo/runner/helper/OSHelper \ @@ -141,8 +76,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\ qadevOOo/runner/helper/ProcessHandler \ qadevOOo/runner/helper/PropertyHandlerFactroy \ qadevOOo/runner/helper/PropertyHandlerImpl \ - qadevOOo/runner/helper/PropertyHelper \ - qadevOOo/runner/helper/SimpleMailSender \ qadevOOo/runner/helper/StreamSimulator \ qadevOOo/runner/helper/StringHelper \ qadevOOo/runner/helper/UnoProvider \ @@ -152,7 +85,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\ qadevOOo/runner/lib/ExceptionStatus \ qadevOOo/runner/lib/MultiMethodTest \ qadevOOo/runner/lib/MultiPropertyTest \ - qadevOOo/runner/lib/Parameters \ qadevOOo/runner/lib/SimpleStatus \ qadevOOo/runner/lib/Status \ qadevOOo/runner/lib/StatusException \ @@ -167,26 +99,14 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\ qadevOOo/runner/share/DescGetter \ qadevOOo/runner/share/LogWriter \ qadevOOo/runner/share/Watcher \ - qadevOOo/runner/stats/ComplexDataBaseOutProducer \ - qadevOOo/runner/stats/DataBaseOutProducer \ - qadevOOo/runner/stats/FatDataBaseOutProducer \ - qadevOOo/runner/stats/FileLogWriter \ qadevOOo/runner/stats/InternalLogWriter \ qadevOOo/runner/stats/OutProducerFactory \ - qadevOOo/runner/stats/SimpleFileOutProducer \ qadevOOo/runner/stats/SimpleLogWriter \ qadevOOo/runner/stats/SimpleOutProducer \ - qadevOOo/runner/stats/SQLExecution \ qadevOOo/runner/stats/Summarizer \ qadevOOo/runner/util/AccessibilityTools \ - qadevOOo/runner/util/BasicMacroTools \ qadevOOo/runner/util/BookmarkDsc \ qadevOOo/runner/util/CalcTools \ - qadevOOo/runner/util/compare/DocComparator \ - qadevOOo/runner/util/compare/DocComparatorFactory \ - qadevOOo/runner/util/compare/GraphicalComparator \ - qadevOOo/runner/util/compare/PDFComparator \ - qadevOOo/runner/util/ControlDsc \ qadevOOo/runner/util/db/DatabaseDocument \ qadevOOo/runner/util/db/DataSource \ qadevOOo/runner/util/db/DataSourceDescriptor \ @@ -203,11 +123,9 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\ qadevOOo/runner/util/InstDescr \ qadevOOo/runner/util/ParagraphDsc \ qadevOOo/runner/util/PropertyName \ - qadevOOo/runner/util/ReferenceMarkDsc \ qadevOOo/runner/util/RegistryTools \ qadevOOo/runner/util/ShapeDsc \ qadevOOo/runner/util/SOfficeFactory \ - qadevOOo/runner/util/StyleFamilyDsc \ qadevOOo/runner/util/SysUtils \ qadevOOo/runner/util/TableDsc \ qadevOOo/runner/util/TextSectionDsc \ diff --git a/qadevOOo/Jar_OOoRunnerLight.mk b/qadevOOo/Jar_OOoRunnerLight.mk index ec35391..3fcdd35 100644 --- a/qadevOOo/Jar_OOoRunnerLight.mk +++ b/qadevOOo/Jar_OOoRunnerLight.mk @@ -42,7 +42,6 @@ $(eval $(call gb_Jar_set_packageroot,OOoRunnerLight,\ )) $(eval $(call gb_Jar_add_sourcefiles,OOoRunnerLight,\ - qadevOOo/runner/base/java_cmp \ qadevOOo/runner/base/java_complex \ qadevOOo/runner/base/java_fat \ qadevOOo/runner/base/java_fat_service \ @@ -51,72 +50,10 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunnerLight,\ qadevOOo/runner/complexlib/ComplexTestCase \ qadevOOo/runner/complexlib/MethodThread \ qadevOOo/runner/complexlib/ShowTargets \ - qadevOOo/runner/convwatch/BorderRemover \ - qadevOOo/runner/convwatch/BuildID \ - qadevOOo/runner/convwatch/ConvWatch \ - qadevOOo/runner/convwatch/ConvWatchCancelException \ - qadevOOo/runner/convwatch/ConvWatchException \ - qadevOOo/runner/convwatch/ConvWatchStarter \ - qadevOOo/runner/convwatch/CrashLoopTest \ - qadevOOo/runner/convwatch/DateHelper \ qadevOOo/runner/convwatch/DB \ qadevOOo/runner/convwatch/DBHelper \ - qadevOOo/runner/convwatch/DirectoryHelper \ - qadevOOo/runner/convwatch/DocumentConverter \ - qadevOOo/runner/convwatch/EnhancedComplexTestCase \ - qadevOOo/runner/convwatch/FileHelper \ - qadevOOo/runner/convwatch/FilenameHelper \ - qadevOOo/runner/convwatch/GfxCompare \ qadevOOo/runner/convwatch/GlobalLogWriter \ - qadevOOo/runner/convwatch/GraphicalDifferenceCheck \ - qadevOOo/runner/convwatch/GraphicalTestArguments \ - qadevOOo/runner/convwatch/HTMLOutputter \ - qadevOOo/runner/convwatch/ImageHelper \ - qadevOOo/runner/convwatch/IniFile \ - qadevOOo/runner/convwatch/INIOutputter \ - qadevOOo/runner/convwatch/LISTOutputter \ - qadevOOo/runner/convwatch/MSOfficePrint \ - qadevOOo/runner/convwatch/NameHelper \ - qadevOOo/runner/convwatch/OfficePrint \ - qadevOOo/runner/convwatch/PerformanceContainer \ - qadevOOo/runner/convwatch/PixelCounter \ - qadevOOo/runner/convwatch/PRNCompare \ - qadevOOo/runner/convwatch/PropertyName \ - qadevOOo/runner/convwatch/ReferenceBuilder \ - qadevOOo/runner/convwatch/ReportDesignerTest \ - qadevOOo/runner/convwatch/SimpleFileSemaphore \ - qadevOOo/runner/convwatch/StatusHelper \ - qadevOOo/runner/convwatch/TimeHelper \ - qadevOOo/runner/convwatch/TriState \ - qadevOOo/runner/convwatch/ValueNotFoundException \ - qadevOOo/runner/graphical/BuildID \ - qadevOOo/runner/graphical/DateHelper \ - qadevOOo/runner/graphical/DirectoryHelper \ - qadevOOo/runner/graphical/EnhancedComplexTestCase \ qadevOOo/runner/graphical/FileHelper \ - qadevOOo/runner/graphical/GlobalLogWriter \ - qadevOOo/runner/graphical/GraphicalComparator \ - qadevOOo/runner/graphical/HTMLResult \ - qadevOOo/runner/graphical/ImageHelper \ - qadevOOo/runner/graphical/IniFile \ - qadevOOo/runner/graphical/IOffice \ - qadevOOo/runner/graphical/JPEGComparator \ - qadevOOo/runner/graphical/JPEGCreator \ - qadevOOo/runner/graphical/JPEGEvaluator \ - qadevOOo/runner/graphical/MSOfficePostscriptCreator \ - qadevOOo/runner/graphical/Office \ - qadevOOo/runner/graphical/OfficeException \ - qadevOOo/runner/graphical/OpenOfficeDatabaseReportExtractor \ - qadevOOo/runner/graphical/OpenOfficePostscriptCreator \ - qadevOOo/runner/graphical/ParameterHelper \ - qadevOOo/runner/graphical/PerformanceContainer \ - qadevOOo/runner/graphical/PixelCounter \ - qadevOOo/runner/graphical/PostscriptCreator \ - qadevOOo/runner/graphical/PropertyName \ - qadevOOo/runner/graphical/TimeHelper \ - qadevOOo/runner/graphical/Tolerance \ - qadevOOo/runner/graphical/WrongEnvironmentException \ - qadevOOo/runner/graphical/WrongSuffixException \ qadevOOo/runner/helper/APIDescGetter \ qadevOOo/runner/helper/AppProvider \ qadevOOo/runner/helper/BuildEnvTools \ @@ -128,9 +65,7 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunnerLight,\ qadevOOo/runner/helper/ContextMenuInterceptor \ qadevOOo/runner/helper/CwsDataExchangeImpl \ qadevOOo/runner/helper/FileTools \ - qadevOOo/runner/helper/InetTools \ qadevOOo/runner/helper/LoggingThread \ - qadevOOo/runner/helper/ObjectInspectorModelImpl \ qadevOOo/runner/helper/OfficeProvider \ qadevOOo/runner/helper/OfficeWatcher \ qadevOOo/runner/helper/OSHelper \ @@ -138,8 +73,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunnerLight,\ qadevOOo/runner/helper/ProcessHandler \ qadevOOo/runner/helper/PropertyHandlerFactroy \ qadevOOo/runner/helper/PropertyHandlerImpl \ - qadevOOo/runner/helper/PropertyHelper \ - qadevOOo/runner/helper/SimpleMailSender \ qadevOOo/runner/helper/StreamSimulator \ qadevOOo/runner/helper/StringHelper \ qadevOOo/runner/helper/UnoProvider \ @@ -149,7 +82,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunnerLight,\ qadevOOo/runner/lib/ExceptionStatus \ qadevOOo/runner/lib/MultiMethodTest \ qadevOOo/runner/lib/MultiPropertyTest \ - qadevOOo/runner/lib/Parameters \ qadevOOo/runner/lib/SimpleStatus \ qadevOOo/runner/lib/Status \ qadevOOo/runner/lib/StatusException \ @@ -164,26 +96,14 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunnerLight,\ qadevOOo/runner/share/DescGetter \ qadevOOo/runner/share/LogWriter \ qadevOOo/runner/share/Watcher \ - qadevOOo/runner/stats/ComplexDataBaseOutProducer \ - qadevOOo/runner/stats/DataBaseOutProducer \ - qadevOOo/runner/stats/FatDataBaseOutProducer \ - qadevOOo/runner/stats/FileLogWriter \ qadevOOo/runner/stats/InternalLogWriter \ qadevOOo/runner/stats/OutProducerFactory \ - qadevOOo/runner/stats/SimpleFileOutProducer \ qadevOOo/runner/stats/SimpleLogWriter \ qadevOOo/runner/stats/SimpleOutProducer \ - qadevOOo/runner/stats/SQLExecution \ qadevOOo/runner/stats/Summarizer \ qadevOOo/runner/util/AccessibilityTools \ - qadevOOo/runner/util/BasicMacroTools \ qadevOOo/runner/util/BookmarkDsc \ qadevOOo/runner/util/CalcTools \ - qadevOOo/runner/util/compare/DocComparator \ - qadevOOo/runner/util/compare/DocComparatorFactory \ - qadevOOo/runner/util/compare/GraphicalComparator \ - qadevOOo/runner/util/compare/PDFComparator \ - qadevOOo/runner/util/ControlDsc \ qadevOOo/runner/util/db/DatabaseDocument \ qadevOOo/runner/util/db/DataSource \ qadevOOo/runner/util/db/DataSourceDescriptor \ @@ -200,11 +120,9 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunnerLight,\ qadevOOo/runner/util/InstDescr \ qadevOOo/runner/util/ParagraphDsc \ qadevOOo/runner/util/PropertyName \ - qadevOOo/runner/util/ReferenceMarkDsc \ qadevOOo/runner/util/RegistryTools \ qadevOOo/runner/util/ShapeDsc \ qadevOOo/runner/util/SOfficeFactory \ - qadevOOo/runner/util/StyleFamilyDsc \ qadevOOo/runner/util/SysUtils \ qadevOOo/runner/util/TableDsc \ qadevOOo/runner/util/TextSectionDsc \ diff --git a/qadevOOo/runner/base/java_cmp.java b/qadevOOo/runner/base/java_cmp.java deleted file mode 100644 index 86927bc..0000000 --- a/qadevOOo/runner/base/java_cmp.java +++ /dev/null @@ -1,74 +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 base; - - - - -/** - * - * this class handles tests written in java without running an Office with - * own bootstrapping of UNO - */ -public class java_cmp implements TestBase { - - private final TestBase mWrappedTestBase = new java_fat(); - - public boolean executeTest(lib.TestParameters param) { - param.put("OfficeProvider", "helper.UnoProvider"); - return mWrappedTestBase.executeTest(param); - } -} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/qadevOOo/runner/complexlib/Assurance.java b/qadevOOo/runner/complexlib/Assurance.java index 0cbc1e0..f2169b0 100644 --- a/qadevOOo/runner/complexlib/Assurance.java +++ b/qadevOOo/runner/complexlib/Assurance.java @@ -52,28 +52,6 @@ public class Assurance assure(msg, s, false); } - - - - - - - - - - - - - - - - - - - - - - /** * Assure that two int values are equal * @param message the message to print when the equality test fails @@ -84,12 +62,6 @@ public class Assurance assureEquals( message, Integer.valueOf( expected ), Integer.valueOf( actual ), false ); } - - - - - - /** * Assure that two string values are equal * @param message the message to print when the equality test fails @@ -100,10 +72,6 @@ public class Assurance assureEquals( message, expected, actual, false ); } - - - - /** * assures the two given sequences are of equal length, and have equal content */ @@ -117,8 +85,6 @@ public class Assurance } } - - /** * Mark the currently executed method as failed. * with the given message. @@ -173,8 +139,5 @@ public class Assurance private AssureException(String msg) { super(msg); } - public AssureException(Throwable cause) { - super(cause); - } } } diff --git a/qadevOOo/runner/complexlib/MethodThread.java b/qadevOOo/runner/complexlib/MethodThread.java index d30df06..0d86c73 100644 --- a/qadevOOo/runner/complexlib/MethodThread.java +++ b/qadevOOo/runner/complexlib/MethodThread.java @@ -40,19 +40,6 @@ public class MethodThread extends Thread private boolean mExceptionHappened = false; private Object[] mParameter = null; - /** - * Constructor. - * @param testMethod The method that will be invoked. - * @param invokeClass The class where the method is invoked. - * @param log The logging mechanism. - */ - public MethodThread(Method testMethod, Object invokeClass, PrintWriter log) - { - mTestMethod = testMethod; - mInvokeClass = invokeClass; - mLog = log; - } - public MethodThread(Method testMethod, Object invokeClass, Object[] parameter, PrintWriter log) { mTestMethod = testMethod; diff --git a/qadevOOo/runner/convwatch/BorderRemover.java b/qadevOOo/runner/convwatch/BorderRemover.java deleted file mode 100644 index dbd933b..0000000 --- a/qadevOOo/runner/convwatch/BorderRemover.java +++ /dev/null @@ -1,261 +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 convwatch; - -import java.io.File; -import java.awt.image.RenderedImage; -import java.awt.image.BufferedImage; -import java.lang.reflect.Method; - - -class Rect -{ - private final int x; - private final int y; - private final int w; - private final int h; - - public Rect(int _x, int _y, int _w, int _h) - { - x = _x; - y = _y; - w = _w; - h = _h; - } - public int getX() {return x;} - public int getY() {return y;} - public int getWidth() {return w;} - public int getHeight() {return h;} -} - -class BorderRemover -{ - // Helper values, filled after find Border - - // --------------------------------- test mode --------------------------------- - - /* - * compares 2 colors with a given tolerance. So it's possible to check differences approximate. - * @param _nColor1 - * @param _nColor2 - * @param _nTolerance is a percentage value how strong the colors could be differ - - */ - private boolean compareColorWithTolerance(int _nColor1, int _nColor2, int _nTolerance) - { - // int alpha1 = (_nColor1 >> 24) & 0xff; - int red1 = (_nColor1 >> 16) & 0xff; - int green1 = (_nColor1 >> 8) & 0xff; - int blue1 = (_nColor1 ) & 0xff; - - // int alpha2 = (_nColor2 >> 24) & 0xff; - int red2 = (_nColor2 >> 16) & 0xff; - int green2 = (_nColor2 >> 8) & 0xff; - int blue2 = (_nColor2 ) & 0xff; - - if (_nTolerance > 100) - { - _nTolerance = 100; - } - - // calculate tolerance halve - int nTolerable = (int) (_nTolerance * 256.0 / 100.0); - if (nTolerable < 0) - { - nTolerable = 0; - } - - // X - th < Y < X + th - // if ((red1 - nTolerable) < red2 && red2 < (red1 + nTolerable)) - // is the same - // abs (X - Y) < th - if (Math.abs(red1 - red2) < nTolerable) - { - if (Math.abs(green1 - green2) < nTolerable) - { - if (Math.abs(blue1 - blue2) < nTolerable) - { - return true; - } - else - { - // blue differ - } - } - else - { - // green differ - } - } - else - { - // red differ - } - - return false; - } - - /** - * create a new image from an exist one without it's borders - * open the file (_sFilenameFrom) as an image, check if it contains any borders and remove - * the borders. - */ - public boolean createNewImageWithoutBorder(String _sFilenameFrom, String _sFilenameTo) - throws java.io.IOException - { - ImageHelper aImageHelper = ImageHelper.createImageHelper(_sFilenameFrom); - - int nBorderColor = aImageHelper.getPixel(0,0); - Rect aInnerRect = findBorder(aImageHelper, nBorderColor); - - RenderedImage aImage = createImage(aImageHelper, aInnerRect); - - File aWriteFile = new File(_sFilenameTo); - - Exception ex = null; - try - { - Class<?> imageIOClass = Class.forName("javax.imageio.ImageIO"); - - Method getWriterMIMETypesMethod = imageIOClass.getDeclaredMethod("getWriterMIMETypes", new Class[]{ }); - - getWriterMIMETypesMethod.invoke(imageIOClass, new Object[]{ }); - Method writeMethod = imageIOClass.getDeclaredMethod("write", new Class[]{ java.awt.image.RenderedImage.class, - String.class, - java.io.File.class}); - writeMethod.invoke(imageIOClass, new Object[]{aImage, "image/jpeg", aWriteFile}); - } - catch(java.lang.ClassNotFoundException e) { - e.printStackTrace(); - ex = e; - } - catch(java.lang.NoSuchMethodException e) { - e.printStackTrace(); - ex = e; - } - catch(java.lang.IllegalAccessException e) { - e.printStackTrace(); - ex = e; - } - catch(java.lang.reflect.InvocationTargetException e) { - e.printStackTrace(); - ex = e; - } - - if (ex != null) { - // get Java version: - String javaVersion = System.getProperty("java.version"); - throw new java.io.IOException( - "Cannot construct object with current Java version " + - javaVersion + ": " + ex.getMessage()); - } - - return true; - } - - - /** - * runs through the image, pixel by pixel - * as long as found pixels like the color at (0,0) this is interpreted as border. - * as result it fills the m_nXMin, m_nXMax, m_nYMin, m_nYMax values. - */ - - private Rect findBorder(ImageHelper _aImage, int _nBorderColor) - { - int h = _aImage.getHeight(); - int w = _aImage.getWidth(); - int nXMin = w; - int nXMax = 0; - int nYMin = h; - int nYMax = 0; - - for (int y = 0; y < h; y++) - { - for (int x = 0; x < nXMin; x++) - { - int nCurrentColor = _aImage.getPixel(x, y); - if (! compareColorWithTolerance(nCurrentColor, _nBorderColor, 10)) - { - nXMin = Math.min(nXMin, x); - nYMin = Math.min(nYMin, y); - } - } - } - for (int y = 0; y < h; y++) - { - for (int nx = w - 1; nx >= nXMax; --nx) - { - int ny = h - y - 1; - int nCurrentColor = _aImage.getPixel(nx, ny); - if (! compareColorWithTolerance(nCurrentColor, _nBorderColor, 10)) - { - nXMax = Math.max(nXMax, nx); - nYMax = Math.max(nYMax, ny); - } - } - } - - Rect aRect; - if (nXMin < nXMax && nYMin < nYMax) - { - int nw = nXMax - nXMin + 1; - int nh = nYMax - nYMin + 1; - - // this is the rectangle around the image content. - aRect = new Rect(nXMin, nYMin, nw, nh ); - } - else - { - // create the smalles possible image - aRect = new Rect(0,0,1,1); - } - - - return aRect; - } - - private RenderedImage createImage(ImageHelper _aImage, Rect _aRect) throws IllegalArgumentException - { -// TODO: throw if w or h < 0 - int w = _aRect.getWidth(); - int h = _aRect.getHeight(); - - if (w <= 0 || h <= 0) - { - throw new IllegalArgumentException("width or height are too small or negative."); - } - - BufferedImage aBI = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB); - - int nXOffset = _aRect.getX(); - int nYOffset = _aRect.getY(); - - // Memory Block move - for (int y = 0; y < h; y++) - { - for (int x = 0; x < w; x++) - { - // aPixels[y * w + x] = m_aImage.getPixel(m_nXMin + x, m_nYMin + y); - aBI.setRGB(x, y, _aImage.getPixel(x + nXOffset, y + nYOffset)); - } - } - return aBI; - } - -} diff --git a/qadevOOo/runner/convwatch/BuildID.java b/qadevOOo/runner/convwatch/BuildID.java deleted file mode 100644 index 6fb1687..0000000 --- a/qadevOOo/runner/convwatch/BuildID.java +++ /dev/null @@ -1,127 +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 convwatch; - -import java.io.File; -import helper.OSHelper; - -public class BuildID -{ - public static String getBuildID(String _sApp) - { - String sOfficePath = ""; - if (_sApp.startsWith("\"")) - { - int nIdx = _sApp.indexOf('"', 1); - if (nIdx == -1) - { - } - else - { - // leave double qoute out. - sOfficePath = _sApp.substring(1, nIdx); - } - } - else - { - // check if a space exist, so we get all until space - int nIdx = _sApp.indexOf(' ', 1); - if (nIdx == -1) - { - sOfficePath = _sApp; - } - else - { - sOfficePath = _sApp.substring(0, nIdx); - } - } - GlobalLogWriter.get().println("Office path: " + sOfficePath); - - String fs = System.getProperty("file.separator"); - String sBuildID = ""; - File aSOfficeFile = new File(sOfficePath); - if (aSOfficeFile.exists()) - { - int nIdx = sOfficePath.lastIndexOf(fs); - sOfficePath = sOfficePath.substring(0, nIdx); - sBuildID = getBuildIDFromBootstrap(sOfficePath); - if (sBuildID.length() == 0) - { - sBuildID = getBuildIDFromVersion(sOfficePath); - } - } - else - { - GlobalLogWriter.get().println("soffice executable not found."); - } - - return sBuildID; - } - - private static String getBuildIDFromBootstrap(String _sOfficePath) - { - String fs = System.getProperty("file.separator"); - String sBuildID = ""; - String sOfficePath = _sOfficePath; - if (OSHelper.isWindows()) - { - sOfficePath += fs + "bootstrap.ini"; - } - else - { - sOfficePath += fs + "bootstraprc"; - } - IniFile aIniFile = new IniFile(sOfficePath); - if (aIniFile.is()) - { - sBuildID = aIniFile.getValue("Bootstrap", "buildid"); - } - else - { - GlobalLogWriter.get().println("Property Build, can't open file '" + sOfficePath + "', please check."); - } - return sBuildID; - } - - private static String getBuildIDFromVersion(String _sOfficePath) - { - String fs = System.getProperty("file.separator"); - String sBuildID = ""; - String sOfficePath = _sOfficePath; - if (OSHelper.isWindows()) - { - sOfficePath += fs + "version.ini"; - } - else - { - sOfficePath += fs + "versionrc"; - } - IniFile aIniFile = new IniFile(sOfficePath); - if (aIniFile.is()) - { - sBuildID = aIniFile.getValue("Version", "buildid"); - } - else - { - GlobalLogWriter.get().println("Property Build, can't open file '" + sOfficePath + "', please check."); - } - return sBuildID; - } -} - diff --git a/qadevOOo/runner/convwatch/ConvWatch.java b/qadevOOo/runner/convwatch/ConvWatch.java deleted file mode 100644 index 1c4ac3d..0000000 --- a/qadevOOo/runner/convwatch/ConvWatch.java +++ /dev/null @@ -1,372 +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 convwatch; - -import helper.URLHelper; -import java.io.File; - -public class ConvWatch -{ - - private String getBuildID_FromFile(String _sInfoFile) - { - String sBuildID = ""; - IniFile aIniFile = new IniFile(_sInfoFile); - if (aIniFile.is()) - { - sBuildID = aIniFile.getValue("", "buildid"); - } - return sBuildID; - } - /** - * Check if given document (_sAbsoluteInputFile) and it's postscript representation (_sAbsoluteReferenceFile) produce - * the same output like the StarOffice / OpenOffice.org which is accessible with XMultiServiceFactory. - * Here a simple graphically difference check is run through. - * - * Hint: In the OutputPath all needed files will create, there must - * be very much space. It's not possible to say how much. - * One page need up to 800kb as jpeg. - * Sample: If a document contains 2 pages, we need 2*800kb for prn - * output and 2*800kb for ps output and 2*800kb for it's difference - * output. So up to 4800kb or 4.8mb. - * - * RAM is need least 300mb. Will say, it's tested on a pc with 128mb RAM and 256mb swap. - * - * It's also absolutlly impossible to say, how much time this functions consume. - */ - - private StatusHelper[] createPostscriptStartCheck(GraphicalTestArguments _aGTA, - String _sOutputPath, String _sAbsoluteInputFile, String _sAbsoluteReferenceFile) - throws ConvWatchCancelException - { -// TODO: some more checks - - if (! FileHelper.exists(_sAbsoluteInputFile)) - { - throw new ConvWatchCancelException("createPostscriptStartCheck: Input file: " + _sAbsoluteInputFile + " does not exist."); - } - - if (_sAbsoluteReferenceFile == null) - { - // we assume, that the prn file is near the document - String sAbsoluteInputFileNoSuffix = FileHelper.getNameNoSuffix(_sAbsoluteInputFile); - _sAbsoluteReferenceFile = sAbsoluteInputFileNoSuffix + ".prn"; - } - - String fs = System.getProperty("file.separator"); - File aAbsoluteReferenceFile = new File(_sAbsoluteReferenceFile); - - if (aAbsoluteReferenceFile.isDirectory()) - { - String sBasename = FileHelper.getBasename(_sAbsoluteInputFile); - String sNameNoSuffix = FileHelper.getNameNoSuffix(sBasename); - String sAbsoluteReferenceFileInfo = _sAbsoluteReferenceFile + fs + sNameNoSuffix + ".info"; - _sAbsoluteReferenceFile = _sAbsoluteReferenceFile + fs + sNameNoSuffix + ".prn"; - - // Read the reference from the info file - String sRefBuildID = ""; - if (FileHelper.exists(sAbsoluteReferenceFileInfo)) - { - sRefBuildID = getBuildID_FromFile(sAbsoluteReferenceFileInfo); - } - _aGTA.setRefBuildID(sRefBuildID); - - } - else - { - // java file has problems to check for directories, if the given directory doesn't exist. - String sName = FileHelper.getBasename(_sAbsoluteReferenceFile); - // thanks to Mircosoft, every document has a suffix, so if a name doesn't have a suffix, it must be a directory name - int nIdx = sName.indexOf('.'); - if (nIdx == -1) - { - // must be a directory - throw new ConvWatchCancelException("createPostscriptStartCheck: Given reference directory: '" + _sAbsoluteReferenceFile + "' does not exist."); - } - } - - - boolean bAbsoluteReferenceFile = true; - if (! FileHelper.exists(_sAbsoluteReferenceFile)) - { - if (_aGTA.createDefaultReference()) - { - GlobalLogWriter.get().println("Reference File doesn't exist, will create a default"); - bAbsoluteReferenceFile = false; - } - else - { - throw new ConvWatchCancelException("createPostscriptStartCheck: Given reference file: " + _sAbsoluteReferenceFile + " does not exist."); - } - } - - FileHelper.makeDirectories("", _sOutputPath); - - String sAbsoluteInputFileURL = URLHelper.getFileURLFromSystemPath(_sAbsoluteInputFile); - - String sInputFile = FileHelper.getBasename(_sAbsoluteInputFile); - - FileHelper.getNameNoSuffix(sInputFile); - - - String sAbsoluteOutputFile = _sOutputPath + fs + sInputFile; - String sAbsoluteOutputFileURL = URLHelper.getFileURLFromSystemPath(sAbsoluteOutputFile); - - String sReferenceFile = FileHelper.getBasename(_sAbsoluteReferenceFile); - String sReferenceFileNoSuffix = FileHelper.getNameNoSuffix(sReferenceFile); - String sPostScriptFile = sReferenceFileNoSuffix + ".ps"; - - String sAbsolutePrintFile = _sOutputPath + fs + sPostScriptFile; - String sAbsolutePrintFileURL = URLHelper.getFileURLFromSystemPath(sAbsolutePrintFile); - - // store and print the sAbsoluteInputFileURL file with StarOffice / OpenOffice.org - OfficePrint.printToFile(_aGTA, sAbsoluteInputFileURL, sAbsoluteOutputFileURL, sAbsolutePrintFileURL); - - if (! FileHelper.exists(sAbsolutePrintFile)) - { - throw new ConvWatchCancelException("createPostscriptStartCheck: Printed file " + sAbsolutePrintFile + " does not exist."); - } - - if (!bAbsoluteReferenceFile) - { - // copy AbsolutePrintFile to AbsoluteReferenceFile - String sDestinationFile = sAbsolutePrintFile; // URLHelper.getSystemPathFromFileURL(...) - String sSourceFile = _sAbsoluteReferenceFile; - FileHelper.copy(sDestinationFile, sSourceFile); - // now the fix reference of the AbsoluteReferenceFile should exist. - if (! FileHelper.exists(_sAbsoluteReferenceFile)) - { - throw new ConvWatchCancelException("createPostscriptStartCheck: Given reference file: " + _sAbsoluteReferenceFile + " does not exist, after try to copy."); - } - } - - PRNCompare a = new PRNCompare(); - String sReferencePath = FileHelper.getPath(_sAbsoluteReferenceFile); - - a.setReferencePath( sReferencePath ); - a.setOutputPath( _sOutputPath ); - a.setReferenceFile( sReferenceFile ); - a.setPostScriptFile(sPostScriptFile ); - if (_aGTA.printAllPages()) - { - a.setMaxPages(9999); - } - else - { - if (_aGTA.getMaxPages() > 0) - { - a.setMaxPages(_aGTA.getMaxPages()); - } - if (_aGTA.getOnlyPages().length() != 0) - { - // we can't interpret the string of getOnlyPages() right without much logic, so print all pages here! - a.setMaxPages(9999); - } - } - - a.setResolutionInDPI(_aGTA.getResolutionInDPI()); - a.setBorderMove(_aGTA.getBorderMove()); - a.setDocumentType(_aGTA.getDocumentType()); - - StatusHelper[] aList = a.compare(); - - _aGTA.setBorderMove(a.getBorderMove()); - return aList; - } - - - // This creates a status for exact on document - private static boolean createINIStatus(StatusHelper[] aList, String _sFilenamePrefix, String _sOutputPath, String _sAbsoluteInputFile, String _sBuildID, String _sRefBuildID) - { - System.getProperty("file.separator"); - String sBasename = FileHelper.getBasename(_sAbsoluteInputFile); - String sNameNoSuffix = FileHelper.getNameNoSuffix(sBasename); -// TODO: version info was fine -// HTMLoutput.checkSection(sBasename); - // Status end - - String sINIFile = _sFilenamePrefix + sNameNoSuffix + ".ini"; - INIOutputter INIoutput = INIOutputter.create(_sOutputPath, sINIFile); - INIoutput.createHeader(); -// TODO: version info was fine - - INIoutput.writeSection("global"); - INIoutput.writeValue("pages", String.valueOf(aList.length)); - INIoutput.writeValue("buildid", _sBuildID); - INIoutput.writeValue("refbuildid", _sRefBuildID); - INIoutput.writeValue("diffdiff", "no"); - INIoutput.writeValue("basename", sBasename); - - boolean bResultIsOk = true; // result over all pages - for (int i=0;i<aList.length; i++) - { - INIoutput.writeSection("page" + (i + 1)); // list start at point 0, but this is page 1 and so on... current_page = (i + 1) - aList[i].printStatus(); - - boolean bCurrentResult = true; // result over exact one page - - int nCurrentDiffStatus = aList[i].nDiffStatus; - - // check if the status is in a defined range - if (nCurrentDiffStatus == StatusHelper.DIFF_NO_DIFFERENCES) - { - // ok. - } - else if (nCurrentDiffStatus == StatusHelper.DIFF_DIFFERENCES_FOUND && aList[i].nPercent < 5) - { - // ok. - } - else if (nCurrentDiffStatus == StatusHelper.DIFF_AFTER_MOVE_DONE_NO_PROBLEMS) - { - // ok. - } - else if (nCurrentDiffStatus == StatusHelper.DIFF_AFTER_MOVE_DONE_DIFFERENCES_FOUND && aList[i].nPercent2 < 5) - { - // ok. - } - else - { - // failed. - bCurrentResult = false; // logic: nDiff==0 = true if there is no difference - } - - // Status - INIoutput.checkLine(aList[i], bCurrentResult); - bResultIsOk &= bCurrentResult; - } - // Status - INIoutput.close(); - return bResultIsOk; - } - - - - private static void createINIStatus_DiffDiff(StatusHelper[] aDiffDiffList, String _sFilenamePrefix, String _sOutputPath, String _sAbsoluteInputFile, String _sBuildID) - { - System.getProperty("file.separator"); - String sBasename = FileHelper.getBasename(_sAbsoluteInputFile); - String sNameNoSuffix = FileHelper.getNameNoSuffix(sBasename); - String sINIFile = _sFilenamePrefix + sNameNoSuffix + ".ini"; - - INIOutputter INIoutput = INIOutputter.create(_sOutputPath, sINIFile); - INIoutput.createHeader(); - // LLA? what if the are no values in the list? true or false; - INIoutput.writeSection("global"); - INIoutput.writeValue("pages", String.valueOf(aDiffDiffList.length)); - INIoutput.writeValue("buildid", _sBuildID); - INIoutput.writeValue("diffdiff", "yes"); - INIoutput.writeValue("basename", sBasename); - - for (int i=0;i<aDiffDiffList.length; i++) - { - INIoutput.writeSection("page" + (i + 1)); // list start at point 0, but this is page 1 and so on... current_page = (i + 1) - boolean bCurrentResult = (aDiffDiffList[i].nDiffStatus == StatusHelper.DIFF_NO_DIFFERENCES); // logic: nDiff==0 = true if there is no difference - - INIoutput.checkDiffDiffLine(aDiffDiffList[i], bCurrentResult); - } - // Status - INIoutput.close(); - } - - - - - public static boolean check(GraphicalTestArguments _aGTA, - String _sOutputPath, String _sAbsoluteInputFile, String _sAbsoluteReferenceFile) - throws ConvWatchCancelException, ConvWatchException - { - ConvWatch a = new ConvWatch(); - StatusHelper[] aList = a.createPostscriptStartCheck(_aGTA, _sOutputPath, _sAbsoluteInputFile, _sAbsoluteReferenceFile); - DB.writeNumberOfPages(aList.length); - - boolean bResultIsOk = createINIStatus(aList, "", _sOutputPath, _sAbsoluteInputFile, _aGTA.getBuildID(), _aGTA.getRefBuildID()); - - if (! bResultIsOk) - { - // it could be that this will store in a DB, there are problems with '\' - String sErrorMessage = "Graphical compare failed with file "; - String sErrorFile = _sAbsoluteInputFile.replace('\\', '/'); - sErrorMessage = sErrorMessage + "'" + sErrorFile + "'"; - DB.writeErrorFile(sErrorFile); - throw new ConvWatchException(sErrorMessage); - } - return bResultIsOk; - } - - - public static boolean checkDiffDiff(GraphicalTestArguments _aGTA, - String _sOutputPath, String _sAbsoluteInputFile, String _sAbsoluteReferenceFile, - String _sAbsoluteDiffPath) - throws ConvWatchCancelException, ConvWatchException - { - ConvWatch a = new ConvWatch(); - _aGTA.setBorderMove(TriState.FALSE); - StatusHelper[] aList = a.createPostscriptStartCheck(_aGTA, _sOutputPath, _sAbsoluteInputFile, _sAbsoluteReferenceFile); - - createINIStatus(aList, "", _sOutputPath, _sAbsoluteInputFile, _aGTA.getBuildID(), _aGTA.getRefBuildID()); - - StatusHelper[] aDiffDiffList = new StatusHelper[aList.length]; - - String fs = System.getProperty("file.separator"); - - boolean bDiffIsOk = true; - boolean bFoundAOldDiff = false; - - PRNCompare aCompare = new PRNCompare(); - // LLA? what if the are no values in the list? true or false; - for (int i=0;i<aList.length; i++) - { - String sOrigDiffName = aList[i].m_sDiffGfx; - String sDiffBasename = FileHelper.getBasename(sOrigDiffName); - - String sNewDiffName = _sAbsoluteDiffPath + fs + sDiffBasename; - if (! FileHelper.exists(sNewDiffName)) - { - GlobalLogWriter.get().println("checkDiffDiff: Old diff file: '" + sNewDiffName + "' does not exist." ); - continue; - } - - // make a simple difference between these both diff files. - String sSourcePath1 = FileHelper.getPath(sOrigDiffName); - String sSourceFile1 = sDiffBasename; - String sSourcePath2 = _sAbsoluteDiffPath; - String sSourceFile2 = sDiffBasename; - - StatusHelper aCurrentStatus = aCompare.checkDiffDiff(_sOutputPath, sSourcePath1, sSourceFile1, sSourcePath2, sSourceFile2); - boolean bCurrentResult = (aCurrentStatus.nDiffStatus == StatusHelper.DIFF_NO_DIFFERENCES); // logic: nDiff==0 = true if there is no difference - bDiffIsOk &= bCurrentResult; - bFoundAOldDiff = true; - - aDiffDiffList[i] = aCurrentStatus; - } - - createINIStatus_DiffDiff(aDiffDiffList, "DiffDiff_", _sOutputPath, _sAbsoluteInputFile, _aGTA.getBuildID()); - - if (!bFoundAOldDiff) - { - throw new ConvWatchCancelException("No old difference file found." ); - } - if (! bDiffIsOk) - { - throw new ConvWatchException("Graphical difference compare failed with file '" + _sAbsoluteInputFile + "'"); - } - return bDiffIsOk; - } - -} diff --git a/qadevOOo/runner/convwatch/ConvWatchCancelException.java b/qadevOOo/runner/convwatch/ConvWatchCancelException.java deleted file mode 100644 index f360293..0000000 --- a/qadevOOo/runner/convwatch/ConvWatchCancelException.java +++ /dev/null @@ -1,32 +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 convwatch; - -public class ConvWatchCancelException extends ConvWatchException -{ - public ConvWatchCancelException(String _aMessage) - { - super(_aMessage); - } - - public ConvWatchCancelException(String _aMessage, Throwable cause) - { - super(_aMessage, cause); - } -} diff --git a/qadevOOo/runner/convwatch/ConvWatchException.java b/qadevOOo/runner/convwatch/ConvWatchException.java deleted file mode 100644 index efd1e67..0000000 --- a/qadevOOo/runner/convwatch/ConvWatchException.java +++ /dev/null @@ -1,33 +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 convwatch; - -public class ConvWatchException extends Exception -{ - public ConvWatchException(String _aMessage) - { - super(_aMessage); - } - - public ConvWatchException(String _aMessage, Throwable cause) - { - super(_aMessage, cause); - } -} - diff --git a/qadevOOo/runner/convwatch/ConvWatchStarter.java b/qadevOOo/runner/convwatch/ConvWatchStarter.java deleted file mode 100644 index d6a4cca..0000000 --- a/qadevOOo/runner/convwatch/ConvWatchStarter.java +++ /dev/null @@ -1,387 +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 convwatch; - -import java.util.ArrayList; -import java.io.File; -import java.io.FileFilter; - -import com.sun.star.lang.XMultiServiceFactory; - -import helper.OfficeProvider; -import helper.OfficeWatcher; -import helper.OSHelper; - -/** - * The following Complex Test will test - * an already created document and it's postscript output (by an older office version) - * with a new office version. - * This test use Ghostscript for the jpeg export and graphically compare tools from ImageMagick. - * Read the manual for more information. - * - * this is only the starter program - * more is found in qadevOOo/runner/convwatch/* - */ - -public class ConvWatchStarter extends EnhancedComplexTestCase -{ - // The first of the mandatory functions: - - // The second of the mandatory functions: return all test methods as an - // array. There is only one test function in this example. - /** - * Return all test methods. - * @return The test methods. - */ - @Override - public String[] getTestMethodNames() { - return new String[]{"compareGraphicalDiffs"}; - } - - String m_sInputPath = ""; - String m_sReferencePath = ""; - String m_sOutputPath = ""; - String m_sDiffPath = null; - - private void initMember() - { - // MUST PARAMETER - // INPUTFILE ---------- - String sINPATH = (String)param.get( PropertyName.DOC_COMPARATOR_INPUT_PATH ); - boolean bQuit = false; - if (sINPATH == null || sINPATH.length() == 0) - { - log.println("Please set input path (path to documents) " + PropertyName.DOC_COMPARATOR_INPUT_PATH + "=path."); - bQuit = true; - } - else - { - log.println("found " + PropertyName.DOC_COMPARATOR_INPUT_PATH + " " + sINPATH); - m_sInputPath = sINPATH; - } - - // REFERENCE_PATH ---------- - String sREF = (String)param.get( PropertyName.DOC_COMPARATOR_REFERENCE_PATH ); - if (sREF == null || sREF.length() == 0) - { - log.println("Assumtion, reference directory and input directory are the same."); - m_sReferencePath = m_sInputPath; - } - else - { - log.println("found " + PropertyName.DOC_COMPARATOR_REFERENCE_PATH + " " + sREF); - m_sReferencePath = sREF; - } - - // OUTPUT_PATH ---------- - String sOUT = (String)param.get( PropertyName.DOC_COMPARATOR_OUTPUT_PATH ); - if (sOUT == null || sOUT.length() == 0) - { - log.println("Please set output path (path to a temp directory) " + PropertyName.DOC_COMPARATOR_OUTPUT_PATH + "=path."); - bQuit = true; - } - else - { - log.println("found " + PropertyName.DOC_COMPARATOR_OUTPUT_PATH + " " + sOUT); - m_sOutputPath = sOUT; - } - - if (bQuit) - { - assure("Must quit", false); - } - - - // DIFF_PATH ---------- - String sDIFF = (String)param.get( PropertyName.DOC_COMPARATOR_DIFF_PATH ); - if (sDIFF == null || sDIFF.length() == 0) - { - } - else - { - log.println("found " + PropertyName.DOC_COMPARATOR_DIFF_PATH + " " + sDIFF); - m_sDiffPath = sDIFF; - } - - if (m_sInputPath.startsWith("file:") || - m_sReferencePath.startsWith("file:") || - m_sOutputPath.startsWith("file:")) - { - assure("We can't handle file: URL right, use system path instead.", false); - } - - } - - - /** - * - * @return a List of software which must accessible as an external executable - */ - @Override - protected String[] mustInstalledSoftware() - { - ArrayList<String> aList = new ArrayList<String>(); - // Tools from ImageMagick - if (! OSHelper.isWindows()) - { - aList.add( "composite -version" ); - aList.add( "identify -version" ); - - // Ghostscript - aList.add( "gs -version" ); - } - else - { - aList.add( "composite.exe -version" ); - aList.add( "identify.exe -version" ); - - // Ghostscript - aList.add( "gswin32c.exe -version" ); - } - - return aList.toArray(new String[aList.size()]); - } - - - /** - * The test method itself. - * Don't try to call it from outside, it is started only from qadevOOo runner - */ - - /* protected */ - public void compareGraphicalDiffs() - { - GlobalLogWriter.set(log); - String sDBConnection = (String)param.get( PropertyName.DB_CONNECTION_STRING ); - // check if all need software is installed and accessible - checkEnvironment(mustInstalledSoftware()); - - GraphicalTestArguments aGTA = getGraphicalTestArguments(); - if (aGTA == null) - { - assure("Must quit", false); - } - if (aGTA.cancelRequest()) - { - return; - } - - initMember(); - - aGTA.allowStore(); - - String sBuildID = aGTA.getBuildID(); - log.println("Current Office has buildid: " + sBuildID); - - String fs = System.getProperty("file.separator"); - - String sHTMLName = "index.html"; - File aInputPathTest = new File(m_sInputPath); - if (!aInputPathTest.isDirectory()) - { - int n = m_sInputPath.lastIndexOf(fs); - sHTMLName = m_sInputPath.substring(n + 1); - sHTMLName += ".html"; - } - HTMLOutputter HTMLoutput = HTMLOutputter.create(m_sOutputPath, sHTMLName); - HTMLoutput.header( m_sOutputPath ); - HTMLoutput.indexSection( m_sOutputPath ); - LISTOutputter LISToutput = LISTOutputter.create(m_sOutputPath, "allfiles.txt"); - - DB.init(aGTA.getDBInfoString() + "," + sDBConnection); - - File aInputPath = new File(m_sInputPath); - if (aInputPath.isDirectory()) - { - // check a whole directory - // a whole directory - FileFilter aFileFilter = FileHelper.getFileFilter(); - - Object[] aList = DirectoryHelper.traverse(m_sInputPath, aFileFilter, aGTA.includeSubDirectories()); - if (aList.length == 0) - { - log.println("Nothing to do, there are no document files found."); - } - else - { - for (int i=0;i<aList.length;i++) - { - String sEntry = (String)aList[i]; - log.println("- next file is: ------------------------------"); - log.println(sEntry); - - String sNewSubDir = FileHelper.removeFirstDirectorysAndBasenameFrom(sEntry, m_sInputPath); - - String sNewReferencePath = m_sReferencePath; - String sNewOutputPath = m_sOutputPath; - String sNewDiffPath = m_sDiffPath; - if (sNewSubDir.length() > 0) - { - if (sNewReferencePath != null) - sNewReferencePath = sNewReferencePath + fs + sNewSubDir; - - sNewOutputPath = sNewOutputPath + fs + sNewSubDir; - if (sNewDiffPath != null) - sNewDiffPath = sNewDiffPath + fs + sNewSubDir; - } - - if (aGTA.checkIfUsableDocumentType(sEntry)) - { - runGDCWithStatus(HTMLoutput, LISToutput, sEntry, sNewOutputPath, sNewReferencePath, sNewDiffPath, sNewSubDir); - } - if (aGTA.cancelRequest()) - { - break; - } - } - } - } - else - { - // check exact name - if (aGTA.checkIfUsableDocumentType(m_sInputPath)) - { - runGDCWithStatus(HTMLoutput, LISToutput, m_sInputPath, m_sOutputPath, m_sReferencePath, m_sDiffPath, ""); - } - } - - LISToutput.close(); - HTMLoutput.close(); - log.println("The file '" + HTMLoutput.getFilename() + "' shows a html based status."); - DB.writeHTMLFile(HTMLoutput.getFilename()); - } - - - - void runGDCWithStatus(HTMLOutputter _aHTMLoutput, LISTOutputter _aLISToutput, String _sInputFile, String _sOutputPath, String _sReferencePath, String _sDiffPath, String _sNewSubDir ) - { - // start a fresh Office - GraphicalTestArguments aGTA = getGraphicalTestArguments(); - - OfficeProvider aProvider = null; - if (aGTA.shouldOfficeStart()) - { - aGTA.getPerformance().startTime(PerformanceContainer.OfficeStart); - aProvider = new OfficeProvider(); - XMultiServiceFactory xMSF = (XMultiServiceFactory) aProvider.getManager(param); - param.put("ServiceFactory", xMSF); - aGTA.getPerformance().stopTime(PerformanceContainer.OfficeStart); - - long nStartTime = aGTA.getPerformance().getTime(PerformanceContainer.OfficeStart); - aGTA = getGraphicalTestArguments(); // get new TestArguments - aGTA.getPerformance().setTime(PerformanceContainer.OfficeStart, nStartTime); - } - - // Watcher Object is need in log object to give a simple way to say if a running office is alive. - // As long as a log comes, it pings the Watcher and says the office is alive, if not an - // internal counter increase and at a given point (300 seconds) the office is killed. - GlobalLogWriter.get().println("Set office watcher"); - OfficeWatcher aWatcher = (OfficeWatcher)param.get("Watcher"); - GlobalLogWriter.get().setWatcher(aWatcher); - - String sStatusRunThrough = ""; - String sStatusMessage = ""; - try - { - DB.destination_start(); - // better was: - // load document - // create postscript from document - // check file - GraphicalDifferenceCheck.checkOneFile(_sInputFile, _sOutputPath, _sReferencePath, _sDiffPath, aGTA); - sStatusRunThrough = "PASSED, OK"; - DB.destination_finished(); - } - catch(ConvWatchCancelException e) - { - assure(e.getMessage(), false, true); - sStatusRunThrough = "CANCELLED, FAILED"; - sStatusMessage = e.getMessage(); - DB.destination_failed(sStatusRunThrough, sStatusMessage); - } - catch(ConvWatchException e) - { - assure(e.getMessage(), false, true); - sStatusMessage = e.getMessage(); - sStatusRunThrough = "PASSED, FAILED"; - DB.destination_failed(sStatusRunThrough, sStatusMessage); - } - catch(com.sun.star.lang.DisposedException e) - { - assure(e.getMessage(), false, true); - sStatusMessage = e.getMessage(); - sStatusRunThrough = "FAILED, FAILED"; - DB.destination_failed(sStatusRunThrough, sStatusMessage); - } - - GlobalLogWriter.get().println("Watcher count is: " + aWatcher.getPing()); - - // Office shutdown - if (aProvider != null) - { - aProvider.closeExistingOffice(param, true); - } - - // -------------------- Status -------------------- - String fs = System.getProperty("file.separator"); - String sBasename = FileHelper.getBasename(_sInputFile); - String sFilenameNoSuffix = FileHelper.getNameNoSuffix(sBasename); - - // -------------------- List of all files ----------------- - String sListFile; - if (_sNewSubDir.length() > 0) - { - sListFile = _sNewSubDir + fs + sFilenameNoSuffix + ".ini"; - } - else - { - sListFile = sFilenameNoSuffix + ".ini"; - } - _aLISToutput.writeValue(sListFile); - - // -------------------- HTML -------------------- - String sLink; - String sLinkDD; - String sLinkName; - String sLinkDDName; - String sHTMLPrefix = aGTA.getHTMLOutputPrefix(); - - GlobalLogWriter.get().println("----------------------------------------------------------------------"); - GlobalLogWriter.get().println(" OutputPath: " + _sOutputPath); - GlobalLogWriter.get().println(" NewPath: " + _sNewSubDir); - GlobalLogWriter.get().println("----------------------------------------------------------------------"); - - sLink = sHTMLPrefix /* + "/cw.php?inifile=" */ + _sOutputPath + fs + sFilenameNoSuffix + ".ini"; - sLinkDD = sHTMLPrefix /* + "/cw.php?inifile=" */ + _sOutputPath + fs + "DiffDiff_" + sFilenameNoSuffix + ".ini"; - sLinkName = sFilenameNoSuffix; - sLinkDDName = sFilenameNoSuffix + " (DiffDiff)"; - - if (_sDiffPath != null && _sDiffPath.length() > 0) - { - _aHTMLoutput.indexLine( sLinkDD, sLinkDDName, sLink, sLinkName, sStatusRunThrough, sStatusMessage ); - } - else - { - _aHTMLoutput.indexLine( sLink, sLinkName, "", "", sStatusRunThrough, sStatusMessage ); - } - - } - - -} diff --git a/qadevOOo/runner/convwatch/CrashLoopTest.java b/qadevOOo/runner/convwatch/CrashLoopTest.java deleted file mode 100644 index 0153149..0000000 --- a/qadevOOo/runner/convwatch/CrashLoopTest.java +++ /dev/null @@ -1,50 +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 convwatch; - -public class CrashLoopTest extends ReferenceBuilder -{ - // The first of the mandatory functions: - /** - * Return the name of the test. - * In this case it is the actual name of the service. - * @return The tested service. - */ - @Override - public String getTestObjectName() { - return "CrashLoopTest runner"; - } - - // The second of the mandatory functions: return all test methods as an - // array. There is only one test function in this example. - /** - * Return all test methods. - * @return The test methods. - */ - @Override - public String[] getTestMethodNames() { - return new String[]{"testcrashandloops"}; - } - - public void testcrashandloops() - { - buildreference(); - } - -} diff --git a/qadevOOo/runner/convwatch/DB.java b/qadevOOo/runner/convwatch/DB.java index 8b4c4ff..a9b2f70 100644 --- a/qadevOOo/runner/convwatch/DB.java +++ b/qadevOOo/runner/convwatch/DB.java @@ -20,7 +20,6 @@ package convwatch; import java.sql.Connection; import java.util.StringTokenizer; -import java.util.ArrayList; import helper.OSHelper; public class DB extends DBHelper @@ -54,70 +53,6 @@ public class DB extends DBHelper getDB().updatestate_status("source started"); } - public static void test() - { - getDB().sql_test(); - } - - public static void source_start() - { - getDB().updatestate_status("source started"); - } - - public static void source_finished() - { - getDB().updatestate_status( "source finished"); - } - - public static void source_failed(String _sMessage) - { - getDB().updatestate_status("source failed"); - getDB().updateinfo_status(_sMessage); - } - - public static void destination_start() - { - getDB().updatestate_status("destination started"); - } - - public static void destination_finished() - { - getDB().updatestate_status("PASSED-OK"); - } - - public static void destination_failed(String _sStatus, String _sMessage) - { - getDB().updatestate_status(_sStatus); - getDB().updateinfo_status(_sMessage); - } - public static void writeNumberOfPages(int _nPages) - { - getDB().updatepagecount_documents(_nPages); - } - public static void writeErrorFile(String _sErrorFile) - { - getDB().updateerrorfile_status(_sErrorFile); - } - public static void writeHTMLFile(String _sHTMLFile) - { - getDB().updatehtmlfile_status(_sHTMLFile); - } - - public static void writeToDB(String _sFilename, - String _sBasename, - String _sFileFormat, - String _sBuildID, - String _sSourceType, - int _nResolution ) - { - GlobalLogWriter.get().println("DB: Filename:" + _sFilename); - GlobalLogWriter.get().println("DB: Basename:" + _sBasename); - GlobalLogWriter.get().println("DB: FileFormat:" + _sFileFormat); - GlobalLogWriter.get().println("DB: BuildID:" + _sBuildID); - GlobalLogWriter.get().println("DB: SourceType:" + _sSourceType); - GlobalLogWriter.get().println("DB: Resolution:" + _nResolution); - } - private String getEnvironment() { if (OSHelper.isWindows()) @@ -203,86 +138,6 @@ public class DB extends DBHelper } } - private void sql_test() - { - String sUUID = getDBDistinct(); - System.out.println("UUID: " + sUUID); - } - - private ArrayList<String> QuerySQL(Connection _aCon, String _sSQL) - { - java.sql.Statement oStmt = null; - ArrayList<String> aResultList = new ArrayList<String>(); - try - { - try - { - oStmt = _aCon.createStatement(); - java.sql.ResultSet aResultSet = null; - try - { - aResultSet = oStmt.executeQuery(_sSQL); - java.sql.ResultSetMetaData aResultSetMetaData = aResultSet.getMetaData(); - - int nColumnCount = aResultSetMetaData.getColumnCount(); // java sql starts with '1' - - while( aResultSet.next() ) - { - StringBuffer aResult = new StringBuffer(); - try - { - aResult.append("sqlresult: "); - for (int i=1;i<=nColumnCount;i++) - { - String sColumnName = aResultSetMetaData.getColumnName(i); - aResult.append(sColumnName).append("="); - String sValue; - int nSQLType = aResultSetMetaData.getColumnType(i); - switch(nSQLType) - { - case java.sql.Types.VARCHAR: - sValue = "'" + aResultSet.getString(i) + "'"; - break; - case java.sql.Types.INTEGER: - { - int nValue = aResultSet.getInt(i); - sValue = String.valueOf(nValue); - break; - } - - default: - sValue = "UNSUPPORTED TYPE"; - } - aResult.append(sValue).append(", "); - } - String sResult = aResult.toString(); - aResultList.add(sResult); - } - catch (java.sql.SQLException e) - { - } - } - } - finally - { - if (aResultSet != null) - aResultSet.close(); - } - } - finally - { - if (oStmt != null) - oStmt.close(); - } - } - catch (java.sql.SQLException e) - { - String sError = e.getMessage(); - GlobalLogWriter.get().println("DB: Original SQL error: " + sError); - } - return aResultList; - } - private void updatestate_status(String _sStatus) { Connection aCon = new ShareConnection().getConnection(); @@ -294,43 +149,6 @@ public class DB extends DBHelper SQLupdateValue( aCon, "status", sSet, sWhere ); } } - private void updateinfo_status(String _sInfo) - { - Connection aCon = new ShareConnection().getConnection(); - - String sSet = "info=" + Quote(_sInfo); - String sWhere = getWhereClause(); - SQLupdateValue( aCon, "status", sSet, sWhere ); - } - private void updateerrorfile_status(String _sErrorFile) - { - Connection aCon = new ShareConnection().getConnection(); - - String sErrorFile = _sErrorFile.replace('\\', '/'); - - String sSet = "errorfile=" + Quote(sErrorFile); - String sWhere = getWhereClause(); - SQLupdateValue( aCon, "status", sSet, sWhere ); - } - private void updatehtmlfile_status(String _sHtmlFile) - { - Connection aCon = new ShareConnection().getConnection(); - - String sHtmlFile = _sHtmlFile.replace('\\', '/'); - - String sSet = "htmlfile=" + Quote(sHtmlFile); - String sWhere = getWhereClause(); - SQLupdateValue( aCon, "status", sSet, sWhere ); - } - private void updatepagecount_documents(int _nPageCount) - { - Connection aCon = new ShareConnection().getConnection(); - - String sSet = "pagecount=" + _nPageCount; - String sWhere = getWhereClause(); - SQLupdateValue( aCon, "documents", sSet, sWhere ); - - } private String getWhereClause() @@ -353,76 +171,4 @@ public class DB extends DBHelper return aWhereClause.toString(); } - private String getDBDistinct() - { - Connection aCon = new ShareConnection().getConnection(); - - String sSQL = "SELECT uuid()"; - ArrayList<String> aResultList = QuerySQL(aCon, sSQL); - - for (int i=0;i<aResultList.size();i++) - { - String sResult = aResultList.get(i); - - StringTokenizer aTokenizer = new StringTokenizer(sResult,",",false); - if (aTokenizer.hasMoreTokens()) - { - String sToken = aTokenizer.nextToken(); - int nIndex = sToken.indexOf("uuid()="); - int nIndexTuettel = sToken.indexOf('\'', nIndex); - int nIndexTuettel2 = sToken.lastIndexOf('\''); - String sUuid = sToken.substring(nIndexTuettel + 1, nIndexTuettel2); - return sUuid; - } - } - - return "0"; - } - - public static void insertinto_documentcompare(String _sSourceVersion, String _sSourceName, String _sSourceCreatorType, - String _sDestinationVersion, String _sDestinationName, String _sDestinationCreatorType, - String _sDocumentPoolDir, String _sDocumentPoolName, String _sMailAddress, - String _sSpecial, String _sParentDistinct) - { - getDB().insertinto_documentcompare_impl( _sSourceVersion, _sSourceName, _sSourceCreatorType, - _sDestinationVersion, _sDestinationName, _sDestinationCreatorType, - _sDocumentPoolDir, _sDocumentPoolName, _sMailAddress, - _sSpecial, _sParentDistinct); - } - - private void insertinto_documentcompare_impl(String _sSourceVersion, String _sSourceName, String _sSourceCreatorType, - String _sDestinationVersion, String _sDestinationName, String _sDestinationCreatorType, - String _sDocumentPoolDir, String _sDocumentPoolName, String _sMailAddress, - String _sSpecial, String _sParentDistinct) - { - // $sSQLInsert = "INSERT INTO documentcompare - if (_sParentDistinct == null) - { - _sParentDistinct = ""; - } - - Connection aCon = new ShareConnection().getConnection(); - - String sValueLine="dbdistinct2, environment, sourceversion, sourcename, sourcecreatortype, destinationversion, destinationname, destinationcreatortype, documentpoolpath, documentpool, mailfeedback, state, special, parentdistinct, startdate"; - String sDocumentPoolDir = _sDocumentPoolDir.replace('\\', '/'); - StringBuffer aDataLine = new StringBuffer(); - aDataLine.append( Quote(getDBDistinct()) ) . append( sComma ) . - append( Quote( getEnvironment()) ) . append( sComma ) . - append( Quote( _sSourceVersion) ) . append( sComma ) . - append( Quote( _sSourceName) ) . append( sComma ) . - append( Quote( _sSourceCreatorType ) ) . append( sComma ) . - append( Quote( _sDestinationVersion) ) . append( sComma ) . - append( Quote( _sDestinationName) ) . append( sComma ) . - append( Quote( _sDestinationCreatorType ) ) . append( sComma ) . - append( Quote( sDocumentPoolDir) ) . append( sComma ) . - append( Quote( _sDocumentPoolName) ) . append( sComma ) . - append( Quote( _sMailAddress) ) . append( sComma ) . - append( Quote( "new" )) . append ( sComma ) . - append( Quote( _sSpecial ) ) . append( sComma ) . - append( Quote( _sParentDistinct ) ) . append( sComma ) . - append( Quote( today() )); - - SQLinsertValues(aCon, "documentcompare", sValueLine, aDataLine.toString()); - } - } diff --git a/qadevOOo/runner/convwatch/DBHelper.java b/qadevOOo/runner/convwatch/DBHelper.java index dc76af3..34e1e1c 100644 --- a/qadevOOo/runner/convwatch/DBHelper.java +++ b/qadevOOo/runner/convwatch/DBHelper.java @@ -93,28 +93,6 @@ class ShareConnection public class DBHelper { - /** - * This method inserts given values into<br> - * the table 'states' - * @param values a set of comma separated values to be inserted - */ - - public void SQLinsertValues(Connection _aCon, String _sTableName, String value_names, String values) - { - if (_aCon == null) - { - GlobalLogWriter.get().println("DB: ERROR: in SQLinsertValues, connection not established."); - return; - } - - StringBuffer aInsertStr = new StringBuffer(); - - aInsertStr.append( "INSERT INTO " ) . append( _sTableName ); - aInsertStr.append( " (").append( value_names ).append ( ")" ); - aInsertStr.append(" VALUES (" ).append( values ).append( ")" ); - ExecSQL(_aCon, aInsertStr.toString() ); - } - public void SQLupdateValue(Connection _aCon, String _sTableName, String _sSet, String _sWhere) { if (_aCon == null) @@ -205,13 +183,6 @@ public class DBHelper return ts + _sToQuote + ts; } -/* default date format in the MySQL DB yyyy-MM-dd */ - public static String today() - { - return DateHelper.getDateString("yyyy-MM-dd"); - } - - public static final String sComma = ","; public static final String sEqual = "="; public static final String sAND = " AND "; diff --git a/qadevOOo/runner/convwatch/DateHelper.java b/qadevOOo/runner/convwatch/DateHelper.java deleted file mode 100644 index bef0a09..0000000 --- a/qadevOOo/runner/convwatch/DateHelper.java +++ /dev/null @@ -1,48 +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 convwatch; - -import java.text.SimpleDateFormat; -import java.util.GregorianCalendar; -import java.text.FieldPosition; -import java.util.Locale; - -public class DateHelper -{ - public static String getDateTimeForFilename() - { - return getDateString("yyyyMMdd-HHmmss"); - } - - public static String getDateTimeForHumanreadableLog() - { - return getDateString("[yyyy/MM/dd hh:mm:ss]"); - } - - public static String getDateString(String _sFormat) - { - GregorianCalendar aCalendar = new GregorianCalendar(); - StringBuffer aBuf = new StringBuffer(); - - Locale aLocale = new Locale("en","US"); - SimpleDateFormat aFormat = new SimpleDateFormat(_sFormat, aLocale); - aBuf = aFormat.format(aCalendar.getTime(), aBuf, new FieldPosition(0) ); - return aBuf.toString(); - } -} diff --git a/qadevOOo/runner/convwatch/DirectoryHelper.java b/qadevOOo/runner/convwatch/DirectoryHelper.java deleted file mode 100644 index 9d322c5..0000000 --- a/qadevOOo/runner/convwatch/DirectoryHelper.java +++ /dev/null @@ -1,125 +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 convwatch; - -import java.io.File; -import java.io.FileFilter; -import java.util.ArrayList; - -/** - * Helper for directory access - */ -public class DirectoryHelper -{ - private final ArrayList<String> m_aFileList = new ArrayList<String>(); - private boolean m_bRecursiveIsAllowed = true; - - private void setRecursiveIsAllowed(boolean _bValue) - { - m_bRecursiveIsAllowed = _bValue; - } - - /** - * Traverse over a given directory, and filter with a given FileFilter - * object and gives back the deep directory as a Object[] list, which - * contain a String object for every directory entry. - * - * <B>Example</B> - * List directory /bin, filter out all files which ends with '.prn' - * - * FileFilter aFileFilter = new FileFilter() - * { - * public boolean accept( File pathname ) - * { - * if (pathname.getName().endsWith(".prn")) - * { - * return false; - * } - * return true; - * } - * }; - * - * Object[] aList = DirectoryHelper.traverse("/bin", aFileFilter); - * for (int i=0;i<aList.length;i++) - * { - * String aEntry = (String)aList[i]; - * System.out.println(aEntry); - * } - * - */ - public static Object[] traverse( String _sDirectory, FileFilter _aFileFilter, boolean _bRecursiveIsAllowed ) - { - DirectoryHelper a = new DirectoryHelper(); - a.setRecursiveIsAllowed(_bRecursiveIsAllowed); - a.traverse_impl(_sDirectory, _aFileFilter); - return a.m_aFileList.toArray(); - } - - - - private void traverse_impl( String afileDirectory, FileFilter _aFileFilter ) - { - File fileDirectory = new File(afileDirectory); - // Testing, if the file is a directory, and if so, it throws an exception - if ( !fileDirectory.isDirectory() ) - { - throw new IllegalArgumentException( "not a directory: " + fileDirectory.getName() ); - } - - // Getting all files and directories in the current directory - File[] aDirEntries; - if (_aFileFilter != null) - { - aDirEntries = fileDirectory.listFiles(_aFileFilter); - } - else - { - aDirEntries = fileDirectory.listFiles(); - } - - // Iterating for each file and directory - for ( int i = 0; i < aDirEntries.length; ++i ) - { - if ( aDirEntries[ i ].isDirectory() ) - { - if (m_bRecursiveIsAllowed) - { - // Recursive call for the new directory - traverse_impl( aDirEntries[ i ].getAbsolutePath(), _aFileFilter ); - } - } - else - { - // adding file to List - try - { - // Composing the URL by replacing all backslashs - String aStr = aDirEntries[ i ].getAbsolutePath(); - m_aFileList.add(aStr); - } - catch( Exception exception ) - { - exception.printStackTrace(); - break; - } - } - } - } -} - diff --git a/qadevOOo/runner/convwatch/DocumentConverter.java b/qadevOOo/runner/convwatch/DocumentConverter.java deleted file mode 100644 index a3d930d..0000000 --- a/qadevOOo/runner/convwatch/DocumentConverter.java +++ /dev/null @@ -1,242 +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 convwatch; - -import java.io.File; -import java.io.FileFilter; -import java.util.ArrayList; - -import com.sun.star.lang.XMultiServiceFactory; - -import helper.OfficeProvider; - -/** - * The following Complex Test will test - * an already created document and it's postscript output (by an older office version) - * with a new office version. - * This test use Ghostscript for the jpeg export and graphically compare tools from ImageMagick. - * Read the manual for more information. - * - * this is only the starter program - * more is found in qadevOOo/runner/convwatch/* - */ - -public class DocumentConverter extends EnhancedComplexTestCase -{ - // The first of the mandatory functions: - /** - * Return the name of the test. - * In this case it is the actual name of the service. - * @return The tested service. - */ - @Override - public String getTestObjectName() { - return "DocumentConverter runner"; - } - - // The second of the mandatory functions: return all test methods as an - // array. There is only one test function in this example. - /** - * Return all test methods. - * @return The test methods. - */ - @Override - public String[] getTestMethodNames() { - return new String[]{"convert"}; - } - - // This test is fairly simple, so there is no need for before() or after() - // methods. - - public void before() - { - } - - public void after() - { - } - - // The test method itself. - private String m_sInputPath = ""; - private String m_sReferencePath = ""; - void initMember() - { - // MUST PARAMETER - // INPUT_PATH ---------- - String sINPATH = (String)param.get( PropertyName.DOC_COMPARATOR_INPUT_PATH ); - boolean bQuit = false; - if (sINPATH == null || sINPATH.length() == 0) - { - log.println("Please set input path (path to documents) " + PropertyName.DOC_COMPARATOR_INPUT_PATH + "=path."); - bQuit = true; - } - else - { - log.println("found " + PropertyName.DOC_COMPARATOR_INPUT_PATH + " " + sINPATH); - m_sInputPath = sINPATH; - } - - // REFERENCE_PATH ---------- - String sREF = (String)param.get( PropertyName.DOC_COMPARATOR_REFERENCE_PATH ); - if (sREF == null || sREF.length() == 0) - { - log.println("Please set output path (path to a directory, where the references should stay) " + PropertyName.DOC_COMPARATOR_REFERENCE_PATH + "=path."); - bQuit = true; - } - else - { - log.println("found " + PropertyName.DOC_COMPARATOR_REFERENCE_PATH + " " + sREF); - m_sReferencePath = sREF; - } - - if (bQuit) - { - assure("Must quit, Parameter problems.", false); - } - - if (m_sInputPath.startsWith("file:") || - m_sReferencePath.startsWith("file:")) - { - assure("We can't handle file: URL right, use system path instead.", false); - } - - } - - /** - * Function returns a List of software which must accessible as an external executable - */ - @Override - protected String[] mustInstalledSoftware() - { - ArrayList<String> aList = new ArrayList<String>(); - // aList.add("perl -version"); - return aList.toArray(new String[aList.size()]); - } - - // the test ====================================================================== - public void convert() - { - GlobalLogWriter.set(log); - // check if all need software is installed and accessible - checkEnvironment(mustInstalledSoftware()); - - GraphicalTestArguments aGTA = getGraphicalTestArguments(); - if (aGTA == null) - { - assure("Must quit", false); - } - - initMember(); - - File aInputPath = new File(m_sInputPath); - if (aInputPath.isDirectory()) - { - String fs = System.getProperty("file.separator"); - - aInputPath.getAbsolutePath(); - // a whole directory - FileFilter aFileFilter = FileHelper.getFileFilter(); - - Object[] aList = DirectoryHelper.traverse(m_sInputPath, aFileFilter, aGTA.includeSubDirectories()); - for (int i=0;i<aList.length;i++) - { - String sEntry = (String)aList[i]; - - String sNewReferencePath = m_sReferencePath + fs + FileHelper.removeFirstDirectorysAndBasenameFrom(sEntry, m_sInputPath); - log.println("- next file is: ------------------------------"); - log.println(sEntry); - - if (aGTA.checkIfUsableDocumentType(sEntry)) - { - runGDC(sEntry, sNewReferencePath); - } - if (aGTA.cancelRequest()) - { - break; - } - } - } - else - { - if (aGTA.checkIfUsableDocumentType(m_sInputPath)) - { - runGDC(m_sInputPath, m_sReferencePath); - } - } - } - - void runGDC(String _sInputFile, String _sReferencePath) - { - // first do a check if the reference not already exist, this is a big speedup, due to the fact, - // we don't need to start a new office. - GraphicalTestArguments aGTA_local = getGraphicalTestArguments(); - // start a fresh Office - OfficeProvider aProvider = null; - if (aGTA_local.restartOffice()) - { - aProvider = new OfficeProvider(); - XMultiServiceFactory xMSF = (XMultiServiceFactory) aProvider.getManager(param); - param.put("ServiceFactory", xMSF); - } - GraphicalTestArguments aGTA = getGraphicalTestArguments(); - - if (aGTA.getOfficeProgram().equalsIgnoreCase("msoffice")) - { - // ReferenceType is MSOffice - GlobalLogWriter.get().println("USE MSOFFICE AS EXPORT FORMAT."); - MSOfficePrint a = new MSOfficePrint(); - try - { - String sInputFileBasename = FileHelper.getBasename(_sInputFile); - String fs = System.getProperty("file.separator"); - FileHelper.makeDirectories("", _sReferencePath); - String sOutputFile = _sReferencePath; - if (sOutputFile.endsWith(fs)) - { - sOutputFile += sInputFileBasename; - } - else - { - sOutputFile += fs + sInputFileBasename; - } - - a.storeToFileWithMSOffice(aGTA, _sInputFile, sOutputFile); - } - catch(ConvWatchCancelException e) - { - GlobalLogWriter.get().println(e.getMessage()); - } - catch(java.io.IOException e) - { - GlobalLogWriter.get().println(e.getMessage()); - } - } - else - { - OfficePrint.convertDocument(_sInputFile, _sReferencePath, aGTA); - } - - if (aGTA.restartOffice()) - { - // Office shutdown - aProvider.closeExistingOffice(param, true); - } - } -} - diff --git a/qadevOOo/runner/convwatch/EnhancedComplexTestCase.java b/qadevOOo/runner/convwatch/EnhancedComplexTestCase.java deleted file mode 100644 index 52587c6..0000000 --- a/qadevOOo/runner/convwatch/EnhancedComplexTestCase.java +++ /dev/null @@ -1,101 +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 ... etc. - the rest is truncated _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits