aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeneviève Bastien2014-07-09 11:19:40 (EDT)
committerDavid Williams2014-07-26 12:16:31 (EDT)
commit50fdf239b08b27a02d63c934a3fee8b341686f45 (patch)
treebe5e7d5247f16ec7facf07108dee1be5db405e51
parent0834385d36432020db4288e27e8ae4309b4e11a2 (diff)
downloadeclipse.platform.releng-50fdf239b08b27a02d63c934a3fee8b341686f45.zip
eclipse.platform.releng-50fdf239b08b27a02d63c934a3fee8b341686f45.tar.gz
eclipse.platform.releng-50fdf239b08b27a02d63c934a3fee8b341686f45.tar.bz2
Performance Tests: Remove a few deprecation warningsrefs/changes/48/29748/2
And make the date pattern compatible with years 2010+ Change-Id: I5d07bf22350d493370bbcb42175a793c953fe0c3 Signed-off-by: Geneviève Bastien <gbastien+lttng@versatic.net>
-rw-r--r--bundles/org.eclipse.test.performance/src/org/eclipse/test/internal/performance/PerformanceTestPlugin.java2
-rw-r--r--bundles/org.eclipse.test.performance/src/org/eclipse/test/internal/performance/data/Sample.java3
-rw-r--r--bundles/org.eclipse.test.performance/src/org/eclipse/test/internal/performance/db/DB.java5
-rw-r--r--bundles/org.eclipse.test.performance/src/org/eclipse/test/internal/performance/db/Scenario.java2
-rw-r--r--bundles/org.eclipse.test.performance/src/org/eclipse/test/internal/performance/eval/Evaluator.java2
-rw-r--r--bundles/org.eclipse.test.performance/src/org/eclipse/test/internal/performance/eval/StatisticsSession.java3
6 files changed, 8 insertions, 9 deletions
diff --git a/bundles/org.eclipse.test.performance/src/org/eclipse/test/internal/performance/PerformanceTestPlugin.java b/bundles/org.eclipse.test.performance/src/org/eclipse/test/internal/performance/PerformanceTestPlugin.java
index a2f8279..0304dda 100644
--- a/bundles/org.eclipse.test.performance/src/org/eclipse/test/internal/performance/PerformanceTestPlugin.java
+++ b/bundles/org.eclipse.test.performance/src/org/eclipse/test/internal/performance/PerformanceTestPlugin.java
@@ -371,6 +371,8 @@ public class PerformanceTestPlugin extends Plugin {
case IStatus.WARNING:
System.err.println("Warning: " + status.getMessage()); //$NON-NLS-1$
break;
+ default:
+ break;
}
Throwable exception= status.getException();
if (exception != null)
diff --git a/bundles/org.eclipse.test.performance/src/org/eclipse/test/internal/performance/data/Sample.java b/bundles/org.eclipse.test.performance/src/org/eclipse/test/internal/performance/data/Sample.java
index ae23826..0d3f7fb 100644
--- a/bundles/org.eclipse.test.performance/src/org/eclipse/test/internal/performance/data/Sample.java
+++ b/bundles/org.eclipse.test.performance/src/org/eclipse/test/internal/performance/data/Sample.java
@@ -14,8 +14,7 @@ import java.util.Map;
import java.util.Set;
import org.eclipse.test.performance.Dimension;
-
-import junit.framework.Assert;
+import org.junit.Assert;
/**
* @since 3.1
diff --git a/bundles/org.eclipse.test.performance/src/org/eclipse/test/internal/performance/db/DB.java b/bundles/org.eclipse.test.performance/src/org/eclipse/test/internal/performance/db/DB.java
index 4329165..b6d6d38 100644
--- a/bundles/org.eclipse.test.performance/src/org/eclipse/test/internal/performance/db/DB.java
+++ b/bundles/org.eclipse.test.performance/src/org/eclipse/test/internal/performance/db/DB.java
@@ -27,8 +27,6 @@ import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import junit.framework.Assert;
-
import org.eclipse.test.internal.performance.InternalPerformanceMeter;
import org.eclipse.test.internal.performance.PerformanceTestPlugin;
import org.eclipse.test.internal.performance.data.DataPoint;
@@ -38,6 +36,7 @@ import org.eclipse.test.internal.performance.data.Scalar;
import org.eclipse.test.internal.performance.eval.StatisticsSession;
import org.eclipse.test.performance.Dimension;
import org.eclipse.test.performance.Performance;
+import org.junit.Assert;
public class DB {
@@ -612,7 +611,7 @@ public class DB {
String[] names= (String[])values.toArray(new String[values.size()]);
boolean sort= true;
- Pattern pattern= Pattern.compile("200[3-9][01][0-9][0-3][0-9]"); //$NON-NLS-1$
+ Pattern pattern= Pattern.compile("20[0-9][3-9][01][0-9][0-3][0-9]"); //$NON-NLS-1$
final Matcher matcher= pattern.matcher(""); //$NON-NLS-1$
for (int i= 0; i < names.length; i++) {
matcher.reset(names[i]);
diff --git a/bundles/org.eclipse.test.performance/src/org/eclipse/test/internal/performance/db/Scenario.java b/bundles/org.eclipse.test.performance/src/org/eclipse/test/internal/performance/db/Scenario.java
index a5ec83e..d5372be 100644
--- a/bundles/org.eclipse.test.performance/src/org/eclipse/test/internal/performance/db/Scenario.java
+++ b/bundles/org.eclipse.test.performance/src/org/eclipse/test/internal/performance/db/Scenario.java
@@ -18,7 +18,7 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.eclipse.test.internal.performance.data.DataPoint;
import org.eclipse.test.internal.performance.data.Dim;
diff --git a/bundles/org.eclipse.test.performance/src/org/eclipse/test/internal/performance/eval/Evaluator.java b/bundles/org.eclipse.test.performance/src/org/eclipse/test/internal/performance/eval/Evaluator.java
index ea4b616..0cc62b3 100644
--- a/bundles/org.eclipse.test.performance/src/org/eclipse/test/internal/performance/eval/Evaluator.java
+++ b/bundles/org.eclipse.test.performance/src/org/eclipse/test/internal/performance/eval/Evaluator.java
@@ -11,7 +11,6 @@
package org.eclipse.test.internal.performance.eval;
import java.util.HashSet;
-import junit.framework.Assert;
import org.eclipse.test.internal.performance.InternalPerformanceMeter;
import org.eclipse.test.internal.performance.PerformanceTestPlugin;
@@ -21,6 +20,7 @@ import org.eclipse.test.internal.performance.data.Sample;
import org.eclipse.test.internal.performance.db.DB;
import org.eclipse.test.internal.performance.db.Variations;
import org.eclipse.test.performance.PerformanceMeter;
+import org.junit.Assert;
/**
* The default implementation of an evaluator backed by a database.
diff --git a/bundles/org.eclipse.test.performance/src/org/eclipse/test/internal/performance/eval/StatisticsSession.java b/bundles/org.eclipse.test.performance/src/org/eclipse/test/internal/performance/eval/StatisticsSession.java
index 799bddd..6f4c3dc 100644
--- a/bundles/org.eclipse.test.performance/src/org/eclipse/test/internal/performance/eval/StatisticsSession.java
+++ b/bundles/org.eclipse.test.performance/src/org/eclipse/test/internal/performance/eval/StatisticsSession.java
@@ -20,8 +20,7 @@ import org.eclipse.test.internal.performance.data.DataPoint;
import org.eclipse.test.internal.performance.data.Dim;
import org.eclipse.test.internal.performance.data.Scalar;
import org.eclipse.test.internal.performance.eval.StatisticsUtil.Percentile;
-
-import junit.framework.Assert;
+import org.junit.Assert;
/**
* @since 3.1