From 6ef8e899f3503c655a1c528a2d33442dc722e90d Mon Sep 17 00:00:00 2001 From: Philippe DUL Date: Mon, 25 May 2020 20:13:19 +0200 Subject: [PATCH] [562834] Exclude source plugins as they are generated Bug: 562834 Change-Id: Ie7097841a59c8f07871db157a3af39e9e4067855 Signed-off-by: Philippe DUL --- .../capella/test/platform/ju/testcases/AboutInfoTest.java | 4 ++-- .../capella/test/platform/ju/testcases/LicenceTest.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/plugins/org.polarsys.capella.test.platform.ju/src/org/polarsys/capella/test/platform/ju/testcases/AboutInfoTest.java b/tests/plugins/org.polarsys.capella.test.platform.ju/src/org/polarsys/capella/test/platform/ju/testcases/AboutInfoTest.java index 2210d41e22..d84eda62fa 100644 --- a/tests/plugins/org.polarsys.capella.test.platform.ju/src/org/polarsys/capella/test/platform/ju/testcases/AboutInfoTest.java +++ b/tests/plugins/org.polarsys.capella.test.platform.ju/src/org/polarsys/capella/test/platform/ju/testcases/AboutInfoTest.java @@ -57,7 +57,7 @@ public void test() throws Exception { for (IPluginModelBase base : PDECore.getDefault().getModelManager().getActiveModels()) { MultiStatus status = statuses.computeIfAbsent(base, x -> new MultiStatus(id, Status.OK, "ok", null)); - if (base.getPluginBase().getId().contains("org.polarsys.capella")) { + if (base.getPluginBase().getId().contains("org.polarsys.capella") && !base.getPluginBase().getId().endsWith(".source")) { if (!"%pluginName".equals(base.getPluginBase().getName())) { status.add(new Status(Status.WARNING, id, "[MANIFEST.MF] name not %pluginName")); } @@ -88,7 +88,7 @@ public void test() throws Exception { for (IFeatureModel feature : PDECore.getDefault().getFeatureModelManager().getModels()) { MultiStatus status = statuses.computeIfAbsent(feature, x -> new MultiStatus(id, Status.OK, "ok", null)); - if (feature.getFeature().getId().contains("org.polarsys.capella")) { + if (feature.getFeature().getId().contains("org.polarsys.capella") && !feature.getFeature().getId().endsWith(".source")) { Properties featureProperties = getProperties(feature, "feature.properties"); // All feature.properties must contain a licenseURL towards the licence.html diff --git a/tests/plugins/org.polarsys.capella.test.platform.ju/src/org/polarsys/capella/test/platform/ju/testcases/LicenceTest.java b/tests/plugins/org.polarsys.capella.test.platform.ju/src/org/polarsys/capella/test/platform/ju/testcases/LicenceTest.java index 7bb9eec124..293aa3888a 100644 --- a/tests/plugins/org.polarsys.capella.test.platform.ju/src/org/polarsys/capella/test/platform/ju/testcases/LicenceTest.java +++ b/tests/plugins/org.polarsys.capella.test.platform.ju/src/org/polarsys/capella/test/platform/ju/testcases/LicenceTest.java @@ -55,7 +55,7 @@ public void test() throws Exception { for (IPluginModelBase base : PDECore.getDefault().getModelManager().getActiveModels()) { MultiStatus status = statuses.computeIfAbsent(base, x -> new MultiStatus(id, Status.OK, "ok", null)); - if (base.getPluginBase().getId().contains("org.polarsys.capella")) { + if (base.getPluginBase().getId().contains("org.polarsys.capella") && !base.getPluginBase().getId().endsWith(".source")) { // All plugins must contain an EPL-2.0 license.html String content = getContent(base, "about.html"); @@ -72,7 +72,7 @@ public void test() throws Exception { for (IFeatureModel feature : PDECore.getDefault().getFeatureModelManager().getModels()) { MultiStatus status = statuses.computeIfAbsent(feature, x -> new MultiStatus(id, Status.OK, "ok", null)); - if (feature.getFeature().getId().contains("org.polarsys.capella")) { + if (feature.getFeature().getId().contains("org.polarsys.capella") && !feature.getFeature().getId().endsWith(".source")) { // All features must contains an EPL-2.0 license.html String content = getContent(feature, "license.html");