diff options
author | Dani Megert | 2013-09-04 16:44:23 +0000 |
---|---|---|
committer | Dani Megert | 2013-09-04 16:44:23 +0000 |
commit | 17d798dfc89ba85eea434860a000ace1d57b3817 (patch) | |
tree | 35009f12a70f5a5431e01b7a560430ab39c86732 /org.eclipse.ua.tests/help/org | |
parent | cda00927ee7d1aa447e7f1d987dddaff7b760821 (diff) | |
download | eclipse.platform.ua-17d798dfc89ba85eea434860a000ace1d57b3817.tar.gz eclipse.platform.ua-17d798dfc89ba85eea434860a000ace1d57b3817.tar.xz eclipse.platform.ua-17d798dfc89ba85eea434860a000ace1d57b3817.zip |
Replaced deprecated junit.framework.Assert
Diffstat (limited to 'org.eclipse.ua.tests/help/org')
7 files changed, 30 insertions, 21 deletions
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/preferences/HelpDataTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/preferences/HelpDataTest.java index 4e018d0c2..045ee09c2 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/preferences/HelpDataTest.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/preferences/HelpDataTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2011 IBM Corporation and others. + * Copyright (c) 2006, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -16,18 +16,20 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import junit.framework.Assert; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.eclipse.core.runtime.Platform; -import org.eclipse.core.runtime.preferences.IEclipsePreferences; -import org.eclipse.core.runtime.preferences.InstanceScope; +import org.junit.Assert; + import org.eclipse.help.internal.HelpData; import org.eclipse.help.internal.HelpPlugin; import org.eclipse.ua.tests.plugin.UserAssistanceTestPlugin; +import org.eclipse.core.runtime.Platform; +import org.eclipse.core.runtime.preferences.IEclipsePreferences; +import org.eclipse.core.runtime.preferences.InstanceScope; + /* * Tests the help data ordering of tocs and hiding tocs, indexes, etc. */ diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/preferences/ProductPreferencesTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/preferences/ProductPreferencesTest.java index 28e714a3b..0dd7bea7d 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/preferences/ProductPreferencesTest.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/preferences/ProductPreferencesTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2011 IBM Corporation and others. + * Copyright (c) 2006, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -16,11 +16,12 @@ import java.util.Properties; import java.util.Set; import java.util.StringTokenizer; -import junit.framework.Assert; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.junit.Assert; + import org.eclipse.help.internal.util.ProductPreferences; import org.eclipse.ua.tests.plugin.UserAssistanceTestPlugin; diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/ExtraDirTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/ExtraDirTest.java index a588c06e5..ace37d534 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/ExtraDirTest.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/ExtraDirTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2011 IBM Corporation and others. + * Copyright (c) 2006, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -17,13 +17,12 @@ import java.util.List; import java.util.Set; import java.util.StringTokenizer; -import junit.framework.Assert; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.core.runtime.Platform; +import org.junit.Assert; + import org.eclipse.help.internal.base.BaseHelpSystem; import org.eclipse.help.internal.search.ISearchQuery; import org.eclipse.help.internal.search.SearchHit; @@ -34,6 +33,9 @@ import org.eclipse.help.internal.workingset.AdaptableToc; import org.eclipse.help.internal.workingset.WorkingSet; import org.eclipse.help.internal.workingset.WorkingSetManager; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Platform; + public class ExtraDirTest extends TestCase { /* diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/SearchTestUtils.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/SearchTestUtils.java index c4301a66d..2cca0fb46 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/SearchTestUtils.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/SearchTestUtils.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2011 IBM Corporation and others. + * Copyright (c) 2008, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -17,15 +17,16 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Set; -import junit.framework.Assert; +import org.junit.Assert; -import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.help.internal.base.BaseHelpSystem; import org.eclipse.help.internal.search.ISearchQuery; import org.eclipse.help.internal.search.SearchHit; import org.eclipse.help.internal.search.SearchQuery; import org.eclipse.help.internal.search.SearchResults; +import org.eclipse.core.runtime.NullProgressMonitor; + public class SearchTestUtils { public static void searchAllLocales(String searchWord, String[] hrefs) { diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/util/LoadServletUtil.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/util/LoadServletUtil.java index ebdda49e6..8fc1fb362 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/util/LoadServletUtil.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/util/LoadServletUtil.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2011 IBM Corporation and others. + * Copyright (c) 2009, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -15,11 +15,12 @@ import java.io.InputStream; import java.net.URL; import java.net.URLConnection; -import junit.framework.Assert; +import org.junit.Assert; -import org.eclipse.core.runtime.CoreException; import org.eclipse.help.internal.server.WebappManager; +import org.eclipse.core.runtime.CoreException; + public class LoadServletUtil { private static long uniqueParam = System.currentTimeMillis(); diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/util/ParallelTestSupport.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/util/ParallelTestSupport.java index d9b2910a0..39b2b7cbe 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/util/ParallelTestSupport.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/util/ParallelTestSupport.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010 IBM Corporation and others. + * Copyright (c) 2010, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -11,7 +11,8 @@ package org.eclipse.ua.tests.help.util; -import junit.framework.Assert; +import org.junit.Assert; + public class ParallelTestSupport { diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/HelpServerInterrupt.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/HelpServerInterrupt.java index e0e3387b7..5505663b1 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/HelpServerInterrupt.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/HelpServerInterrupt.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2011 IBM Corporation and others. + * Copyright (c) 2009, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -15,9 +15,10 @@ import java.io.InputStream; import java.net.URL; import java.net.URLConnection; -import junit.framework.Assert; import junit.framework.TestCase; +import org.junit.Assert; + import org.eclipse.help.internal.server.WebappManager; /** |