From c94045026c7bb0ddf493f4dafccc8a60465f9928 Mon Sep 17 00:00:00 2001 From: Jerry Flood Date: Wed, 20 Mar 2019 16:26:09 -0400 Subject: Update robot docker to python3 Fix style stuff Issue-ID: OPTFRA-462 Change-Id: Idc039fddd1528bf083d5cf9158f6636d2dc3887a Signed-off-by: Jerry Flood --- cmso-service/pom.xml | 4 -- .../java/org/onap/optf/cmso/AuthProviderTest.java | 12 ++--- .../src/test/java/org/onap/optf/cmso/JpaInit.java | 57 -------------------- .../test/java/org/onap/optf/cmso/JtestHelper.java | 61 ---------------------- .../cmso/service/rs/MockHttpServletRequest.java | 49 ----------------- .../onap/optf/cmso/utilities/PropertiesAdmin.java | 52 +++++++++--------- 6 files changed, 34 insertions(+), 201 deletions(-) delete mode 100644 cmso-service/src/test/java/org/onap/optf/cmso/JpaInit.java delete mode 100644 cmso-service/src/test/java/org/onap/optf/cmso/JtestHelper.java delete mode 100644 cmso-service/src/test/java/org/onap/optf/cmso/service/rs/MockHttpServletRequest.java (limited to 'cmso-service') diff --git a/cmso-service/pom.xml b/cmso-service/pom.xml index d64709e..3700d25 100644 --- a/cmso-service/pom.xml +++ b/cmso-service/pom.xml @@ -164,10 +164,6 @@ org.springframework spring-beans - - org.springframework - spring-beans - org.springframework spring-context diff --git a/cmso-service/src/test/java/org/onap/optf/cmso/AuthProviderTest.java b/cmso-service/src/test/java/org/onap/optf/cmso/AuthProviderTest.java index c8613f8..500c42b 100644 --- a/cmso-service/src/test/java/org/onap/optf/cmso/AuthProviderTest.java +++ b/cmso-service/src/test/java/org/onap/optf/cmso/AuthProviderTest.java @@ -28,20 +28,20 @@ * limitations under the License. */ - package org.onap.optf.cmso; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.Mockito; import org.mockito.runners.MockitoJUnitRunner; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.Authentication; -import static org.junit.Assert.*; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - @RunWith(MockitoJUnitRunner.class) public class AuthProviderTest { diff --git a/cmso-service/src/test/java/org/onap/optf/cmso/JpaInit.java b/cmso-service/src/test/java/org/onap/optf/cmso/JpaInit.java deleted file mode 100644 index 8a3aa58..0000000 --- a/cmso-service/src/test/java/org/onap/optf/cmso/JpaInit.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright © 2017-2018 AT&T Intellectual Property. - * Modifications Copyright © 2018 IBM. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * - * Unless otherwise specified, all documentation contained herein is licensed - * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); - * you may not use this documentation except in compliance with the License. - * You may obtain a copy of the License at - * - * https://creativecommons.org/licenses/by/4.0/ - * - * Unless required by applicable law or agreed to in writing, documentation - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. -*/ - -package org.onap.optf.cmso; - -import java.util.concurrent.atomic.AtomicBoolean; -import org.onap.optf.cmso.model.ApprovalType; -import org.onap.optf.cmso.model.Domain; -import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager; - -public class JpaInit { - - private static AtomicBoolean initialized = new AtomicBoolean(false); - - public static void init(TestEntityManager entityManager) { - if (initialized.compareAndSet(true, true)) - return; - Domain d = new Domain(); - d.setDomain("ChangeManagement"); - entityManager.persist(d); - ApprovalType at = new ApprovalType(); - at.setApprovalCount(1); - at.setDomain("ChangeManagement"); - at.setApprovalType("Tier 2"); - entityManager.persist(at); - entityManager.flush(); - - } -} diff --git a/cmso-service/src/test/java/org/onap/optf/cmso/JtestHelper.java b/cmso-service/src/test/java/org/onap/optf/cmso/JtestHelper.java deleted file mode 100644 index d0b03e5..0000000 --- a/cmso-service/src/test/java/org/onap/optf/cmso/JtestHelper.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright © 2017-2018 AT&T Intellectual Property. - * Modifications Copyright © 2018 IBM. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * - * Unless otherwise specified, all documentation contained herein is licensed - * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); - * you may not use this documentation except in compliance with the License. - * You may obtain a copy of the License at - * - * https://creativecommons.org/licenses/by/4.0/ - * - * Unless required by applicable law or agreed to in writing, documentation - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. -*/ - -package org.onap.optf.cmso; - -import java.io.File; -import java.io.FileNotFoundException; -import java.util.Map; -import java.util.Scanner; -import org.apache.commons.lang3.text.StrSubstitutor; - -public class JtestHelper { - private static String templatefolder = "src/test/templates" + File.separator; - - public static String template(String filename, Map values) { - String data = ""; - Scanner s = null; - try { - File t = new File(templatefolder + filename); - s = new Scanner(t); - s.useDelimiter("\\Z"); - data = s.next(); - StrSubstitutor ss = new StrSubstitutor(values); - data = ss.replace(data); - } catch (FileNotFoundException e) { - data = ""; - } finally { - if (s != null) - s.close(); - } - return data; - } -} diff --git a/cmso-service/src/test/java/org/onap/optf/cmso/service/rs/MockHttpServletRequest.java b/cmso-service/src/test/java/org/onap/optf/cmso/service/rs/MockHttpServletRequest.java deleted file mode 100644 index aace25e..0000000 --- a/cmso-service/src/test/java/org/onap/optf/cmso/service/rs/MockHttpServletRequest.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright © 2017-2018 AT&T Intellectual Property. - * Modifications Copyright © 2018 IBM. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * - * Unless otherwise specified, all documentation contained herein is licensed - * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); - * you may not use this documentation except in compliance with the License. - * You may obtain a copy of the License at - * - * https://creativecommons.org/licenses/by/4.0/ - * - * Unless required by applicable law or agreed to in writing, documentation - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. -*/ - -package org.onap.optf.cmso.service.rs; - -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; -import javax.servlet.http.HttpServletRequest; - -public class MockHttpServletRequest { - public StringBuffer url = new StringBuffer("http://localhost:8089/cmso/v1/ChangeManagement/schedules/"); - public HttpServletRequest request = mock(HttpServletRequest.class); - - MockHttpServletRequest() { - - when(request.getRequestURL()).thenReturn(url); - when(request.getHeader("Authorization")).thenReturn("BasicbTEzODc3OnNjaGVkdWxlci1SMTgwMiE="); - - } - -} diff --git a/cmso-service/src/test/java/org/onap/optf/cmso/utilities/PropertiesAdmin.java b/cmso-service/src/test/java/org/onap/optf/cmso/utilities/PropertiesAdmin.java index faf408b..defb7ef 100644 --- a/cmso-service/src/test/java/org/onap/optf/cmso/utilities/PropertiesAdmin.java +++ b/cmso-service/src/test/java/org/onap/optf/cmso/utilities/PropertiesAdmin.java @@ -1,52 +1,56 @@ /* - * Copyright © 2017-2018 AT&T Intellectual Property. - * Modifications Copyright © 2018 IBM. - * + * Copyright © 2017-2018 AT&T Intellectual Property. + * Modifications Copyright © 2018 IBM. + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * - * + * + * * Unless otherwise specified, all documentation contained herein is licensed * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); * you may not use this documentation except in compliance with the License. * You may obtain a copy of the License at - * + * * https://creativecommons.org/licenses/by/4.0/ - * + * * Unless required by applicable law or agreed to in writing, documentation * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. -*/ + */ package org.onap.optf.cmso.utilities; import org.onap.optf.cmso.common.PropertiesManagement; public class PropertiesAdmin { - public static void main(String[] args) { - PropertiesManagement pm = new PropertiesManagement(); - if (args.length < 1) { - System.out.println("Missing argument"); - return; - } - String value = ""; - if (args[0].startsWith("dec:")) { - value = PropertiesManagement.getDecryptedValue(args[0].substring(4)); - } else { - value = pm.getEncryptedValue(args[0]); - } - System.out.println(args[0] + " : " + value); + /** + * Test properties admin. + * + * @param args + */ + public static void main(String[] args) { + PropertiesManagement pm = new PropertiesManagement(); + if (args.length < 1) { + System.out.println("Missing argument"); + return; } - + String value = ""; + if (args[0].startsWith("dec:")) { + value = PropertiesManagement.getDecryptedValue(args[0].substring(4)); + } else { + value = pm.getEncryptedValue(args[0]); + } + System.out.println(args[0] + " : " + value); + } } -- cgit