summaryrefslogtreecommitdiff
path: root/qadevOOo/runner/graphical
diff options
context:
space:
mode:
Diffstat (limited to 'qadevOOo/runner/graphical')
-rw-r--r--qadevOOo/runner/graphical/EnhancedComplexTestCase.java11
-rw-r--r--qadevOOo/runner/graphical/FileHelper.java12
-rw-r--r--qadevOOo/runner/graphical/IniFile.java2
-rw-r--r--qadevOOo/runner/graphical/JPEGComparator.java6
-rw-r--r--qadevOOo/runner/graphical/JPEGCreator.java7
-rw-r--r--qadevOOo/runner/graphical/MSOfficePostscriptCreator.java2
-rw-r--r--qadevOOo/runner/graphical/OpenOfficeDatabaseReportExtractor.java34
-rw-r--r--qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java12
-rw-r--r--qadevOOo/runner/graphical/PerformanceContainer.java3
-rw-r--r--qadevOOo/runner/graphical/TimeHelper.java4
10 files changed, 16 insertions, 77 deletions
diff --git a/qadevOOo/runner/graphical/EnhancedComplexTestCase.java b/qadevOOo/runner/graphical/EnhancedComplexTestCase.java
index 52c09e7ffb5c..3654e42cd270 100644
--- a/qadevOOo/runner/graphical/EnhancedComplexTestCase.java
+++ b/qadevOOo/runner/graphical/EnhancedComplexTestCase.java
@@ -348,9 +348,7 @@ private void callEntry(String _sEntry, ParameterHelper _aParam)
IniFile aIniFile = new IniFile(_aParam.getInputPath());
while (aIniFile.hasMoreElements())
{
- String sSection = aIniFile.nextElement();
-// TODO: not supported yet.
- // callEveryPictureInIniFile(aIniFile, sSection, _aParam);
+ aIniFile.nextElement();
}
}
else
@@ -410,12 +408,7 @@ private void callEntry(String _sEntry, ParameterHelper _aParam)
{
// TODO: auslagern in eine function, die ein Interface annimmt.
String sInputPath = _aParam.getInputPath();
- File aInputPath = new File(sInputPath);
-// if (!aInputPath.exists())
-// {
-// GlobalLogWriter.println("Error, InputPath or File in InputPath doesn't exists. Please check: '" + sInputPath + "'");
-// assure("Error, InputPath or File in InputPath doesn't exists. Please check: '" + sInputPath + "'", false);
-// }
+ new File(sInputPath);
// call for a single ini file
if (sInputPath.toLowerCase().endsWith(".ini") )
diff --git a/qadevOOo/runner/graphical/FileHelper.java b/qadevOOo/runner/graphical/FileHelper.java
index 733e827dc275..f551cffc1da8 100644
--- a/qadevOOo/runner/graphical/FileHelper.java
+++ b/qadevOOo/runner/graphical/FileHelper.java
@@ -302,12 +302,9 @@ public class FileHelper
public static void test_removeFirstDirectorysAndBasenameFrom()
{
- String a = removeFirstDirectorysAndBasenameFrom("/a/b/c/d/e/f.g", "/a/b/c");
- // assure("", a.equals("d/e"));
- String b = removeFirstDirectorysAndBasenameFrom("/a/b/c/d/e/f.g", "/a/b/c/");
- // assure("", b.equals("d/e"));
- String c = removeFirstDirectorysAndBasenameFrom("/a/b/c/d/e/f.g", "/b/c");
- // assure("", c.equals("a/b/c/d/e"));
+ removeFirstDirectorysAndBasenameFrom("/a/b/c/d/e/f.g", "/a/b/c");
+ removeFirstDirectorysAndBasenameFrom("/a/b/c/d/e/f.g", "/a/b/c/");
+ removeFirstDirectorysAndBasenameFrom("/a/b/c/d/e/f.g", "/b/c");
}
@@ -608,8 +605,7 @@ public class FileHelper
// OLD INFO FILE
- // String fs = System.getProperty("file.separator");
- String ls = System.getProperty("line.separator");
+ System.getProperty("line.separator");
String sInfoFilename = FileHelper.appendPath(sFileDir, sNameNoSuffix + ".info");
File aInfoFile = new File(sInfoFilename);
diff --git a/qadevOOo/runner/graphical/IniFile.java b/qadevOOo/runner/graphical/IniFile.java
index 46173e4fb4ed..1c1c807c5220 100644
--- a/qadevOOo/runner/graphical/IniFile.java
+++ b/qadevOOo/runner/graphical/IniFile.java
@@ -311,7 +311,7 @@ public class IniFile implements Enumeration<String>
int nEqual = sLine.indexOf("=");
if (nEqual >= 0)
{
- String sKey = sLine.substring(0, nEqual).trim();
+ sLine.substring(0, nEqual).trim();
String sValue = sLine.substring(nEqual + 1).trim();
return sValue;
}
diff --git a/qadevOOo/runner/graphical/JPEGComparator.java b/qadevOOo/runner/graphical/JPEGComparator.java
index 4f53e8c2a270..c8620cb2482d 100644
--- a/qadevOOo/runner/graphical/JPEGComparator.java
+++ b/qadevOOo/runner/graphical/JPEGComparator.java
@@ -698,7 +698,7 @@ public class JPEGComparator extends EnhancedComplexTestCase
};
ProcessHandler aHandler = new ProcessHandler(sCommandArray);
- boolean bBackValue = aHandler.executeSynchronously();
+ aHandler.executeSynchronously();
int nExitCode = aHandler.getExitCode();
if (nExitCode != 0)
{
@@ -754,8 +754,8 @@ public class JPEGComparator extends EnhancedComplexTestCase
_sDiffGfx
};
ProcessHandler aHandler = new ProcessHandler(sCommandArray);
- boolean bBackValue = aHandler.executeSynchronously();
- int nExitCode = aHandler.getExitCode();
+ aHandler.executeSynchronously();
+ aHandler.getExitCode();
String sBack = aHandler.getOutputText();
GlobalLogWriter.println("'" + sBack + "'");
diff --git a/qadevOOo/runner/graphical/JPEGCreator.java b/qadevOOo/runner/graphical/JPEGCreator.java
index 26ffeb31535e..45e90ae041d0 100644
--- a/qadevOOo/runner/graphical/JPEGCreator.java
+++ b/qadevOOo/runner/graphical/JPEGCreator.java
@@ -109,7 +109,6 @@ public class JPEGCreator extends EnhancedComplexTestCase
return;
}
- int nPages = 0;
if (_sJPEGSchema.length() > 0)
{
// TODO: if there doesn't exists a '%04d' in the schema we will return 9999 which is a little bit wrong here.
@@ -119,8 +118,6 @@ public class JPEGCreator extends EnhancedComplexTestCase
if (FileHelper.exists(sJPEGFilename))
{
convertToNearSameFileWithWidth340(sJPEGFilename);
- // m_aFileList.add(sNewJPEGFilename); // as long as the files exist, fill the array
- nPages ++;
}
else
{
@@ -196,8 +193,8 @@ private static void convertToWidth340(String _sFrom, String _To)
_To
};
ProcessHandler aHandler = new ProcessHandler(sCommandArray);
- boolean bBackValue = aHandler.executeSynchronously();
- int nExitCode = aHandler.getExitCode();
+ aHandler.executeSynchronously();
+ aHandler.getExitCode();
String sBack = aHandler.getOutputText();
if (sBack.length() > 0)
diff --git a/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java b/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java
index bbd73f7eca4c..7763a681e864 100644
--- a/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java
+++ b/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java
@@ -353,7 +353,7 @@ public class MSOfficePostscriptCreator implements IOffice
ProcessHandler aHandler = new ProcessHandler(aList);
- boolean bBackValue = aHandler.executeSynchronously();
+ aHandler.executeSynchronously();
}
catch (IndexOutOfBoundsException e)
{
diff --git a/qadevOOo/runner/graphical/OpenOfficeDatabaseReportExtractor.java b/qadevOOo/runner/graphical/OpenOfficeDatabaseReportExtractor.java
index 7d5d99831207..86bba445b643 100644
--- a/qadevOOo/runner/graphical/OpenOfficeDatabaseReportExtractor.java
+++ b/qadevOOo/runner/graphical/OpenOfficeDatabaseReportExtractor.java
@@ -132,7 +132,6 @@ public class OpenOfficeDatabaseReportExtractor extends Assurance
}
- private OfficeProvider m_aProvider = null;
private XMultiServiceFactory m_xMultiServiceFactory = null;
private XMultiServiceFactory getMultiServiceFactory()
{
@@ -165,20 +164,10 @@ public class OpenOfficeDatabaseReportExtractor extends Assurance
// TimeHelper.waitInSeconds(2, "Give close Office some time.");
// }
- private String m_sMailAddress = null;
- private String m_sParentDistinct = null;
// private String m_sUPDMinor;
// private String m_sCWS_WORK_STAMP;
- private static String m_sSourceVersion;
- private static String m_sDestinationVersion;
- private static String m_sSourceName;
- private static String m_sDestinationName;
-
- private static final int WRITER = 1;
- private static final int CALC = 2;
-
/**
* This is the main test Function of current ReportDesignerTest
* @param _sDocument
@@ -322,26 +311,9 @@ public class OpenOfficeDatabaseReportExtractor extends Assurance
// TODO: DB
// DB.init(sDBConnection);
- // String sFixRefSubDirectory = "ReportDesign_qa_complex_" + getFileFormat(_nType);
- String sFixRefSubDirectory = "ReportDesignFixRef";
-
- String sSourceVersion = m_sSourceVersion;
- // String sSourceVersion = sFixRefSubDirectory;
- String sSourceName = m_sSourceName;
- // String sSourceCreatorType = "fixref";
- String sSourceCreatorType = "";
- String sDestinationVersion = m_sDestinationVersion;
- // if (sDestinationVersion.length() == 0)
- // {
- // sDestinationVersion = m_sUPDMinor;
- // }
- String sDestinationName = m_sDestinationName;
- String sDestinationCreatorType = "";
- String sDocumentPoolDir = getOutputPath(/*_nType*/);
- String sDocumentPoolName = getDocumentPoolName(/*_nType*/);
- String sSpecial = "";
-
-// TODO: DB
+ getOutputPath(/*_nType*/);
+ getDocumentPoolName(/*_nType*/);
+ // TODO: DB
// DB.insertinto_documentcompare(sSourceVersion, sSourceName, sSourceCreatorType,
// m_sDestinationVersion, sDestinationName, sDestinationCreatorType,
// sDocumentPoolDir, sDocumentPoolName, m_sMailAddress,
diff --git a/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java b/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java
index d209d9f89c8b..154594ad8c67 100644
--- a/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java
+++ b/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java
@@ -969,7 +969,6 @@ public class OpenOfficePostscriptCreator implements IOffice
}
Object[] aElements = null;
- String[] aExtensions;
try
{
aElements = (Object[]) aNameAccess.getByName(_sFilterName);
@@ -1047,7 +1046,6 @@ public class OpenOfficePostscriptCreator implements IOffice
}
Object[] aElements = null;
- String[] aExtensions;
try
{
aElements = (Object[]) aNameAccess.getByName(_sFilterName);
@@ -1227,13 +1225,6 @@ public class OpenOfficePostscriptCreator implements IOffice
String sFilterName = _aGTA.getExportFilterName();
- // check how many Properties should initialize
- int nPropertyCount = 0;
- // if (sFilterName != null && sFilterName.length() > 0)
- // {
- // nPropertyCount ++;
- // }
-
// initialize PropertyArray
// PropertyValue [] aStoreProps = new PropertyValue[ nPropertyCount ];
// int nPropertyIndex = 0;
@@ -1400,14 +1391,11 @@ public class OpenOfficePostscriptCreator implements IOffice
}
}
- private boolean m_bStoreFile;
public void disallowStore()
{
- m_bStoreFile = false;
}
public void allowStore()
{
- m_bStoreFile = true;
}
public boolean isStoreAllowed()
{
diff --git a/qadevOOo/runner/graphical/PerformanceContainer.java b/qadevOOo/runner/graphical/PerformanceContainer.java
index 7f7ff5c2e3e9..c5d2bb1ae462 100644
--- a/qadevOOo/runner/graphical/PerformanceContainer.java
+++ b/qadevOOo/runner/graphical/PerformanceContainer.java
@@ -29,8 +29,6 @@ import java.io.RandomAccessFile;
public class PerformanceContainer /* extends *//* implements */ {
- private long m_nStartTime;
-
/*
simple helper functions to start/stop a timer, to know how long a process need in milliseconds
*/
@@ -40,7 +38,6 @@ public class PerformanceContainer /* extends *//* implements */ {
}
public void setStartTime(long _nStartTime)
{
- m_nStartTime = _nStartTime;
}
/*
diff --git a/qadevOOo/runner/graphical/TimeHelper.java b/qadevOOo/runner/graphical/TimeHelper.java
index c64134fc3eed..e85e5c7746cb 100644
--- a/qadevOOo/runner/graphical/TimeHelper.java
+++ b/qadevOOo/runner/graphical/TimeHelper.java
@@ -43,14 +43,11 @@ public class TimeHelper
private int m_nMilliSeconds;
private long m_nRealMilliSeconds;
- private boolean m_bIsStopped = false;
-
public TimeHelper()
{}
public void start()
{
- m_bIsStopped = false;
Calendar cal = Calendar.getInstance();
m_nSeconds = cal.get(Calendar.SECOND);
m_nMilliSeconds = cal.get(Calendar.MILLISECOND);
@@ -58,7 +55,6 @@ public class TimeHelper
public void stop()
{
Calendar cal = Calendar.getInstance();
- m_bIsStopped = true;
int nSeconds = cal.get(Calendar.SECOND);
m_nSeconds = nSeconds - m_nSeconds;
if (m_nSeconds < 0)
generated by cgit (git 2.34.1) at 2024-06-30 15:24:54 +0000