Bug 536183 - [AFViewpoints] NPE in Policychecker

 - fix NPE in PolicyChecker.isInViewpoint
 - add unit test for PolicyChecker
 - add test in infra Test suite (to be executed in build)
 - quality fix in policy plugin
 - remove remaining pom of a deleted plugin

Change-Id: I532ef62dcccbfcd11f8ceda5d190705fffa36c36
Signed-off-by: Benoit Maggi <benoit.maggi@cea.fr>

7 files changed, 79 insertions, 18 deletions

diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/META-INF/MANIFEST.MF
index 9a8c28bb44a..cbdcd05c25d 100755
--- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/META-INF/MANIFEST.MF
@@ -38,5 +38,6 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.gmfdiag.menu.tests;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.papyrus.infra.gmfdiag.css.tests;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.papyrus.infra.emf.expressions.tests;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.papyrus.infra.internationalization.tests;bundle-version="[1.0.0,2.0.0)"
+ org.eclipse.papyrus.infra.internationalization.tests;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.infra.viewpoints.policy.tests;bundle-version="1.2.0"
 Automatic-Module-Name: org.eclipse.papyrus.infra.suite.tests
diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/test/org/eclipse/papyrus/infra/suite/tests/AllTests.java b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/test/org/eclipse/papyrus/infra/suite/tests/AllTests.java
index 777e484f0a1..7ea7a8607c4 100755
--- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/test/org/eclipse/papyrus/infra/suite/tests/AllTests.java
+++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/test/org/eclipse/papyrus/infra/suite/tests/AllTests.java
@@ -72,6 +72,10 @@ public class AllTests {
 		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.internationalization.tests.tests.AllTests.class));
 
 
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.viewpoints.policy.tests.AllTests.class));
+		
+
+
 		// end
 	}
 
diff --git a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/pom.xml b/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/pom.xml
deleted file mode 100644
index 0a16904426a..00000000000
--- a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/pom.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	  	<groupId>org.eclipse.papyrus.tests</groupId>
-	  	<artifactId>org.eclipse.papyrus.infra.viewpoints.tests.releng</artifactId>
-	  	<version>1.2.0-SNAPSHOT</version>	
-	</parent>
-	<groupId>org.eclipse.papyrus.tests</groupId>
-	<artifactId>org.eclipse.papyrus.infra.viewpoints.configuration.tests</artifactId>
-	<packaging>eclipse-test-plugin</packaging>
-</project>
\ No newline at end of file
diff --git a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy.tests/META-INF/MANIFEST.MF
index c38b0d1f1df..27940e5c96b 100644
--- a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy.tests/META-INF/MANIFEST.MF
@@ -6,7 +6,10 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.11.0",
  org.junit;bundle-version="4.11.0";visibility:=reexport,
  org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.9.0",
  org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)"
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
+ org.eclipse.papyrus.infra.architecture;bundle-version="2.0.0",
+ org.eclipse.papyrus.infra.architecture.representation;bundle-version="2.0.0",
+ org.eclipse.papyrus.infra.gmfdiag.representation;bundle-version="2.0.0"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
diff --git a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy.tests/pom.xml b/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy.tests/pom.xml
index e25dc9dc643..33d4237bd6d 100644
--- a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy.tests/pom.xml
+++ b/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy.tests/pom.xml
@@ -7,7 +7,6 @@
 	  	<artifactId>org.eclipse.papyrus.infra.viewpoints.tests.releng</artifactId>
 	  	<version>1.2.0-SNAPSHOT</version>	
 	</parent>
-	<groupId>org.eclipse.papyrus.tests</groupId>
 	<artifactId>org.eclipse.papyrus.infra.viewpoints.policy.tests</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy.tests/src/org/eclipse/papyrus/infra/viewpoints/policy/tests/AllTests.java b/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy.tests/src/org/eclipse/papyrus/infra/viewpoints/policy/tests/AllTests.java
index fd0f7ff75a9..bd0f1cec02b 100644
--- a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy.tests/src/org/eclipse/papyrus/infra/viewpoints/policy/tests/AllTests.java
+++ b/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy.tests/src/org/eclipse/papyrus/infra/viewpoints/policy/tests/AllTests.java
@@ -22,8 +22,10 @@ import org.junit.runners.Suite.SuiteClasses;
  * The master test suite for the plug-in.
  */
 @RunWith(ClassificationSuite.class)
-@SuiteClasses(ViewPrototypeTest.class)
+@SuiteClasses({
+	ViewPrototypeTest.class,
+	PolicyCheckerTest.class
+	})
 @Headless
 public class AllTests {
-	// Nothing required
 }
diff --git a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy.tests/src/org/eclipse/papyrus/infra/viewpoints/policy/tests/PolicyCheckerTest.java b/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy.tests/src/org/eclipse/papyrus/infra/viewpoints/policy/tests/PolicyCheckerTest.java
new file mode 100644
index 00000000000..ff38c5f34e0
--- /dev/null
+++ b/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy.tests/src/org/eclipse/papyrus/infra/viewpoints/policy/tests/PolicyCheckerTest.java
@@ -0,0 +1,65 @@
+/*****************************************************************************
+ * Copyright (c) 2018 CEA LIST 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
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - Initial API and implementation
+ *   
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.viewpoints.policy.tests;
+
+import java.util.Collection;
+
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureDescriptionLanguage;
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureDomain;
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureFactory;
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureViewpoint;
+import org.eclipse.papyrus.infra.core.architecture.merged.MergedArchitectureContext;
+import org.eclipse.papyrus.infra.core.architecture.merged.MergedArchitectureDomain;
+import org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram;
+import org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationFactory;
+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ *
+ */
+@SuppressWarnings("nls")
+public class PolicyCheckerTest {
+
+	@Test
+	public void testIsInViewpoint() {
+
+		ArchitectureDomain architectureDomain = ArchitectureFactory.eINSTANCE.createArchitectureDomain();
+		ArchitectureDescriptionLanguage architectureDescriptionLanguage = ArchitectureFactory.eINSTANCE.createArchitectureDescriptionLanguage();
+		architectureDescriptionLanguage.setDomain(architectureDomain);
+		ArchitectureViewpoint architectureViewpoint = ArchitectureFactory.eINSTANCE.createArchitectureViewpoint();
+		architectureDescriptionLanguage.getViewpoints().add(architectureViewpoint);
+		
+		PapyrusDiagram knownDiagram = RepresentationFactory.eINSTANCE.createPapyrusDiagram();
+		knownDiagram.setName("knownDiagram");
+		architectureViewpoint.getRepresentationKinds().add(knownDiagram);
+
+		PapyrusDiagram unknownDiagram = RepresentationFactory.eINSTANCE.createPapyrusDiagram();
+		unknownDiagram.setName("unknownDiagram");
+
+		MergedArchitectureDomain mergedArchitectureDomain = new MergedArchitectureDomain();
+		mergedArchitectureDomain.merge(architectureDomain);
+		
+		Collection<MergedArchitectureContext> contexts = mergedArchitectureDomain.getContexts();
+		MergedArchitectureContext next = contexts.iterator().next();
+		PolicyChecker policyChecker = PolicyChecker.getFor(next);
+		Assert.assertTrue(policyChecker.isInViewpoint(knownDiagram));
+		Assert.assertFalse(policyChecker.isInViewpoint(unknownDiagram));
+		Assert.assertFalse(policyChecker.isInViewpoint(null)); 
+	}
+	
+
+	
+
+}