Remove try/catch blocks with assertj - apex-pdp

[policy/apex-pdp.git] / model / model-api / src / test / java / org / onap / policy / apex / model / modelapi / ApexModelApiTest.java

diff --git a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexModelApiTest.java b/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexModelApiTest.java
index df5e54c..02195e4 100644 (file)
--- a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexModelApiTest.java
+++ b/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexModelApiTest.java
@@ -1,6 +1,7 @@
-/*-
+/*
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ *  Modifications Copyright (C) 2020 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,27 +21,26 @@
 
 package org.onap.policy.apex.model.modelapi;
 
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 
 import java.io.File;
 import java.io.IOException;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.util.UUID;
-
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.onap.policy.apex.model.basicmodel.dao.DaoParameters;
 import org.onap.policy.apex.model.modelapi.impl.ApexModelImpl;
-import org.onap.policy.apex.model.utilities.TextFileUtils;
+import org.onap.policy.common.utils.resources.TextFileUtils;
 
 /**
  * Test the apex model API.
+ *
  * @author Liam Fallon (liam.fallon@ericsson.com)
  */
 public class ApexModelApiTest {
@@ -63,23 +63,23 @@ public class ApexModelApiTest {
         final ApexModel apexModel = new ApexModelFactory().createApexModel(null, false);
 
         ApexApiResult result = apexModel.loadFromFile("src/main/resources/models/PolicyModel.json");
-        assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
 
         result = apexModel.loadFromFile("src/test/resources/models/PolicyModel.json");
-        assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
 
         result = apexModel.deleteModel();
-        assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
 
         result = apexModel.loadFromFile("src/test/resources/models/PolicyModel.xml");
-        assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
 
         result = apexModel.deleteModel();
-        assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
 
         result = apexModel.loadFromFile("src/test/resources/models/PolicyModel.junk");
-        assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
-        assertTrue(result.getMessages().get(0).equals("format of input for Apex concept is neither JSON nor XML"));
+        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
+        assertEquals("format of input for Apex concept is neither JSON nor XML", result.getMessages().get(0));
     }
 
     @Test
@@ -87,24 +87,24 @@ public class ApexModelApiTest {
         final ApexModel apexModel = new ApexModelFactory().createApexModel(null, false);
 
         ApexApiResult result = apexModel.loadFromFile("src/test/resources/models/PolicyModel.json");
-        assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
 
         final File tempJsonModelFile = File.createTempFile("ApexModelTest", ".json");
         result = apexModel.saveToFile(tempJsonModelFile.getCanonicalPath(), false);
-        assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
 
         final ApexModel jsonApexModel = new ApexModelFactory().createApexModel(null, false);
         result = jsonApexModel.loadFromFile(tempJsonModelFile.getCanonicalPath());
-        assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
         tempJsonModelFile.delete();
 
         final File tempXmlModelFile = File.createTempFile("ApexModelTest", ".xml");
         result = apexModel.saveToFile(tempXmlModelFile.getCanonicalPath(), true);
-        assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
 
         final ApexModel xmlApexModel = new ApexModelFactory().createApexModel(null, false);
         result = xmlApexModel.loadFromFile(tempXmlModelFile.getCanonicalPath());
-        assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
         tempXmlModelFile.delete();
     }
 
@@ -113,79 +113,69 @@ public class ApexModelApiTest {
         final ApexModel apexModel = new ApexModelFactory().createApexModel(null, false);
 
         ApexApiResult result = apexModel.loadFromFile("src/test/resources/models/PolicyModel.json");
-        assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
 
         final DaoParameters DaoParameters = new DaoParameters();
         DaoParameters.setPluginClass("org.onap.policy.apex.model.basicmodel.dao.impl.DefaultApexDao");
         DaoParameters.setPersistenceUnit("DAOTest");
 
         result = apexModel.saveToDatabase(DaoParameters);
-        assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
 
         result = apexModel.deleteModel();
-        assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
 
         result = apexModel.loadFromDatabase("PolicyModel", "0.0.1", DaoParameters);
-        assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
 
         result = apexModel.deleteModel();
-        assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
 
         result = apexModel.loadFromDatabase("PolicyModel", null, DaoParameters);
-        assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
 
         result = apexModel.deleteModel();
-        assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
 
         result = apexModel.loadFromDatabase("VPNPolicyModel", "0.0.1", DaoParameters);
-        assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
     }
 
     @Test
     public void testApexModelUrl() throws IOException {
-        ApexModel apexModel = new ApexModelFactory().createApexModel(null, false);
-
+        final ApexModel apexModel = new ApexModelFactory().createApexModel(null, false);
+        //ApexApiResult result = null;
+        assertThatThrownBy(() -> apexModel.readFromUrl(null))
+            .isInstanceOf(IllegalArgumentException.class);
+        assertThatThrownBy(() -> apexModel.writeToUrl(null, true))
+            .isInstanceOf(IllegalArgumentException.class);
         ApexApiResult result = null;
-
-        try {
-            result = apexModel.readFromUrl(null);
-            fail("expecting an IllegalArgumentException");
-        } catch (final Exception e) {
-            assertTrue(e instanceof IllegalArgumentException);
-        }
-
-        try {
-            result = apexModel.writeToUrl(null, true);
-            fail("expecting an IllegalArgumentException");
-        } catch (final Exception e) {
-            assertTrue(e instanceof IllegalArgumentException);
-        }
-
         result = apexModel.readFromUrl("zooby/looby");
-        assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
 
         result = apexModel.writeToUrl("zooby/looby", true);
-        assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
 
         result = apexModel.readFromUrl("zooby://zooby/looby");
-        assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
 
         result = apexModel.writeToUrl("zooby://zooby/looby", false);
-        assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
 
-        apexModel = new ApexModelFactory().createApexModel(null, false);
+        final ApexModel apexModelJSon = new ApexModelFactory().createApexModel(null, false);
 
         final File tempJsonModelFile = File.createTempFile("ApexModelTest", ".json");
+
         result = apexModel.saveToFile(tempJsonModelFile.getCanonicalPath(), false);
-        assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
 
         final String tempFileUrlString = tempJsonModelFile.toURI().toString();
         result = apexModel.readFromUrl(tempFileUrlString);
-        assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
 
         result = apexModel.writeToUrl(tempFileUrlString, false);
-        assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
-        assertTrue(result.getMessages().get(0).equals("protocol doesn't support output"));
+        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
+        assertEquals("protocol doesn't support output", result.getMessages().get(0));
 
         tempJsonModelFile.delete();
     }