From 6fabbaf0817f5aae11d8d02bc5a29e5bfddd17b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=8A?= =?UTF-8?q?=D1=80=20=D0=9A=D1=83=D1=80=D1=82=D0=B0=D0=BA=D0=BE=D0=B2?= Date: Thu, 14 Mar 2024 08:28:46 +0200 Subject: [PATCH] Adjust resolving tests for 4.31 With https://github.com/eclipse-equinox/p2/pull/446 and Tycho resolving all possibly needed bundles source bundle ends up there in case it's needed. (cherry picked from commit 15c00f19d6b137554a26a285ab021af31a8a2993) --- .../java/org/eclipse/tycho/p2resolver/P2ResolverTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tycho-core/src/test/java/org/eclipse/tycho/p2resolver/P2ResolverTest.java b/tycho-core/src/test/java/org/eclipse/tycho/p2resolver/P2ResolverTest.java index e129210cc7..0fbcbf73eb 100644 --- a/tycho-core/src/test/java/org/eclipse/tycho/p2resolver/P2ResolverTest.java +++ b/tycho-core/src/test/java/org/eclipse/tycho/p2resolver/P2ResolverTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2022 Sonatype Inc. and others. + * Copyright (c) 2008, 2024 Sonatype Inc. and others. * 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 @@ -222,8 +222,8 @@ public void testBundleUsesSWT() throws Exception { result = singleEnv(impl.resolveTargetDependencies(getTargetPlatform(), projectToResolve)); - assertEquals(3, result.getArtifacts().size()); - assertEquals(3, result.getNonReactorUnits().size()); // + a.jre + assertEquals(4, result.getArtifacts().size()); + assertEquals(4, result.getNonReactorUnits().size()); // + a.jre assertContainsUnit("org.eclipse.swt", result.getNonReactorUnits()); assertContainsUnit("org.eclipse.swt.gtk.linux.x86_64", result.getNonReactorUnits());