diff options
8 files changed, 26 insertions, 54 deletions
diff --git a/policy-core/pom.xml b/policy-core/pom.xml index 81803955..4bfd23ad 100644 --- a/policy-core/pom.xml +++ b/policy-core/pom.xml @@ -3,7 +3,7 @@ ============LICENSE_START======================================================= ONAP Policy Engine - Drools PDP ================================================================================ - Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -30,57 +30,6 @@ <version>1.2.0-SNAPSHOT</version> </parent> - <build> - <plugins> - - <!-- - 'maven-invoker-plugin' is used to build and install two versions of a - Drools artifact, both of which are used in Junit tests. These Maven - projects are invisible to Sonar and SonarQube, so there are no - complaints about multiple projects with the same artifact, and they - don't show up in the list of files or code line counts. - --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-invoker-plugin</artifactId> - <version>3.0.1</version> - <executions> - - <execution> - <id>drools-artifact-1.1</id> - <goals> - <goal>run</goal> - </goals> - <phase>test-compile</phase> - <configuration> - <pom>drools-artifact-1.1/pom.xml</pom> - <goals> - <goal>install</goal> - </goals> - <streamLogs>true</streamLogs> - </configuration> - </execution> - - <execution> - <id>drools-artifact-1.2</id> - <goals> - <goal>run</goal> - </goals> - <phase>test-compile</phase> - <configuration> - <pom>drools-artifact-1.2/pom.xml</pom> - <goals> - <goal>install</goal> - </goals> - <streamLogs>true</streamLogs> - </configuration> - </execution> - - </executions> - </plugin> - </plugins> - </build> - <dependencies> <dependency> <groupId>org.kie</groupId> diff --git a/policy-core/src/test/java/org/onap/policy/drools/core/DroolsContainerTest.java b/policy-core/src/test/java/org/onap/policy/drools/core/DroolsContainerTest.java index a956075e..1da6e011 100644 --- a/policy-core/src/test/java/org/onap/policy/drools/core/DroolsContainerTest.java +++ b/policy-core/src/test/java/org/onap/policy/drools/core/DroolsContainerTest.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * policy-core * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,10 +25,12 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; +import java.nio.file.Paths; import java.util.ArrayList; import java.util.Collection; - +import org.junit.BeforeClass; import org.junit.Test; +import org.onap.policy.drools.util.KieUtils; /** * These tests focus on the following classes: @@ -38,6 +40,27 @@ import org.junit.Test; */ public class DroolsContainerTest { + /** + * This test is centered around the creation of a 'PolicyContainer' + * and 'PolicySession', and the updating of that container to a new + * version. + */ + @BeforeClass + public static void setUp() throws Exception + { + KieUtils.installArtifact + (Paths.get("src/test/resources/drools-artifact-1.1/src/main/resources/META-INF/kmodule.xml").toFile(), + Paths.get("src/test/resources/drools-artifact-1.1/pom.xml").toFile(), + "src/main/resources/rules/org/onap/policy/drools/core/test/rules.drl", + Paths.get("src/test/resources/drools-artifact-1.1/src/main/resources/rules.drl").toFile()); + + KieUtils.installArtifact + (Paths.get("src/test/resources/drools-artifact-1.2/src/main/resources/META-INF/kmodule.xml").toFile(), + Paths.get("src/test/resources/drools-artifact-1.2/pom.xml").toFile(), + "src/main/resources/rules/org/onap/policy/drools/core/test/rules.drl", + Paths.get("src/test/resources/drools-artifact-1.2/src/main/resources/rules.drl").toFile()); + } + /** * This test is centered around the creation of a 'PolicyContainer' * and 'PolicySession', and the updating of that container to a new diff --git a/policy-core/drools-artifact-1.1/pom.xml b/policy-core/src/test/resources/drools-artifact-1.1/pom.xml index 15e8ac28..15e8ac28 100644 --- a/policy-core/drools-artifact-1.1/pom.xml +++ b/policy-core/src/test/resources/drools-artifact-1.1/pom.xml diff --git a/policy-core/drools-artifact-1.1/src/main/resources/META-INF/kmodule.xml b/policy-core/src/test/resources/drools-artifact-1.1/src/main/resources/META-INF/kmodule.xml index 22319689..22319689 100644 --- a/policy-core/drools-artifact-1.1/src/main/resources/META-INF/kmodule.xml +++ b/policy-core/src/test/resources/drools-artifact-1.1/src/main/resources/META-INF/kmodule.xml diff --git a/policy-core/drools-artifact-1.1/src/main/resources/rules.drl b/policy-core/src/test/resources/drools-artifact-1.1/src/main/resources/rules.drl index 9dac208b..9dac208b 100644 --- a/policy-core/drools-artifact-1.1/src/main/resources/rules.drl +++ b/policy-core/src/test/resources/drools-artifact-1.1/src/main/resources/rules.drl diff --git a/policy-core/drools-artifact-1.2/pom.xml b/policy-core/src/test/resources/drools-artifact-1.2/pom.xml index 0b78f847..0b78f847 100644 --- a/policy-core/drools-artifact-1.2/pom.xml +++ b/policy-core/src/test/resources/drools-artifact-1.2/pom.xml diff --git a/policy-core/drools-artifact-1.2/src/main/resources/META-INF/kmodule.xml b/policy-core/src/test/resources/drools-artifact-1.2/src/main/resources/META-INF/kmodule.xml index 22319689..22319689 100644 --- a/policy-core/drools-artifact-1.2/src/main/resources/META-INF/kmodule.xml +++ b/policy-core/src/test/resources/drools-artifact-1.2/src/main/resources/META-INF/kmodule.xml diff --git a/policy-core/drools-artifact-1.2/src/main/resources/rules.drl b/policy-core/src/test/resources/drools-artifact-1.2/src/main/resources/rules.drl index e69b6597..e69b6597 100644 --- a/policy-core/drools-artifact-1.2/src/main/resources/rules.drl +++ b/policy-core/src/test/resources/drools-artifact-1.2/src/main/resources/rules.drl |