*/
package org.onap.vnfsdk.marketplace.common;
-import com.google.gson.Gson;
-import com.google.gson.JsonElement;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.text.DecimalFormat;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.UUID;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonElement;
+
/**
* common utility class.
- *
+ *
*/
public class ToolUtil {
private static final Logger LOG = LoggerFactory.getLogger(ToolUtil.class);
public static final int FILE_PERCENT = 1024 * 1024; // 1M
+ private ToolUtil() {
+ }
+
public static boolean isEmptyString(String val) {
return val == null || "".equals(val);
}
/**
* trimed string.
- *
+ *
* @param val string array to trim
* @return String[]
*/
/**
* store chunk file to local temp directory.
- *
+ *
* @param dirName directory name
* @param fileName file name
* @param uploadedInputStream upload input stream
tmpDir.mkdirs();
}
File file = new File(tmpDir + File.separator + fileName);
- OutputStream os = null;
- try {
+
+ try (
+ OutputStream os = new FileOutputStream(file, true);
+ )
+ {
int read = 0;
byte[] bytes = new byte[1024];
- os = new FileOutputStream(file, true);
while ((read = uploadedInputStream.read(bytes)) != -1) {
os.write(bytes, 0, read);
}
os.flush();
return file.getAbsolutePath();
- } finally {
- if (os != null) {
- os.close();
- }
}
}
/**
* get temp dirctory when upload package.
- *
+ *
* @param dirName temp directory name
* @param fileName package name
* @return String
*/
public static String getTempDir(String dirName, String fileName) {
- // File tmpDir = new File(File.separator + dirName);
return Thread.currentThread().getContextClassLoader().getResource("/").getPath() + dirName + File.separator
+ fileName.replace(".csar", "");
}
/**
* delete file.
- *
+ *
* @param dirName the directory of file
* @param fileName file name
* @return boolean
*/
public static boolean deleteFile(String dirName, String fileName) {
- File tmpDir = new File(getCataloguePath() + File.separator + dirName);
+ File tmpDir = new File(File.separator + dirName);
if (!tmpDir.exists()) {
return true;
}
return true;
}
- public static String getCataloguePath() {
-// return Config.getConfigration().getCataloguePath();
- return "";
- }
-
public static String getCatalogueCsarPath() {
- return getCataloguePath() + File.separator + CATALOGUE_CSAR_DIR_NAME;
+ return File.separator + CATALOGUE_CSAR_DIR_NAME;
}
public static String getCatalogueImagePath() {
- return getCataloguePath() + File.separator + CATALOGUE_IMAGE_DIR_NAME;
+ return File.separator + CATALOGUE_IMAGE_DIR_NAME;
}
/**
* get file size.
- *
+ *
* @param file file which to get the size
* @param fileUnit file unit
* @return String file size
/**
* get file size by content.
- *
+ *
* @param contentRange content range
* @return String
*/
/**
* fix package format.
- *
+ *
* @param csarId package ID
* @return String
*/
/**
* delete the file and file directory.
- *
+ *
* @param dir file
* @return boolean
*/
return dir.delete();
}
- // public static boolean unZipCsar(String fileLocation) throws IOException {
- // String tempfolder=System.getProperty("java.io.tmpdir");
- // ArrayList<String> unzipFiles = FileUtil.unzip(fileLocation, tempfolder);
- // if(unzipFiles.isEmpty()){
- // return true;
- // }
- // }
-
/**
* judge the file's format is yaml or not.
- *
+ *
* @param file file to judge
* @return boolean
*/
/**
* remove the csar suffix.
- *
+ *
* @param csarName package name
* @return String
*/
/**
* add the csar fuffix.
- *
+ *
* @param csarName package name
* @return String
*/
/**
* process file name.
- *
+ *
* @param fileName file's name
* @return String
*/
/**
* exchange object to string.
- *
+ *
* @param obj object
* @return String
*/
/**
* get the size format according file size.
- *
+ *
* @param fileSize file size
* @return size format
*/
Gson gson = new Gson();
return gson.toJson(template);
}
-
+
/**
* @param value
* @return
return value.toString();
}
-
+
}
+
import org.onap.vnfsdk.marketplace.common.FileUtil;
import org.onap.vnfsdk.marketplace.common.JsonUtil;
import org.onap.vnfsdk.marketplace.common.ToolUtil;
-import org.onap.vnfsdk.marketplace.db.connection.ConnectionUtil;
import org.onap.vnfsdk.marketplace.db.entity.PackageData;
import org.onap.vnfsdk.marketplace.db.impl.MarketplaceDaoImpl;
import org.onap.vnfsdk.marketplace.db.resource.PackageManager;
import org.onap.vnfsdk.marketplace.onboarding.entity.ResultKey;
import org.onap.vnfsdk.marketplace.onboarding.hooks.functiontest.FunctionTestExceutor;
import org.onap.vnfsdk.marketplace.onboarding.hooks.functiontest.FunctionTestHook;
-import org.onap.vnfsdk.marketplace.resource.PackageResource;
import org.onap.vnfsdk.marketplace.rest.RestResponse;
import org.onap.vnfsdk.marketplace.rest.RestfulClient;
import org.onap.vnfsdk.marketplace.wrapper.PackageWrapper;
import org.onap.vnfsdk.marketplace.wrapper.PackageWrapperUtil;
-import mockit.MockUp;
import mockit.Mock;
+import mockit.MockUp;
public class PackageResourceTest {
catch(Exception e) {
e.printStackTrace();
}
-
+
filePath = "src" + File.separator + "test" + File.separator + "resources" + File.separator + "testfolder";
file = new File(filePath);
if(!file.exists()) {
StringBuilder sb = new StringBuilder();
sb.append("test data");
-
+
filePath = "src" + File.separator + "test" + File.separator + "resources" + File.separator + "temp.zip";
file = new File(filePath);
try {
public void testQueryPackageListByCond() throws Exception{
new MockUp<MarketplaceDaoImpl>() {
@Mock
- public List<PackageData> getAllPackageData() {
- return new ArrayList<PackageData>();
+ public List<PackageData> getAllPackageData() {
+ return new ArrayList<PackageData>();
}
};
try {
response = PackageWrapper.getInstance().queryPackageListByCond( null, null, null, null, null);
} catch( Exception e ) {
e.printStackTrace();
- }
+ }
assertNotNull( response );
assertEquals( 200, response.getStatus());
return null;
}
- };
+ };
new MockUp<MarketplaceDaoImpl>() {
@Mock
- public List<PackageData> getPackageData( String csarId ) {
- packageDataList = new ArrayList<PackageData>();
+ public List<PackageData> getPackageData( String csarId ) {
+ packageDataList = new ArrayList<PackageData>();
packageData = new PackageData();
packageData.setCsarId( csarId );
packageData.setDownloadUri( "src\\test\\resources\\clearwater_ns.csar" );
packageData.setVersion( "v1.0" );
packageData.setProvider( "Huawei" );
packageDataList.add( packageData );
- return packageDataList;
+ return packageDataList;
}
- };
+ };
try {
response = PackageWrapper.getInstance().queryPackageById( csarID );
e.printStackTrace();
}
assertNotNull( response );
- assertEquals( 200, response.getStatus());
- }
+ assertEquals( 200, response.getStatus());
+ }
@Test
public void testDelPackageFaiure() {
new MockUp<MarketplaceDaoImpl>() {
@Mock
- public List<PackageData> getAllPackageData() {
- return new ArrayList<PackageData>();
+ public List<PackageData> getAllPackageData() {
+ return new ArrayList<PackageData>();
}
};
new MockUp<MarketplaceDaoImpl>() {
@Mock
- public void deletePackageData( String csarId ) {
- return;
+ public void deletePackageData( String csarId ) {
+ return;
}
};
new MockUp<MarketplaceDaoImpl>() {
@Mock
- public List<PackageData> getPackageData( String csarId ) {
- return new ArrayList<PackageData>();
+ public List<PackageData> getPackageData( String csarId ) {
+ return new ArrayList<PackageData>();
}
- };
+ };
try {
response = PackageWrapper.getInstance().delPackage( "" );
} catch ( Exception e5 ) {
e5.printStackTrace();
- }
+ }
assertEquals( 500, response.getStatus());
try {
response = PackageWrapper.getInstance().delPackage( null );
} catch ( Exception e5 ) {
e5.printStackTrace();
- }
- assertEquals( 500, response.getStatus());
+ }
+ assertEquals( 500, response.getStatus());
}
@Test
public void testDelPackageSuccess() {
new MockUp<MarketplaceDaoImpl>() {
@Mock
- public List<PackageData> getAllPackageData() {
- packageDataList = new ArrayList<PackageData>();
+ public List<PackageData> getAllPackageData() {
+ packageDataList = new ArrayList<PackageData>();
packageData = new PackageData();
packageData.setCsarId( csarID );
packageData.setDownloadUri( "src\\test\\resources\\clearwater_ns.csar" );
packageData.setVersion( "v1.0" );
packageData.setProvider( "Huawei" );
packageDataList.add( packageData );
- return packageDataList;
+ return packageDataList;
}
};
new MockUp<PackageManager>() {
@Mock
- public void deletePackage( String csarId ) {
- return;
+ public void deletePackage( String csarId ) {
+ return;
}
};
new MockUp<HttpFileManagerImpl>() {
@Mock
- public boolean delete( String srcPath ) {
- return true;
+ public boolean delete( String srcPath ) {
+ return true;
}
};
new MockUp<MarketplaceDaoImpl>() {
@Mock
- public List<PackageData> getPackageData( String csarId ) {
- packageDataList = new ArrayList<PackageData>();
+ public List<PackageData> getPackageData( String csarId ) {
+ packageDataList = new ArrayList<PackageData>();
packageData = new PackageData();
packageData.setCsarId( csarID );
packageData.setDownloadUri( "src\\test\\resources\\" );
packageData.setVersion( "v1.0" );
packageData.setProvider( "Huawei" );
packageDataList.add( packageData );
- return packageDataList;
+ return packageDataList;
}
- };
+ };
try {
response = PackageWrapper.getInstance().delPackage( "csarid" );
} catch ( Exception e ) {
e.printStackTrace();
- }
+ }
assertNotNull( response );
- assertEquals( 200, response.getStatus());
+ assertEquals( 200, response.getStatus());
}
@Test
- public void testGetCsarFileUri() {
+ public void testGetCsarFileUri() {
new MockUp<MarketplaceDaoImpl>() {
@Mock
- public List<PackageData> getPackageData( String csarId ) {
- packageDataList = new ArrayList<PackageData>();
+ public List<PackageData> getPackageData( String csarId ) {
+ packageDataList = new ArrayList<PackageData>();
packageData = new PackageData();
packageData.setCsarId( csarId );
packageData.setDownloadUri( "src\\test\\resources\\" );
packageData.setVersion( "v1.0" );
packageData.setProvider( "Huawei" );
packageDataList.add( packageData );
- return packageDataList;
+ return packageDataList;
}
- };
+ };
- new MockUp<PackageWrapper>() {
+ new MockUp<PackageWrapper>() {
@Mock
Response downloadCsarPackagesById(String csarId) throws FileNotFoundException
- {
+ {
String fileName="src" + File.separator + "test" + File.separator + "resources" + File.separator + "Test.txt";
InputStream fis = new BufferedInputStream(new FileInputStream(fileName));
return Response.ok(fis).header("Content-Disposition", "attachment; filename=\"" + fileName + "\"").build();
- }
- };
+ }
+ };
response = PackageWrapper.getInstance().getCsarFileUri("csarId");
- assertEquals( 200, response.getStatus() );
+ assertEquals( 200, response.getStatus() );
- }
+ }
- @Test
+ @Test
public void testupdateDwonloadCountSuccess() throws Exception
{
final List<PackageData> pkgList = new ArrayList<PackageData>();
pkgList.add(pkgDataObj);
new MockUp<MarketplaceDaoImpl>() {
@Mock
- public List<PackageData> getPackageData(String csarId) {
+ public List<PackageData> getPackageData(String csarId) {
return pkgList;
//return new ArrayList<PackageData>();
}
};
new MockUp<MarketplaceDaoImpl>() {
@Mock
- public void updatePackageData(PackageData oPackageData){
+ public void updatePackageData(PackageData oPackageData){
return ;
}
public void testReUploadPackage() {
new MockUp<MarketplaceDaoImpl>() {
@Mock
- public List<PackageData> getPackageData( String csarId ) {
+ public List<PackageData> getPackageData( String csarId ) {
List<PackageData> packageDataList = new ArrayList<PackageData>();
PackageData packageData = new PackageData();
packageData = new PackageData();
packageData.setVersion( "v1.0" );
packageData.setProvider( "Huawei" );
packageDataList.add( packageData );
- return packageDataList;
- }
- };
+ return packageDataList;
+ }
+ };
new MockUp<HttpFileManagerImpl>() {
@Mock
public boolean delete(String srcPath) {
return true;
}
- };
+ };
new MockUp<MarketplaceDaoImpl>() {
@Mock
assertEquals( 417, response.getStatus() );
try {
- fileDetail = FormDataContentDisposition.name( "fileName" ).fileName( "clearwater_ns.csar" ).build();
+ fileDetail = FormDataContentDisposition.name( "fileName" ).fileName( "clearwater_ns.csar" ).build();
String fileName = "src" + File.separator + "test" + File.separator + "resources" + File.separator + "clearwater_ns.csar";
inputStream = new FileInputStream(fileName);
response = PackageWrapper.getInstance().reUploadPackage( "csarID", inputStream, fileDetail, null, null );
} catch( Exception e ) {
e.printStackTrace();
}
- }
+ }
@Test
public void testgetOperResultByOperTypeIdFailure() throws Exception
};
new MockUp<FunctionTestExceutor>(){
@Mock
- String getTestResultsByFuncTestKey(String key)
- {
+ String getTestResultsByFuncTestKey(String key)
+ {
return null;
}
- };
+ };
new MockUp<MarketplaceDaoImpl>() {
@Mock
- public List<PackageData> getPackageData( String csarId ) {
+ public List<PackageData> getPackageData( String csarId ) {
List<PackageData> packageDataList = new ArrayList<PackageData>();
PackageData packageData = new PackageData();
packageData = new PackageData();
packageData.setVersion( "v1.0" );
packageData.setProvider( "Airtel" );
packageDataList.add( packageData );
- return packageDataList;
- }
+ return packageDataList;
+ }
};
response = PackageWrapper.getInstance().getOperResultByOperTypeId( csarID,operTypeId );
} catch ( Exception e5 ) {
e5.printStackTrace();
- }
+ }
assertEquals(500,response.getStatus());
try {
}
@Test
- public void testgetOperResultByOperTypeIdSuccess() {
+ public void testgetOperResultByOperTypeIdSuccess() {
new MockUp<MarketplaceDaoImpl>() {
@Mock
- public List<PackageData> getPackageData( String csarId ) {
+ public List<PackageData> getPackageData( String csarId ) {
List<PackageData> packageDataList = new ArrayList<PackageData>();
PackageData packageData = new PackageData();
packageData = new PackageData();
packageData.setVersion( "v1.0" );
packageData.setProvider( "Airtel" );
packageDataList.add( packageData );
- return packageDataList;
- }
- };
+ return packageDataList;
+ }
+ };
new MockUp<ToolUtil>() {
@Mock
return filena;
}
};
- new MockUp<PackageWrapper>() {
+ new MockUp<PackageWrapper>() {
@Mock
Response downloadCsarPackagesById(String csarId) throws FileNotFoundException
{
String fileName = "src" + File.separator + "test" + File.separator + "resources" + File.separator + "Test.txt";
InputStream fis = new BufferedInputStream(new FileInputStream(fileName));
return Response.ok(fis).header("Content-Disposition", "attachment; filename=\"" + fileName + "\"").build();
- }
- };
+ }
+ };
new MockUp<FunctionTestHook>() {
@Mock
};
new MockUp<FunctionTestExceutor>(){
@Mock
- String getTestResultsByFuncTestKey(String key) {
- return "key";
+ String getTestResultsByFuncTestKey(String key) {
+ return "key";
}
};
try {
- response = PackageWrapper.getInstance().getOperResultByOperTypeId( csarID, operTypeId );
+ response = PackageWrapper.getInstance().getOperResultByOperTypeId( csarID, operTypeId );
} catch( Exception e ) {
e.printStackTrace();
- }
- }
+ }
+ }
//@Ignore
@Test
new MockUp<MarketplaceDaoImpl>() {
@Mock
- public List<PackageData> getPackageData( String csarId ) {
+ public List<PackageData> getPackageData( String csarId ) {
List<PackageData> packageDataList = new ArrayList<PackageData>();
PackageData packageData = new PackageData();
packageData = new PackageData();
packageData.setVersion( "v1.0" );
packageData.setProvider( "Airtel" );
packageDataList.add( packageData );
- return packageDataList;
- }
- };
+ return packageDataList;
+ }
+ };
new MockUp<HttpFileManagerImpl>() {
@Mock
public boolean delete(String srcPath) {
return true;
}
- };
+ };
new MockUp<MarketplaceDaoImpl>() {
@Mock
@Test
- public void testGetOnBoardingStepsSuccess() {
+ public void testGetOnBoardingStepsSuccess() {
new MockUp<org.onap.vnfsdk.marketplace.filemanage.http.ToolUtil>() {
@Mock
String getAppDeployPath() {
String path = "src" + File.separator + "main" + File.separator + "resources";
return path;
}
- };
+ };
try {
response = PackageWrapper.getInstance().getOnBoardingSteps();
}
@Test
- public void testGetOnBoardingStepsFailure() {
+ public void testGetOnBoardingStepsFailure() {
new MockUp<org.onap.vnfsdk.marketplace.filemanage.http.ToolUtil>() {
@Mock
String getAppDeployPath() {
- String path = "src" + File.separator + "main" + File.separator + "resources"+ File.separator + "generalconfig";
+ String path = "src" + File.separator + "main" + File.separator + "resources"+ File.separator + "generalconfig";
return path;
}
- };
+ };
try {
response = PackageWrapper.getInstance().getOnBoardingSteps();
} catch( Exception e ) {
e.printStackTrace();
- }
+ }
assertEquals( 500, response.getStatus() );
}
- @Test
+ @Test
public void testRestGetClient() {
FunctionTestExceutor.getTestResultsByFuncTestKey("GET");
new MockUp<FunctionTestHook>() {
@Mock
- String getResultStorePath(){
+ String getResultStorePath(){
return "src/test/resources";
}
assertNotNull(res);
}
- @Test
- public void testgetCataloguePath()
- {
- String res = ToolUtil.getCataloguePath();
- assertEquals(res,"");
- }
-
@Test
public void testgetCatalogueCsarPath()
{
@Test
public void teststoreChunkFileInLocal()
- {
+ {
try {
inputStream = new FileInputStream("src//test//resources//Test.txt");
String res = ToolUtil.storeChunkFileInLocal("src//test//resources","TestOut.txt",inputStream);
assertEquals(res,true);
}
-
+
@Test
public void testToJson() {
String res = pkgMetaObj.getCreateTime();
assertEquals(res,"05042017");
res = pkgMetaObj.getCsarId();
- assertEquals(res,"csarid");
+ assertEquals(res,"csarid");
res = pkgMetaObj.getDetails();
- assertEquals(res,"details");
+ assertEquals(res,"details");
res = pkgMetaObj.getDownloadCount()+"";
assertEquals(res,"10");
res = pkgMetaObj.getDownloadUri();
assertEquals(res,"1000");
res = pkgMetaObj.getType();
assertEquals(res,"type");
- res = pkgMetaObj.getVersion();
+ res = pkgMetaObj.getVersion();
assertEquals(res,"1");
}
}
}
+
Code Review / vnfsdk / refrepo.git / commitdiff