Skip to content

Commit

Permalink
Restore SharedInstallTestsProfileSpoofEnabledConfigured.suite()
Browse files Browse the repository at this point in the history
A bigger change will be needed to get rid of this suite methods thus
reverting it.
  • Loading branch information
akurtakov committed Dec 17, 2024
1 parent 761ff93 commit bc38ead
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 7 deletions.
Original file line number Diff line number Diff line change
@@ -1,29 +1,27 @@
/*******************************************************************************
* Copyright (c) 2008, 2013 IBM Corporation and others.
*
* This program and the accompanying materials
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
*
*
* Contributors:
* IBM Corporation - initial API and implementation
* Red Hat, Inc. - Fragment support added.
*******************************************************************************/
package org.eclipse.equinox.p2.tests.reconciler.dropins;

import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
import junit.framework.*;
import org.eclipse.equinox.p2.tests.sharedinstall.AbstractSharedInstallTest;

/**
* To run the reconciler tests, you must perform some manual setup steps:
* 1) Download the platform runtime binary zip (latest build or the one you want to test).
* 2) Set the following system property to the file system path of the binary zip. For example:
*
*
* -Dorg.eclipse.equinox.p2.reconciler.tests.platform.archive=c:/tmp/eclipse-platform-3.4-win32.zip
*/
public class AllTests extends TestCase {
Expand All @@ -36,7 +34,7 @@ public static Test suite() {
suite.addTest(SharedInstallTests.suite());
suite.addTest(SharedInstallTestsProfileSpoofEnabled.suite());
if (!AbstractSharedInstallTest.WINDOWS) {
suite.addTestSuite(SharedInstallTestsProfileSpoofEnabledConfigured.class);
suite.addTest(SharedInstallTestsProfileSpoofEnabledConfigured.suite());
}
suite.addTest(Bug362692.suite());
return suite;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
import java.io.IOException;
import java.io.InputStream;
import java.util.Properties;
import junit.framework.Test;
import junit.framework.TestSuite;
import org.eclipse.core.runtime.Platform;
import org.eclipse.equinox.internal.p2.updatesite.Activator;
import org.eclipse.equinox.p2.tests.sharedinstall.AbstractSharedInstallTest;
Expand All @@ -27,6 +29,15 @@ public class SharedInstallTestsProfileSpoofEnabledConfigured extends SharedInsta

private File extensions;

public static Test suite() {
TestSuite suite = new ReconcilerTestSuite();
suite.setName(SharedInstallTestsProfileSpoofEnabledConfigured.class.getName());
suite.addTest(new SharedInstallTestsProfileSpoofEnabledConfigured("testBasicStartup"));
suite.addTest(new SharedInstallTestsProfileSpoofEnabledConfigured("testReadOnlyDropinsStartup"));
suite.addTest(new SharedInstallTestsProfileSpoofEnabledConfigured("testUserDropinsStartup"));
return suite;
}

/*
* Constructor for the class.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ Bundle-SymbolicName: org.eclipse.equinox.p2.examples.rcp.discovery;singleton:=tr
Bundle-Version: 2.3.100.qualifier
Bundle-Activator: org.eclipse.equinox.p2.examples.rcp.cloud.Activator
Bundle-Localization: plugin
Bundle-Vendor: Eclipse.org - Equinox
Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
org.eclipse.core.runtime,
org.eclipse.equinox.p2.operations;bundle-version="2.0.0",
Expand Down

0 comments on commit bc38ead

Please sign in to comment.