Skip to content

Commit

Permalink
Fix BasicP2RepositoryIntegrationTest with 2023-03
Browse files Browse the repository at this point in the history
Bundle id changes.
Simplified setup a bit while at it to be more like rest of the test
suite.
  • Loading branch information
akurtakov committed Sep 28, 2023
1 parent bd9f0b7 commit 11293aa
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion tycho-its/projects/p2Repository/category.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- includes three bundles in different ways; note: the bundles do not require each other -->
<site>
<bundle id="com.sun.el" version="0.0.0"/>
<bundle id="com.sun.el.javax.el" version="0.0.0"/>
<iu id="org.apache.felix.gogo.runtime" version="0.0.0">
<category name="Test Category" />
</iu>
Expand Down
2 changes: 1 addition & 1 deletion tycho-its/projects/p2Repository/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<repository>
<id>test-data-repo</id>
<layout>p2</layout>
<url>${test-data-repo}</url>
<url>${target-platform}</url>
</repository>
</repositories>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2012, 2021 SAP AG and others.
* Copyright (c) 2012, 2023 SAP AG 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
Expand Down Expand Up @@ -38,8 +38,7 @@ public class BasicP2RepositoryIntegrationTest extends AbstractTychoIntegrationTe

@BeforeClass
public static void executeBuild() throws Exception {
verifier = new BasicP2RepositoryIntegrationTest().getVerifier("/p2Repository", false);
verifier.addCliOption("-Dtest-data-repo=" + ResourceUtil.P2Repositories.ECLIPSE_LATEST.toString());
verifier = new BasicP2RepositoryIntegrationTest().getVerifier("/p2Repository", true);
verifier.executeGoal("verify");
verifier.verifyErrorFreeLog();
p2Repo = P2RepositoryTool.forEclipseRepositoryModule(new File(verifier.getBasedir()));
Expand All @@ -48,7 +47,7 @@ public static void executeBuild() throws Exception {
@Test
public void test381377BundleInclusion() {
// check that (separately!) included bundle is there
assertTrue(p2Repo.getBundleArtifact("com.sun.el", "2.2.0.v201303151357").isFile());
assertTrue(p2Repo.getBundleArtifact("com.sun.el.javax.el", "3.0.0").isFile());
}

@Test
Expand Down

0 comments on commit 11293aa

Please sign in to comment.