diff options
author | Noel Grandin <noel@peralex.com> | 2014-12-11 16:25:29 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2014-12-12 08:16:17 +0000 |
commit | 117a82cd090ddd8efbc500350dc6082730f04720 (patch) | |
tree | 50c07684d43c06fd54d17532caca6a3afafd6967 /qadevOOo/runner/lib | |
parent | 04b183a9bc792a53a9f081353a79486faa4f3872 (diff) |
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 <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'qadevOOo/runner/lib')
-rw-r--r-- | qadevOOo/runner/lib/MultiMethodTest.java | 10 | ||||
-rw-r--r-- | qadevOOo/runner/lib/Parameters.java | 164 | ||||
-rw-r--r-- | qadevOOo/runner/lib/SimpleStatus.java | 7 | ||||
-rw-r--r-- | qadevOOo/runner/lib/Status.java | 31 | ||||
-rw-r--r-- | qadevOOo/runner/lib/TestResult.java | 8 |
5 files changed, 0 insertions, 220 deletions
diff --git a/qadevOOo/runner/lib/MultiMethodTest.java b/qadevOOo/runner/lib/MultiMethodTest.java index aabd919054e3..e7bf886c3223 100644 --- a/qadevOOo/runner/lib/MultiMethodTest.java +++ b/qadevOOo/runner/lib/MultiMethodTest.java @@ -98,16 +98,6 @@ public class MultiMethodTest private final ArrayList<String> methCalled = new ArrayList<String>(10); /** - * Disposes the test environment, which was corrupted by the test. - * - * @param tEnv the environment to dispose - */ - public void disposeEnvironment(TestEnvironment tEnv) - { - disposeEnvironment(); - } - - /** * Disposes the current test environment, which was corrupted by the test. * * @see #disposeEnvironment(TestEnvironment) diff --git a/qadevOOo/runner/lib/Parameters.java b/qadevOOo/runner/lib/Parameters.java deleted file mode 100644 index 0e1f6ea242f1..000000000000 --- a/qadevOOo/runner/lib/Parameters.java +++ /dev/null @@ -1,164 +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 lib; - -import java.util.Iterator; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - -import com.sun.star.beans.Property; -import com.sun.star.beans.XPropertySet; -import com.sun.star.beans.XPropertySetInfo; -import com.sun.star.beans.XPropertyChangeListener; -import com.sun.star.beans.XVetoableChangeListener; -import com.sun.star.beans.UnknownPropertyException; -import com.sun.star.uno.Type; - -/** - * Parameters is a container of String parameters. - */ -public class Parameters implements XPropertySet { - final private Map<String, Object> parameters; - private final Parameters defaults; - private Property[] props; - - public Parameters(Map<String, Object> params) { - this (params, null); - } - - private Parameters(Map<String, Object> params, Parameters defaultParams) { - parameters = params; - defaults = defaultParams; - checkParameters(parameters); - - Set<String> paramSet = new HashSet<String>(parameters.keySet()); - - if (defaults != null) { - Set<String> defSet = defaults.toMap().keySet(); - paramSet.addAll(defSet); - } - - props = new Property[paramSet.size()]; - - int num = 0; - - for (Iterator<String> i = paramSet.iterator(); i.hasNext(); num++) { - String name = i.next(); - - props[num] = new Property(name, num, new Type(String.class), (short)0); - } - } - - - public String get(String paramName) { - Object res = parameters.get(paramName); - - if (res instanceof String) - return (String)res; - - if (defaults != null) - return defaults.get(paramName); - - return null; - } - - public Object getPropertyValue(String name) { - Object erg = parameters.get(name); - if (erg == null && defaults != null) - return defaults.getPropertyValue(name); - return erg; - } - - public void setPropertyValue(String name, Object value) { - parameters.put(name, value); - int size = props.length; - Property[] addProps = new Property[size+1]; - System.arraycopy(props, 0, addProps, 0, size); - addProps[size] = new Property(name, size, new Type(value.getClass()), (short)0); - props = addProps; - } - - public void addVetoableChangeListener(String name, XVetoableChangeListener l) { - } - - public void removeVetoableChangeListener(String name, XVetoableChangeListener l) { - } - - public void addPropertyChangeListener(String name, XPropertyChangeListener l) { - } - - public void removePropertyChangeListener(String name, XPropertyChangeListener l) { - } - - public XPropertySetInfo getPropertySetInfo() { - return new XPropertySetInfo() { - public Property[] getProperties() { - return props; - } - - public boolean hasPropertyByName(String name) { - for (int i = 0; i < props.length; i++) { - Property prop = props[i]; - - if (prop.Name.equals(name)) { - return true; - } - } - - return false; - } - - public Property getPropertyByName(String name) throws UnknownPropertyException { - for (int i = 0; i < props.length; i++) { - Property prop = props[i]; - - if (prop.Name.equals(name)) { - return prop; - } - } - - throw new UnknownPropertyException(name); - } - }; - } - - private Map<String,Object> toMap() { - return new HashMap<String,Object>(parameters) { - }; - } - - private static void checkParameters(Map<String, Object> params) { - for (Iterator<String> i = params.keySet().iterator(); i.hasNext();) { - Object key = i.next(); - - if (!(key instanceof String)) { - throw new IllegalArgumentException( - "Wrong key " + key + ", it should be of String type"); - } - } - } - - - - - - -} diff --git a/qadevOOo/runner/lib/SimpleStatus.java b/qadevOOo/runner/lib/SimpleStatus.java index 631ecc5b2f2f..6866d7e7a24d 100644 --- a/qadevOOo/runner/lib/SimpleStatus.java +++ b/qadevOOo/runner/lib/SimpleStatus.java @@ -37,11 +37,6 @@ class SimpleStatus { public final static int EXCEPTION = 3; /** - * The constant represents EXCLUDED runtime state. - */ - public final static int EXCLUDED = 2; - - /** * The constant represents SKIPPED runtime state. */ public final static int SKIPPED = 1; @@ -84,8 +79,6 @@ class SimpleStatus { this.runState = runState; if ( runState == PASSED ) { runStateString = "PASSED"; - } else if ( runState == EXCLUDED ) { - runStateString = "EXCLUDED"; } else if ( runState == SKIPPED ) { runStateString = "SKIPPED"; } else if ( runState == EXCEPTION ) { diff --git a/qadevOOo/runner/lib/Status.java b/qadevOOo/runner/lib/Status.java index b2b76daa7935..5bf86fd86888 100644 --- a/qadevOOo/runner/lib/Status.java +++ b/qadevOOo/runner/lib/Status.java @@ -119,41 +119,10 @@ public class Status extends SimpleStatus { } /** - * Checks whether the status runstate is skipped. - */ - public boolean isSkipped() { - return getRunState() == SKIPPED; - } - - /** - * Checks whether the status runstate is excluded. - */ - public boolean isExcluded() { - return getRunState() == EXCLUDED; - } - - /** - * Checks whether the status runstate is exception. - */ - public boolean isException() { - return getRunState() == EXCEPTION; - } - - /** * Checks whether the status state is failed. */ public boolean isFailed() { return !getState(); } - /** - * Checks whether the status state is ok. - */ - public boolean isOK() { - return getState(); - } - - public String getDescription () { - return getRunStateString(); - } } diff --git a/qadevOOo/runner/lib/TestResult.java b/qadevOOo/runner/lib/TestResult.java index eb7a469cdc99..347455da524e 100644 --- a/qadevOOo/runner/lib/TestResult.java +++ b/qadevOOo/runner/lib/TestResult.java @@ -67,14 +67,6 @@ public class TestResult { } /** - * @return methods available in the interface tested. - */ - public String[] getTestedMethods() { - return testedMethods.keySet().toArray( - new String[testedMethods.size()]); - } - - /** * @return <tt>true</tt> if the method belongs to the interface tested, * <tt>false</tt> otherwise. */ |