diff options
author | Parshad Patel <pars.patel@samsung.com> | 2018-11-20 14:46:45 +0900 |
---|---|---|
committer | Parshad Patel <pars.patel@samsung.com> | 2018-11-20 14:47:26 +0900 |
commit | e8b197315437cac84872752e2ea090d8fb233941 (patch) | |
tree | 6e167d82034840bda782d5d7b90fe7778789a699 /model/policy-model | |
parent | 62475a30ef2d425fe04df35ef2dac53c7ab5306a (diff) |
Rename test classes in apex-pdp
Make test classes name consistence under auth, model, plugins, testsuits, tools projects
Issue-ID: POLICY-1263
Change-Id: I49ec9a9f5b457d6381e693de2c04ec0268ad1b02
Signed-off-by: Parshad Patel <pars.patel@samsung.com>
Diffstat (limited to 'model/policy-model')
-rw-r--r-- | model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/ExceptionsTest.java (renamed from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TestExceptions.java) | 2 | ||||
-rw-r--r-- | model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/LogicTest.java (renamed from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TestLogic.java) | 2 | ||||
-rw-r--r-- | model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/PoliciesTest.java (renamed from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TestPolicies.java) | 6 | ||||
-rw-r--r-- | model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/PolicyModelTest.java (renamed from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TestPolicyModel.java) | 6 | ||||
-rw-r--r-- | model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateOutputTest.java (renamed from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TestStateOutput.java) | 2 | ||||
-rw-r--r-- | model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateTaskReferenceTest.java (renamed from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TestStateTaskReference.java) | 2 | ||||
-rw-r--r-- | model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateTest.java (renamed from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TestState.java) | 2 | ||||
-rw-r--r-- | model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TaskParameterTest.java (renamed from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TestTaskParameter.java) | 2 | ||||
-rw-r--r-- | model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TasksTest.java (renamed from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TestTasks.java) | 2 | ||||
-rw-r--r-- | model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/ApexPolicyModelCreatorTest.java (renamed from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/TestApexPolicyModelCreator.java) | 2 | ||||
-rw-r--r-- | model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/ApexPolicyModelTest.java (renamed from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/TestApexPolicyModel.java) | 4 | ||||
-rw-r--r-- | model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyAnalyserTest.java (renamed from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/TestPolicyAnalyser.java) | 4 | ||||
-rw-r--r-- | model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyLogicReaderTest.java (renamed from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/TestPolicyLogicReader.java) | 2 | ||||
-rw-r--r-- | model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelComparerTest.java (renamed from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/TestPolicyModelComparer.java) | 4 | ||||
-rw-r--r-- | model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelMergerTest.java (renamed from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/TestPolicyModelMerger.java) | 8 | ||||
-rw-r--r-- | model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelSplitterTest.java (renamed from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/TestPolicyModelSplitter.java) | 4 |
16 files changed, 27 insertions, 27 deletions
diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TestExceptions.java b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/ExceptionsTest.java index 1fa3928b5..70c79a1ef 100644 --- a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TestExceptions.java +++ b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/ExceptionsTest.java @@ -33,7 +33,7 @@ import org.onap.policy.apex.model.policymodel.concepts.PolicyRuntimeException; * Test model exceptions. * @author Liam Fallon (liam.fallon@ericsson.com) */ -public class TestExceptions { +public class ExceptionsTest { @Test public void test() { diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TestLogic.java b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/LogicTest.java index 710b360f9..70db66348 100644 --- a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TestLogic.java +++ b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/LogicTest.java @@ -42,7 +42,7 @@ import org.onap.policy.apex.model.policymodel.concepts.AxTaskSelectionLogic; * * @author Liam Fallon (liam.fallon@ericsson.com) */ -public class TestLogic { +public class LogicTest { @Test public void testLogic() { diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TestPolicies.java b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/PoliciesTest.java index 1e0e88c7b..edf045a06 100644 --- a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TestPolicies.java +++ b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/PoliciesTest.java @@ -41,14 +41,14 @@ import org.onap.policy.apex.model.policymodel.concepts.AxPolicy; import org.onap.policy.apex.model.policymodel.concepts.AxState; import org.onap.policy.apex.model.policymodel.concepts.AxStateOutput; import org.onap.policy.apex.model.policymodel.concepts.AxStateTree; -import org.onap.policy.apex.model.policymodel.handling.TestApexPolicyModelCreator; +import org.onap.policy.apex.model.policymodel.handling.ApexPolicyModelCreatorTest; /** * Test apex policies. * * @author Liam Fallon (liam.fallon@ericsson.com) */ -public class TestPolicies { +public class PoliciesTest { @Test public void testPolicies() { @@ -113,7 +113,7 @@ public class TestPolicies { assertEquals("PolicyName:0.0.1", policy.getKeys().get(0).getId()); - policy = new TestApexPolicyModelCreator().getModel().getPolicies().get("policy"); + policy = new ApexPolicyModelCreatorTest().getModel().getPolicies().get("policy"); AxValidationResult result = new AxValidationResult(); result = policy.validate(result); diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TestPolicyModel.java b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/PolicyModelTest.java index b2803c4f8..e1f1f90c3 100644 --- a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TestPolicyModel.java +++ b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/PolicyModelTest.java @@ -46,14 +46,14 @@ import org.onap.policy.apex.model.policymodel.concepts.AxStateTaskOutputType; import org.onap.policy.apex.model.policymodel.concepts.AxStateTaskReference; import org.onap.policy.apex.model.policymodel.concepts.AxTaskSelectionLogic; import org.onap.policy.apex.model.policymodel.concepts.AxTasks; -import org.onap.policy.apex.model.policymodel.handling.TestApexPolicyModelCreator; +import org.onap.policy.apex.model.policymodel.handling.ApexPolicyModelCreatorTest; /** * Test policy models. * * @author Liam Fallon (liam.fallon@ericsson.com) */ -public class TestPolicyModel { +public class PolicyModelTest { @Test public void testPolicyModel() { @@ -148,7 +148,7 @@ public class TestPolicyModel { new AxKeyInformation(keyInfoKey), new AxEvents(eventsKey), new AxContextAlbums(albumsKey), new AxTasks(tasksKey), new AxPolicies(policiesKey)))); - model = new TestApexPolicyModelCreator().getModel(); + model = new ApexPolicyModelCreatorTest().getModel(); AxValidationResult result = new AxValidationResult(); result = model.validate(result); diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TestStateOutput.java b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateOutputTest.java index 90b486053..901d641cb 100644 --- a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TestStateOutput.java +++ b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateOutputTest.java @@ -39,7 +39,7 @@ import org.onap.policy.apex.model.policymodel.concepts.AxStateOutput; * * @author Liam Fallon (liam.fallon@ericsson.com) */ -public class TestStateOutput { +public class StateOutputTest { @Test public void testStateOutput() { diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TestStateTaskReference.java b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateTaskReferenceTest.java index 90c7001b8..cfc8a494e 100644 --- a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TestStateTaskReference.java +++ b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateTaskReferenceTest.java @@ -40,7 +40,7 @@ import org.onap.policy.apex.model.policymodel.concepts.AxStateTaskReference; * * @author Liam Fallon (liam.fallon@ericsson.com) */ -public class TestStateTaskReference { +public class StateTaskReferenceTest { @Test public void testStateTaskReference() { diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TestState.java b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateTest.java index ea32c9ca6..1f71e9ec0 100644 --- a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TestState.java +++ b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateTest.java @@ -43,7 +43,7 @@ import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult.Validat * * @author Liam Fallon (liam.fallon@ericsson.com) */ -public class TestState { +public class StateTest { @Test public void testState() { diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TestTaskParameter.java b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TaskParameterTest.java index 4eb2c4232..ecc8a4f66 100644 --- a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TestTaskParameter.java +++ b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TaskParameterTest.java @@ -39,7 +39,7 @@ import org.onap.policy.apex.model.policymodel.concepts.AxTaskParameter; * * @author Liam Fallon (liam.fallon@ericsson.com) */ -public class TestTaskParameter { +public class TaskParameterTest { @Test public void testTaskParameter() { diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TestTasks.java b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TasksTest.java index 4f6292f04..248dd6307 100644 --- a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TestTasks.java +++ b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TasksTest.java @@ -47,7 +47,7 @@ import org.onap.policy.apex.model.policymodel.concepts.AxTasks; * * @author Liam Fallon (liam.fallon@ericsson.com) */ -public class TestTasks { +public class TasksTest { @Test public void testTasks() { diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/TestApexPolicyModelCreator.java b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/ApexPolicyModelCreatorTest.java index cbcecc589..604d8c3bc 100644 --- a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/TestApexPolicyModelCreator.java +++ b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/ApexPolicyModelCreatorTest.java @@ -56,7 +56,7 @@ import org.onap.policy.apex.model.policymodel.concepts.AxTasks; * * @author Liam Fallon (liam.fallon@ericsson.com) */ -public class TestApexPolicyModelCreator implements TestApexModelCreator<AxPolicyModel> { +public class ApexPolicyModelCreatorTest implements TestApexModelCreator<AxPolicyModel> { @Override public AxPolicyModel getModel() { diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/TestApexPolicyModel.java b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/ApexPolicyModelTest.java index 6c4fd5174..997664b13 100644 --- a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/TestApexPolicyModel.java +++ b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/ApexPolicyModelTest.java @@ -35,7 +35,7 @@ import org.onap.policy.apex.model.basicmodel.dao.DaoParameters; import org.onap.policy.apex.model.basicmodel.test.TestApexModel; import org.onap.policy.apex.model.policymodel.concepts.AxPolicyModel; -public class TestApexPolicyModel { +public class ApexPolicyModelTest { private Connection connection; TestApexModel<AxPolicyModel> testApexModel; @@ -49,7 +49,7 @@ public class TestApexPolicyModel { Class.forName("org.apache.derby.jdbc.EmbeddedDriver").newInstance(); connection = DriverManager.getConnection("jdbc:derby:memory:apex_test;create=true"); - testApexModel = new TestApexModel<AxPolicyModel>(AxPolicyModel.class, new TestApexPolicyModelCreator()); + testApexModel = new TestApexModel<AxPolicyModel>(AxPolicyModel.class, new ApexPolicyModelCreatorTest()); } @After diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/TestPolicyAnalyser.java b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyAnalyserTest.java index 40aa51ffe..425509d3a 100644 --- a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/TestPolicyAnalyser.java +++ b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyAnalyserTest.java @@ -28,10 +28,10 @@ import org.onap.policy.apex.model.policymodel.concepts.AxPolicyModel; import org.onap.policy.apex.model.policymodel.handling.PolicyAnalyser; import org.onap.policy.apex.model.policymodel.handling.PolicyAnalysisResult; -public class TestPolicyAnalyser { +public class PolicyAnalyserTest { @Test public void test() { - final AxPolicyModel apexModel = new TestApexPolicyModelCreator().getModel(); + final AxPolicyModel apexModel = new ApexPolicyModelCreatorTest().getModel(); final PolicyAnalyser policyAnalyser = new PolicyAnalyser(); final PolicyAnalysisResult analysisResult = policyAnalyser.analyse(apexModel); diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/TestPolicyLogicReader.java b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyLogicReaderTest.java index 528898d30..23f9d3820 100644 --- a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/TestPolicyLogicReader.java +++ b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyLogicReaderTest.java @@ -35,7 +35,7 @@ import org.onap.policy.apex.model.policymodel.handling.PolicyLogicReader; * * @author Liam Fallon (liam.fallon@ericsson.com) */ -public class TestPolicyLogicReader { +public class PolicyLogicReaderTest { @Test public void test() { diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/TestPolicyModelComparer.java b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelComparerTest.java index 3511b54ba..08d00e628 100644 --- a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/TestPolicyModelComparer.java +++ b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelComparerTest.java @@ -35,11 +35,11 @@ import org.onap.policy.apex.model.policymodel.handling.PolicyComparer; import org.onap.policy.apex.model.policymodel.handling.PolicyModelComparer; import org.onap.policy.apex.model.utilities.TextFileUtils; -public class TestPolicyModelComparer { +public class PolicyModelComparerTest { @Test public void testPolicyComparer() throws IOException { - final AxPolicyModel leftApexModel = new TestApexPolicyModelCreator().getModel(); + final AxPolicyModel leftApexModel = new ApexPolicyModelCreatorTest().getModel(); final AxPolicyModel rightApexModel = new AxPolicyModel(leftApexModel); PolicyModelComparer policyModelComparer = new PolicyModelComparer(leftApexModel, rightApexModel); diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/TestPolicyModelMerger.java b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelMergerTest.java index 8f717a234..7d5ba6a40 100644 --- a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/TestPolicyModelMerger.java +++ b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelMergerTest.java @@ -35,12 +35,12 @@ import org.onap.policy.apex.model.policymodel.handling.PolicyModelMerger; * * @author Liam Fallon (liam.fallon@ericsson.com) */ -public class TestPolicyModelMerger { +public class PolicyModelMergerTest { @Test public void testPolicyModelMerger() { - final AxPolicyModel leftPolicyModel = new TestApexPolicyModelCreator().getModel(); - AxPolicyModel rightPolicyModel = new TestApexPolicyModelCreator().getModel(); + final AxPolicyModel leftPolicyModel = new ApexPolicyModelCreatorTest().getModel(); + AxPolicyModel rightPolicyModel = new ApexPolicyModelCreatorTest().getModel(); try { final AxPolicyModel mergedPolicyModel = PolicyModelMerger.getMergedPolicyModel(leftPolicyModel, @@ -99,7 +99,7 @@ public class TestPolicyModelMerger { fail("test should not throw an exception"); } - rightPolicyModel = new TestApexPolicyModelCreator().getAnotherModel(); + rightPolicyModel = new ApexPolicyModelCreatorTest().getAnotherModel(); try { final AxPolicyModel mergedPolicyModel = PolicyModelMerger.getMergedPolicyModel(leftPolicyModel, rightPolicyModel, true); diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/TestPolicyModelSplitter.java b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelSplitterTest.java index fde6e3712..29e7307f4 100644 --- a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/TestPolicyModelSplitter.java +++ b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelSplitterTest.java @@ -34,10 +34,10 @@ import org.onap.policy.apex.model.basicmodel.handling.ApexModelException; import org.onap.policy.apex.model.policymodel.concepts.AxPolicyModel; import org.onap.policy.apex.model.policymodel.handling.PolicyModelSplitter; -public class TestPolicyModelSplitter { +public class PolicyModelSplitterTest { @Test public void test() { - final AxPolicyModel apexModel = new TestApexPolicyModelCreator().getModel(); + final AxPolicyModel apexModel = new ApexPolicyModelCreatorTest().getModel(); final Set<AxArtifactKey> requiredPolicySet = new TreeSet<AxArtifactKey>(); requiredPolicySet.add(new AxArtifactKey("policy", "0.0.1")); |