删除dev、kibug、web的target的相关modle，VO等

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/dao/TargetDevDao.java

@@ -1,18 +0,0 @@
-package cn.iselab.mooctest.site.dao;
-
-import cn.iselab.mooctest.site.models.DevTarget;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.CrudRepository;
-import org.springframework.data.repository.query.Param;
-
-import javax.transaction.Transactional;
-
-/**
- * Created by ROGK on 2017/7/18.
- */
-@Transactional
-public interface TargetDevDao extends CrudRepository<DevTarget,Long>{
-
-    @Query("SELECT a FROM DevTarget a WHERE a.uploadedCaseId=:uploadCaseId")
-    DevTarget findByUploadedCaseId(@Param("uploadCaseId") long uploadCaseId);
-}

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/dao/TargetWebDao.java

@@ -1,15 +0,0 @@
-package cn.iselab.mooctest.site.dao;
-
-import cn.iselab.mooctest.site.models.WebTarget;
-import org.springframework.data.repository.CrudRepository;
-
-import javax.transaction.Transactional;
-
-/**
- * Created by ROGK on 2017/9/4.
- */
-@Transactional
-public interface TargetWebDao extends CrudRepository<WebTarget,Long>{
-
-    WebTarget findBySuperId(long superId);
-}

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/dao/fromKibug/ApplicationDao.java

@@ -1,22 +0,0 @@
-package cn.iselab.mooctest.site.dao.fromKibug;
-
-import cn.iselab.mooctest.site.models.fromKibug.Application;
-import cn.iselab.mooctest.site.models.fromKibug.ManagerScore;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.CrudRepository;
-import org.springframework.data.repository.PagingAndSortingRepository;
-import org.springframework.data.repository.query.Param;
-
-import javax.transaction.Transactional;
-import java.util.List;
-
-
-@Transactional
-public interface ApplicationDao extends PagingAndSortingRepository<Application, Long>,JpaSpecificationExecutor<Application>,CrudRepository<Application, Long> {
-
-    @Query("SELECT application FROM Application application WHERE application.uploadedCaseId= :uploaderCaseId")
-    Application getApplicationByUploadedCaseId(@Param("uploaderCaseId") long uploaderCaseId);
-
-   List<Application> getAppsByUploadedCaseId(long uploaderCaseId);
-}

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/dao/fromKibug/BugDao.java

@@ -1,6 +1,5 @@
 package cn.iselab.mooctest.site.dao.fromKibug;
 
-import cn.iselab.mooctest.site.models.fromKibug.Application;
 import cn.iselab.mooctest.site.models.fromKibug.Bug;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.repository.PagingAndSortingRepository;

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/models/DevTarget.java

@@ -1,55 +0,0 @@
-package cn.iselab.mooctest.site.models;
-
-import javax.persistence.*;
-
-/**
- * Created by ROGK on 2017/7/18.
- */
-@Entity
-@Table(name = "target_dev")
-public class DevTarget {
-    @Id
-    @GeneratedValue
-    private long id;
-
-    @Column(name = "upload_case_id")
-    private Long uploadedCaseId;
-
-    @Column(name = "end_time_millis")
-    private Long endTimeMillis;
-
-    @Column(name = "language")
-    private String language;
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public Long getUploadedCaseId() {
-        return uploadedCaseId;
-    }
-
-    public void setUploadedCaseId(long uploadedCaseId) {
-        this.uploadedCaseId = uploadedCaseId;
-    }
-
-    public Long getEndTimeMillis() {
-        return endTimeMillis;
-    }
-
-    public void setEndTimeMillis(long endTimeMillis) {
-        this.endTimeMillis = endTimeMillis;
-    }
-
-    public String getLanguage() {
-        return language;
-    }
-
-    public void setLanguage(String language) {
-        this.language = language;
-    }
-}

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/models/WebTarget.java

@@ -1,56 +0,0 @@
-package cn.iselab.mooctest.site.models;
-
-import javax.persistence.*;
-
-/**
- * Created by ROGK on 2017/9/4.
- */
-@Entity
-@Table(name = "target_web")
-public class WebTarget {
-
-    @Id
-    @GeneratedValue
-    private long id;
-
-    @Column(name = "super_id")
-    private Long superId;
-
-    @Column(name = "end_time_millis")
-    private Long endTimeMillis;
-
-    @Column(name = "category")
-    private String category;
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public Long getSuperId() {
-        return superId;
-    }
-
-    public void setSuperId(long superId) {
-        this.superId = superId;
-    }
-
-    public Long getEndTimeMillis() {
-        return endTimeMillis;
-    }
-
-    public void setEndTimeMillis(long endTimeMillis) {
-        this.endTimeMillis = endTimeMillis;
-    }
-
-    public String getCategory() {
-        return category;
-    }
-
-    public void setCategory(String category) {
-        this.category = category;
-    }
-}

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/models/fromKibug/Application.java

@@ -1,167 +0,0 @@
-package cn.iselab.mooctest.site.models.fromKibug;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-
-import javax.persistence.*;
-
-/**
- * Created by NJUta on 2017/5/26.
- */
-@JsonIgnoreProperties({"managerId", "createTimeMillis", "extra", "from"})
-@Entity
-@Table(name = "application")
-public class Application {
-    @Id
-    private long id;
-    @Column(name = "manager_id")
-    private long managerId;
-    /**
-     * 与慕测上传的原始需求相对应的外键
-     */
-    @Column(name = "uploaded_case_id")
-    private long uploadedCaseId;
-    @Column(name = "name")
-    private String name;
-    @Column(name = "platform")
-    private short platform;
-    @Column(name = "category")
-    private String category;
-    @Column(name = "icon_location")
-    private String iconLocation;
-    @Column(name = "app_location")
-    private String appLocation;
-    @Column(name = "require_location")
-    private String requireLocation;
-    @Column(name = "launch_data")
-    private String launchData;
-    @Column(name = "create_time_millis")
-    private long createTimeMillis;
-    @Column(name = "end_time_millis")
-    private long endTimeMillis;
-    @Column(name = "test_type")
-    private short testType;
-    @Column(name = "status")
-    private short status;
-    @Column(name = "from_cloud")
-    private int fromCloud;
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public long getManagerId() {
-        return managerId;
-    }
-
-    public void setManagerId(long managerId) {
-        this.managerId = managerId;
-    }
-
-    public long getUploadedCaseId() {
-        return uploadedCaseId;
-    }
-
-    public void setUploadedCaseId(long uploadedCaseId) {
-        this.uploadedCaseId = uploadedCaseId;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public short getPlatform() {
-        return platform;
-    }
-
-    public void setPlatform(short platform) {
-        this.platform = platform;
-    }
-
-    public String getCategory() {
-        return category;
-    }
-
-    public void setCategory(String category) {
-        this.category = category;
-    }
-
-    public String getIconLocation() {
-        return iconLocation;
-    }
-
-    public void setIconLocation(String iconLocation) {
-        this.iconLocation = iconLocation;
-    }
-
-    public String getAppLocation() {
-        return appLocation;
-    }
-
-    public void setAppLocation(String appLocation) {
-        this.appLocation = appLocation;
-    }
-
-    public String getRequireLocation() {
-        return requireLocation;
-    }
-
-    public void setRequireLocation(String requireLocation) {
-        this.requireLocation = requireLocation;
-    }
-
-    public String getLaunchData() {
-        return launchData;
-    }
-
-    public void setLaunchData(String launchData) {
-        this.launchData = launchData;
-    }
-
-    public long getCreateTimeMillis() {
-        return createTimeMillis;
-    }
-
-    public void setCreateTimeMillis(long createTimeMillis) {
-        this.createTimeMillis = createTimeMillis;
-    }
-
-    public long getEndTimeMillis() {
-        return endTimeMillis;
-    }
-
-    public void setEndTimeMillis(long endTimeMillis) {
-        this.endTimeMillis = endTimeMillis;
-    }
-
-    public short getTestType() {
-        return testType;
-    }
-
-    public void setTestType(short testType) {
-        this.testType = testType;
-    }
-
-    public short getStatus() {
-        return status;
-    }
-
-    public void setStatus(short status) {
-        this.status = status;
-    }
-
-    public int getFromCloud() {
-        return fromCloud;
-    }
-
-    public void setFromCloud(int fromCloud) {
-        this.fromCloud = fromCloud;
-    }
-}

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/service/TargetService.java

@@ -1,7 +1,6 @@
 package cn.iselab.mooctest.site.service;
 
 import cn.iselab.mooctest.site.models.*;
-import cn.iselab.mooctest.site.models.fromKibug.Application;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/service/fromKibug/ApplicationService.java

@@ -1,16 +0,0 @@
-package cn.iselab.mooctest.site.service.fromKibug;
-
-import cn.iselab.mooctest.site.models.fromKibug.Application;
-
-/**
- * Created by NJUta on 2017/5/27.
- */
-public interface ApplicationService {
-    Application getAppById(long id) throws Exception;
-
-    Application getAppByUploaderCaseId(long id) throws Exception;
-
-    void createApp(Application application) throws Exception;
-
-    Application getApplicaitonByUploaderCaseId(long id) throws Exception;
-}

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/service/fromKibug/impl/ApplicationServiceImpl.java

@@ -1,97 +0,0 @@
-package cn.iselab.mooctest.site.service.fromKibug.impl;
-
-import cn.iselab.mooctest.site.common.enums.AppPlatform;
-import cn.iselab.mooctest.site.common.enums.AppStatus;
-import cn.iselab.mooctest.site.common.enums.AppTestType;
-import cn.iselab.mooctest.site.dao.fromKibug.ApplicationDao;
-import cn.iselab.mooctest.site.dao.fromKibug.IncrementIdDao;
-import cn.iselab.mooctest.site.models.fromKibug.Application;
-import cn.iselab.mooctest.site.models.fromKibug.IncrementId;
-import cn.iselab.mooctest.site.models.fromKibug.LaunchData;
-import cn.iselab.mooctest.site.service.fromKibug.ApplicationService;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service
-public class ApplicationServiceImpl implements ApplicationService {
-    @Autowired
-    private ApplicationDao applicationDao;
-    @Autowired
-    private IncrementIdDao incrementIdDao;
-
-    private ObjectMapper mapper = new ObjectMapper();
-
-    @Override
-    public Application getAppById(long id) throws Exception {
-        return applicationDao.findOne(id);
-    }
-
-
-    private void checkComplete(Application app) {
-        AppPlatform appPlatform = AppPlatform.fromShort(app.getPlatform());
-        LaunchData launchData;
-        try {
-            launchData = mapper.readValue(app.getLaunchData(), LaunchData.class);
-        } catch (Exception e) {
-            launchData = new LaunchData();
-        }
-
-        boolean incomplete = false;
-        boolean isAutoTest = AppTestType.isAuto(app.getTestType());
-        boolean isManualTest = AppTestType.isManual(app.getTestType());
-
-        if (isManualTest) {
-            //人工测试需要应用图标,应用安装文件,需求文件
-            incomplete = incomplete || org.springframework.util.StringUtils.isEmpty(app.getIconLocation()) || org.springframework.util.StringUtils.isEmpty(app.getAppLocation())
-                    || org.springframework.util.StringUtils.isEmpty(app.getRequireLocation());
-            //如果是安卓的话,则还需要activity,package,driver
-            if (appPlatform == AppPlatform.ANDROID) {
-                incomplete = incomplete || org.springframework.util.StringUtils.isEmpty(launchData.getActivity()) || org.springframework.util.StringUtils.isEmpty(launchData.getPackageName())
-                        || org.springframework.util.StringUtils.isEmpty(launchData.getDriver());
-            } else if (appPlatform == AppPlatform.IOS) {//ios需要schema
-                incomplete = incomplete || org.springframework.util.StringUtils.isEmpty(launchData.getSchema());
-            } else if (appPlatform == AppPlatform.JMETER) {//jmeter需要评分文件
-                incomplete = incomplete || org.springframework.util.StringUtils.isEmpty(launchData.getRules());
-            }
-        }
-
-        //如果只是自动测试的话,则只需要应用的安装文件和图标即可
-        if (!isManualTest && isAutoTest) {
-            incomplete = incomplete || org.springframework.util.StringUtils.isEmpty(app.getAppLocation()) || org.springframework.util.StringUtils.isEmpty(app.getIconLocation());
-        }
-
-        if (incomplete) {
-            app.setStatus(AppStatus.NEW.getStatus());
-        } else {
-            app.setStatus(AppStatus.COMPLETE.getStatus());
-            if (isAutoTest) {
-                app.setTestType(AppTestType.setRequestAuto(app.getTestType()));
-            }
-        }
-    }
-
-    public Application getAppByUploaderCaseId(long id){
-        return applicationDao.getApplicationByUploadedCaseId(id);
-    }
-
-    public void createApp(Application application){
-        IncrementId incrementId = incrementIdDao.save(new IncrementId());
-        application.setId(incrementId.getId());
-        if(application.getEndTimeMillis()==0) {
-            application.setEndTimeMillis(System.currentTimeMillis() + 2592000000l);
-        }
-        checkComplete(application);
-        applicationDao.save(application);
-    }
-    public Application getApplicaitonByUploaderCaseId(long id){
-        List<Application> list=applicationDao.getAppsByUploadedCaseId(id);
-        if(!list.isEmpty()){
-            return list.get(0);
-        }
-        else
-            return null;
-    }
-}

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/service/impl/TargetServiceImpl.java

@@ -2,14 +2,10 @@ package cn.iselab.mooctest.site.service.impl;
 
 import cn.iselab.mooctest.site.common.enums.AppPlatform;
 import cn.iselab.mooctest.site.dao.*;
-import cn.iselab.mooctest.site.dao.fromKibug.ApplicationDao;
 import cn.iselab.mooctest.site.dao.fromKibug.IncrementIdDao;
 import cn.iselab.mooctest.site.models.*;
-import cn.iselab.mooctest.site.models.fromKibug.Application;
-import cn.iselab.mooctest.site.models.fromKibug.IncrementId;
 import cn.iselab.mooctest.site.service.BaseService;
 import cn.iselab.mooctest.site.service.TargetService;
-import cn.iselab.mooctest.site.service.fromDev.AnalysisService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
@@ -42,15 +38,6 @@ public class TargetServiceImpl extends BaseService implements TargetService {
     IncrementIdDao incrementIdDao;
 
     @Autowired
-    ApplicationDao applicationDao;
-
-    @Autowired
-    TargetDevDao targetDevDao;
-
-    @Autowired
-    TargetWebDao targetWebDao;
-
-    @Autowired
     App2UserDao app2UserDao;
 
     @Autowired

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/service/webIDE/impl/DockerImageServiceImpl.java

@@ -2,17 +2,19 @@ package cn.iselab.mooctest.site.service.webIDE.impl;
 
 import cn.iselab.mooctest.site.common.constant.AnswerWayConstants;
 import cn.iselab.mooctest.site.common.constant.TargetTypeConstants;
-import cn.iselab.mooctest.site.dao.TargetDevDao;
+import cn.iselab.mooctest.site.dao.TargetExtendsDao;
 import cn.iselab.mooctest.site.models.App;
-import cn.iselab.mooctest.site.models.DevTarget;
+import cn.iselab.mooctest.site.models.TargetExtends;
 import cn.iselab.mooctest.site.service.CaseService;
 import cn.iselab.mooctest.site.service.TargetService;
 import cn.iselab.mooctest.site.service.webIDE.DockerImageService;
+import cn.iselab.mooctest.site.web.exception.HttpNotFoundException;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -29,7 +31,7 @@ public class DockerImageServiceImpl implements DockerImageService, InitializingB
     CaseService caseService;
 
     @Autowired
-    TargetDevDao targetDevDao;
+    TargetExtendsDao targetExtendsDao;
     private Map<String, String> targetDockerMap = new HashMap();
 
     @Override
@@ -37,14 +39,24 @@ public class DockerImageServiceImpl implements DockerImageService, InitializingB
         App target = targetService.findById(targetId);
         String key = target.getTargetType() + "";
         if (target.getTargetType() == TargetTypeConstants.DEV) {
-            DevTarget devTarget = targetDevDao.findByUploadedCaseId(targetId);
-            key = key + "_" + devTarget.getLanguage();
+            String language = getTargetLanguage(targetId);
+            key = key + "_" + language;
         } else if (target.getTargetType() == TargetTypeConstants.WEB) {
             key = key + "_" + caseService.getCaseExtendsById(caseId).getAnswerWay();
         }
         return targetDockerMap.get(key);
     }
 
+    private String getTargetLanguage(Long targetId){
+        List<TargetExtends> targetExtendsList = targetExtendsDao.findByTargetId(targetId);
+        for (TargetExtends t:targetExtendsList){
+            if ("language".equals(t.getPropertyName())){
+                return t.getPropertyValue();
+            }
+        }
+        throw new HttpNotFoundException(String.format("Target[%s] don't have language property",targetId));
+    }
+
     @Override
     public void afterPropertiesSet() throws Exception {
 

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/data/TargetDevVO.java

@@ -1,38 +0,0 @@
-package cn.iselab.mooctest.site.web.data;
-
-import lombok.Data;
-
-/**
- * Created by ROGK on 2017/7/18.
- */
-@Data
-public class TargetDevVO extends TargetVO{
-    private Long devId;
-    private Long uploadCaseId;
-    private String extra;
-    private String language;
-
-    public long getDevId() {
-        return devId;
-    }
-
-    public void setDevId(long devId) {
-        this.devId = devId;
-    }
-
-    public long getUploadCaseId() {
-        return uploadCaseId;
-    }
-
-    public void setUploadCaseId(long uploadCaseId) {
-        this.uploadCaseId = uploadCaseId;
-    }
-
-    public String getExtra() {
-        return extra;
-    }
-
-    public void setExtra(String extra) {
-        this.extra = extra;
-    }
-}

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/data/TargetKibugVO.java

@@ -1,89 +0,0 @@
-package cn.iselab.mooctest.site.web.data;
-
-/**
- * Created by ROGK on 2017/6/21.
- */
-public class TargetKibugVO extends TargetVO{
-
-    private Long kibugId;
-    private String platform;
-    private String category;
-    private String iconLocation;
-    private String appLocation;
-    private String requireLocation;
-    private String extra;
-    private String launchData;
-    private Integer appSize;
-
-    public Long getKibugId() {
-        return kibugId;
-    }
-
-    public void setKibugId(long kibugId) {
-        this.kibugId = kibugId;
-    }
-
-    public String getPlatform() {
-        return platform;
-    }
-
-    public void setPlatform(String platform) {
-        this.platform = platform;
-    }
-
-    public String getCategory() {
-        return category;
-    }
-
-    public void setCategory(String category) {
-        this.category = category;
-    }
-
-    public String getIconLocation() {
-        return iconLocation;
-    }
-
-    public void setIconLocation(String iconLocation) {
-        this.iconLocation = iconLocation;
-    }
-
-    public String getAppLocation() {
-        return appLocation;
-    }
-
-    public void setAppLocation(String appLocation) {
-        this.appLocation = appLocation;
-    }
-
-    public String getRequireLocation() {
-        return requireLocation;
-    }
-
-    public void setRequireLocation(String requireLocation) {
-        this.requireLocation = requireLocation;
-    }
-
-    public String getExtra() {
-        return extra;
-    }
-
-    public void setExtra(String extra) {
-        this.extra = extra;
-    }
-
-    public String getLaunchData() {
-        return launchData;
-    }
-
-    public void setLaunchData(String launchData) {
-        this.launchData = launchData;
-    }
-
-    public Integer getAppSize() {
-        return appSize;
-    }
-
-    public void setAppSize(int appSize) {
-        this.appSize = appSize;
-    }
-}

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/data/TargetWebVO.java

@@ -1,21 +0,0 @@
-package cn.iselab.mooctest.site.web.data;
-
-import lombok.Data;
-
-/**
- * Created by ROGK on 2017/8/28.
- */
-@Data
-public class TargetWebVO extends TargetVO {
-    private String extra;
-
-    private String category;
-
-    public String getExtra() {
-        return extra;
-    }
-
-    public void setExtra(String extra) {
-        this.extra = extra;
-    }
-}

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/data/wrapper/CaseVOWrapper.java

@@ -5,7 +5,6 @@ import cn.iselab.mooctest.site.models.App;
 import cn.iselab.mooctest.site.models.CaseExtends;
 import cn.iselab.mooctest.site.models.TargetExtends;
 import cn.iselab.mooctest.site.service.TargetService;
-import cn.iselab.mooctest.site.service.fromKibug.ApplicationService;
 import cn.iselab.mooctest.site.web.data.CaseVO;
 import cn.iselab.mooctest.site.web.data.fromKibug.KibugCaseVO;
 import org.json.JSONObject;
@@ -25,9 +24,6 @@ import java.util.Map;
 public class CaseVOWrapper extends BaseWrapper<CaseVO, CaseExtends> {
 
     @Autowired
-    private ApplicationService applicationService;
-
-    @Autowired
     private TargetService targetService;
 
     @Override

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/data/wrapper/TargetDevVOWrapper.java

@@ -1,53 +0,0 @@
-package cn.iselab.mooctest.site.web.data.wrapper;
-
-import cn.iselab.mooctest.site.models.App;
-import cn.iselab.mooctest.site.models.DevTarget;
-import cn.iselab.mooctest.site.web.data.TargetDevVO;
-import org.springframework.stereotype.Service;
-
-import java.sql.Timestamp;
-
-/**
- * Created by ROGK on 2017/7/18.
- */
-@Service
-public class TargetDevVOWrapper {
-
-    public App wrap(TargetDevVO targetDevVO){
-        App app=new App();
-        app.setCreateTime(new Timestamp(targetDevVO.getCreateTimeMillis()));
-        app.setTargetType(targetDevVO.getTargetType());
-        app.setMessage(targetDevVO.getExtra());
-        app.setUrl(targetDevVO.getUrl());
-        app.setName(targetDevVO.getName());
-        app.setOwnerId(targetDevVO.getOwnerId());
-        app.setVisible(targetDevVO.isVisible());
-        app.setStatus(targetDevVO.getStatus());
-        return app;
-    }
-
-    public DevTarget wrapDev(TargetDevVO targetDevVO){
-        DevTarget devTarget=new DevTarget();
-        devTarget.setEndTimeMillis(targetDevVO.getEndTimeMillis());
-        devTarget.setLanguage(targetDevVO.getLanguage());
-        return devTarget;
-    }
-
-    public TargetDevVO unwrap(App app,DevTarget devTarget){
-        TargetDevVO devVO = new TargetDevVO();
-        devVO.setId(app.getId());
-        devVO.setCreateTimeMillis(app.getCreateTime().getTime());
-        devVO.setOwnerId(app.getOwnerId());
-        devVO.setName(app.getName());
-        devVO.setTargetType(app.getTargetType());
-        devVO.setStatus(app.getStatus());
-        devVO.setUrl(app.getUrl());
-        devVO.setExtra(app.getMessage());
-        devVO.setDevId(devTarget.getId());
-        devVO.setEndTimeMillis(devTarget.getEndTimeMillis());
-        devVO.setUploadCaseId(devTarget.getUploadedCaseId());
-        devVO.setVisible(app.getVisible());
-        devVO.setLanguage(devTarget.getLanguage());
-        return  devVO;
-    }
-}

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/data/wrapper/TargetKibugVOWrapper.java

@@ -1,70 +0,0 @@
-package cn.iselab.mooctest.site.web.data.wrapper;
-
-import cn.iselab.mooctest.site.common.enums.AppPlatform;
-import cn.iselab.mooctest.site.models.App;
-import cn.iselab.mooctest.site.models.fromKibug.Application;
-import cn.iselab.mooctest.site.web.data.TargetKibugVO;
-import cn.iselab.mooctest.site.web.data.TargetVO;
-import org.springframework.stereotype.Service;
-
-/**
- * Created by ROGK on 2017/6/21.
- */
-@Service
-public class TargetKibugVOWrapper extends BaseWrapper<TargetKibugVO,Application>{
-
-    @Override
-    public TargetKibugVO wrap(Application application){
-        TargetKibugVO targetKibugVO=new TargetKibugVO();
-        targetKibugVO.setKibugId(application.getId());
-        targetKibugVO.setAppLocation(application.getAppLocation());
-        targetKibugVO.setCategory(application.getCategory());
-        targetKibugVO.setIconLocation(application.getIconLocation());
-        targetKibugVO.setLaunchData(application.getLaunchData());
-        targetKibugVO.setPlatform(AppPlatform.fromShort(application.getPlatform()).getPlatform());
-        targetKibugVO.setRequireLocation(application.getRequireLocation());
-        return targetKibugVO;
-    }
-
-    @Override
-    public Application unwrap(TargetKibugVO targetKibugVO){
-        Application application=new Application();
-        application.setAppLocation(targetKibugVO.getAppLocation());
-        application.setIconLocation(targetKibugVO.getIconLocation());
-        application.setCategory(targetKibugVO.getCategory());
-        application.setLaunchData(targetKibugVO.getLaunchData());
-        application.setCreateTimeMillis(targetKibugVO.getCreateTimeMillis());
-        application.setRequireLocation(targetKibugVO.getRequireLocation());
-        //application.setId(targetKibugVO.getKibugId());
-        application.setName(targetKibugVO.getName());
-        application.setPlatform(AppPlatform.parse(targetKibugVO.getPlatform()).getPlatformId());
-        return application;
-    }
-
-    public App wrapApp(TargetKibugVO targetKibugVO){
-        App app=new App();
-        app.setName(targetKibugVO.getName());
-        app.setUrl(targetKibugVO.getUrl());
-        app.setVisible(targetKibugVO.isVisible());
-        app.setTargetType(targetKibugVO.getTargetType());
-        app.setStatus(targetKibugVO.getStatus());
-        app.setOwnerId(targetKibugVO.getOwnerId());
-        app.setUrl(targetKibugVO.getUrl());
-        app.setMessage(targetKibugVO.getExtra());
-        return  app;
-    }
-
-    public TargetKibugVO wrap(App app,Application application){
-        TargetKibugVO targetKibugVO=wrap(application);
-        targetKibugVO.setId(app.getId());
-        targetKibugVO.setVisible(app.getVisible());
-        targetKibugVO.setTargetType(app.getTargetType());
-        targetKibugVO.setStatus(app.getStatus());
-        targetKibugVO.setCreateTimeMillis(app.getCreateTime().getTime());
-        targetKibugVO.setName(app.getName());
-        targetKibugVO.setUrl(app.getUrl());
-        targetKibugVO.setExtra(app.getMessage());
-        targetKibugVO.setOwnerId(app.getOwnerId());
-        return targetKibugVO;
-    }
-}

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/data/wrapper/TargetWebVOWrapper.java

@@ -1,51 +0,0 @@
-package cn.iselab.mooctest.site.web.data.wrapper;
-
-import cn.iselab.mooctest.site.models.App;
-import cn.iselab.mooctest.site.models.WebTarget;
-import cn.iselab.mooctest.site.web.data.TargetWebVO;
-import org.springframework.stereotype.Service;
-
-import java.sql.Timestamp;
-
-/**
- * Created by ROGK on 2017/8/28.
- */
-@Service
-public class TargetWebVOWrapper{
-
-    public App wrap(TargetWebVO vo){
-        App app=new App();
-        app.setId(vo.getId());
-        app.setCreateTime(new Timestamp(vo.getCreateTimeMillis()));
-        app.setName(vo.getName());
-        app.setVisible(vo.isVisible());
-        app.setTargetType(vo.getTargetType());
-        app.setUrl(vo.getUrl());
-        app.setOwnerId(vo.getOwnerId());
-        app.setMessage(vo.getExtra());
-        return app;
-    }
-
-    public WebTarget wrapWeb(TargetWebVO vo){
-        WebTarget webTarget=new WebTarget();
-        webTarget.setEndTimeMillis(vo.getEndTimeMillis());
-        webTarget.setCategory(vo.getCategory());
-        return  webTarget;
-    }
-
-    public TargetWebVO unwrap(App app,WebTarget webTarget){
-        TargetWebVO vo=new TargetWebVO();
-        vo.setExtra(app.getMessage());
-        vo.setCreateTimeMillis(app.getCreateTime().getTime());
-        vo.setName(app.getName());
-        vo.setOwnerId(app.getOwnerId());
-        vo.setId(app.getId());
-        vo.setStatus(app.getStatus());
-        vo.setVisible(app.getVisible());
-        vo.setTargetType(app.getTargetType());
-        vo.setUrl(app.getUrl());
-        vo.setExtra(app.getMessage());
-        vo.setCategory(webTarget.getCategory());
-        return vo;
-    }
-}

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/logic/impl/CaseLogicImpl.java

@@ -11,7 +11,6 @@ import cn.iselab.mooctest.site.models.*;
 import cn.iselab.mooctest.site.models.fromKibug.Report;
 import cn.iselab.mooctest.site.service.*;
 import cn.iselab.mooctest.site.service.fromDev.IndexService;
-import cn.iselab.mooctest.site.service.fromKibug.ApplicationService;
 import cn.iselab.mooctest.site.service.fromKibug.ReportService;
 import cn.iselab.mooctest.site.service.instancePermission.CasePermissionService;
 import cn.iselab.mooctest.site.service.updownload.DownloadService;
@@ -57,9 +56,6 @@ public class CaseLogicImpl implements CaseLogic {
     private TaskService taskService;
 
     @Autowired
-    private ApplicationService applicationService;
-
-    @Autowired
     private UserService userService;
 
     @Autowired

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/logic/impl/TargetLogicImpl.java

@@ -5,14 +5,12 @@ import cn.iselab.mooctest.site.common.constant.TargetTypeConstants;
 import cn.iselab.mooctest.site.common.event.EventUtil;
 import cn.iselab.mooctest.site.common.event.GetTargetGraphEvent;
 import cn.iselab.mooctest.site.models.*;
-import cn.iselab.mooctest.site.models.fromKibug.Application;
 import cn.iselab.mooctest.site.rpc.dev.data.NodeResultDTO;
 import cn.iselab.mooctest.site.service.AppService;
 import cn.iselab.mooctest.site.service.TargetGraphService;
 import cn.iselab.mooctest.site.service.TargetService;
 import cn.iselab.mooctest.site.service.common.NodeUrlService;
 import cn.iselab.mooctest.site.service.fromDev.AnalysisService;
-import cn.iselab.mooctest.site.service.fromKibug.ApplicationService;
 import cn.iselab.mooctest.site.service.instancePermission.AppPermissionService;
 import cn.iselab.mooctest.site.web.data.*;
 import cn.iselab.mooctest.site.web.data.targetVO.TargetCreateVO;
@@ -30,7 +28,6 @@ import cn.iselab.mooctest.site.web.logic.asyncProgress.PythonNodeProgressLogic;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authz.UnauthorizedException;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.convert.converter.Converter;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;

mooctest-site-server/src/test/java/cn/iselab/mooctest/site/service/fromKibug/impl/ScoreRuleServiceImplTest.java

@@ -4,8 +4,6 @@ import cn.iselab.mooctest.site.common.enums.ScoreRuleKey;
 import cn.iselab.mooctest.site.dao.WeightDao;
 import cn.iselab.mooctest.site.dao.fromKibug.ScoreRuleDao;
 import cn.iselab.mooctest.site.models.Weight;
-import cn.iselab.mooctest.site.models.fromKibug.Application;
-import cn.iselab.mooctest.site.models.fromKibug.IncrementId;
 import cn.iselab.mooctest.site.models.fromKibug.ScoreRule;
 import cn.iselab.mooctest.site.models.fromKibug.ScoreRulePK;
 import cn.iselab.mooctest.site.service.CalculateScoreService;

mooctest-site-server/src/test/java/cn/iselab/mooctest/site/service/impl/TargetServiceImplTest.java

@@ -2,12 +2,8 @@ package cn.iselab.mooctest.site.service.impl;
 
 import cn.iselab.mooctest.site.Application;
 import cn.iselab.mooctest.site.dao.TargetDao;
-import cn.iselab.mooctest.site.dao.TargetDevDao;
-import cn.iselab.mooctest.site.dao.fromKibug.ApplicationDao;
 import cn.iselab.mooctest.site.dao.fromKibug.IncrementIdDao;
 import cn.iselab.mooctest.site.models.App;
-import cn.iselab.mooctest.site.models.DevTarget;
-import cn.iselab.mooctest.site.models.fromKibug.IncrementId;
 import cn.iselab.mooctest.site.service.TargetService;
 import org.junit.Assert;
 import org.junit.Before;
@@ -15,7 +11,6 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 import org.mockito.runners.MockitoJUnitRunner;
 import org.springframework.boot.test.SpringApplicationConfiguration;
@@ -23,19 +18,14 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
-import org.springframework.data.jpa.domain.Specification;
 import org.springframework.data.jpa.domain.Specifications;
 import org.springframework.test.context.web.WebAppConfiguration;
 
-import javax.transaction.Transactional;
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.junit.Assert.*;
 import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyLong;
-import static org.mockito.Matchers.anyObject;
 import static org.mockito.Mockito.when;
 
 
@@ -52,12 +42,6 @@ public class TargetServiceImplTest {
 
     @Mock
     TargetDao targetDao;
-    @Mock
-    IncrementIdDao incrementIdDao;
-    @Mock
-    TargetDevDao targetDevDao;
-    @Mock
-    ApplicationDao applicationDao;
 
     List<App> apps=new ArrayList<>();
     Pageable pageable;

mooctest-site-server/src/test/java/cn/iselab/mooctest/site/web/ctrl/TargetControllerTest.java

@@ -1,109 +0,0 @@
-package cn.iselab.mooctest.site.web.ctrl;
-
-import cn.iselab.mooctest.site.Application;
-import cn.iselab.mooctest.site.web.response.ResponseMessage;
-import cn.iselab.mooctest.site.web.response.SuccessResult;
-import cn.iselab.mooctest.site.web.data.TargetDevVO;
-import cn.iselab.mooctest.site.web.data.TargetKibugVO;
-import cn.iselab.mooctest.site.web.data.TargetVO;
-import cn.iselab.mooctest.site.web.logic.TargetLogic;
-import org.json.JSONArray;
-import org.json.JSONObject;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
-import org.springframework.boot.test.SpringApplicationConfiguration;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Page;
-import org.springframework.http.MediaType;
-import org.springframework.test.context.web.WebAppConfiguration;
-import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.test.web.servlet.MvcResult;
-import org.springframework.test.web.servlet.setup.MockMvcBuilders;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.mockito.Matchers.*;
-import static org.mockito.MockitoAnnotations.initMocks;
-import static org.mockito.Mockito.when;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
-import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-
-/**
- * Created by ROGK on 2017/6/26.
- */
-@RunWith(MockitoJUnitRunner.class)
-@WebAppConfiguration
-@SpringApplicationConfiguration(classes = Application.class)
-public class TargetControllerTest {
-
-    private MockMvc mockMvc;
-
-    @InjectMocks
-    TargetController targetController=new TargetController();
-
-    @Mock
-    TargetLogic targetLogic;
-
-    Pageable pageable;
-    List<TargetVO> targets=new ArrayList<>();
-    TargetVO targetVO=new TargetVO();
-    TargetKibugVO targetKibugVO=new TargetKibugVO();
-    SuccessResult expect=new SuccessResult();
-    long expectId;
-    @Before
-    public void setupMockMvc() throws Exception {
-        initMocks(this);
-        mockMvc= MockMvcBuilders.standaloneSetup(targetController).build();
-
-        targetVO.setVisible(false);
-        targetVO.setId(1L);
-        targetVO.setName("test");
-        targetVO.setUrl("test");
-        targetVO.setTargetType(1L);
-        targetVO.setCreateTimeMillis(1497856288L);
-        targetVO.setStatus(1);
-        targetVO.setEndTimeMillis(1497856289L);
-        targetVO.setFromCloud(1);
-
-        targetKibugVO.setVisible(false);
-        targetKibugVO.setId(1L);
-        targetKibugVO.setName("test");
-        targetKibugVO.setUrl("test");
-        targetKibugVO.setTargetType(1L);
-        targetKibugVO.setCreateTimeMillis(1497856288L);
-        targetKibugVO.setStatus(1);
-        targetKibugVO.setEndTimeMillis(1497856289L);
-        targetKibugVO.setFromCloud(1);
-        targetKibugVO.setAppLocation("test");
-        targetKibugVO.setPlatform("Android");
-        targetKibugVO.setKibugId(1L);
-
-        expect.put(ResponseMessage.ITEM_RESULT,targetKibugVO);
-
-        targets.add(targetVO);
-        pageable=new PageRequest(0, 10);
-        expectId=1;
-    }
-
-    @Test
-    public void should_return_TargetKibugVO_when_TargetKibugVOExists()throws Exception{
-        when(targetLogic.getTarget(anyLong())).thenReturn(null);
-
-        MvcResult result=mockMvc.perform(
-                get("/api/target/kibug").param("targetId","1")
-        ).andDo(print()).andExpect(status().isOk()).andReturn();
-
-        JSONObject object=new JSONObject(result.getResponse().getContentAsString());
-        Assert.assertEquals(targetKibugVO.getName(),object.getJSONObject("data").getString("name"));
-    }
-}

mooctest-site-server/src/test/java/cn/iselab/mooctest/site/web/logic/impl/CaseLogicImplTest.java

@@ -1,12 +1,8 @@
 package cn.iselab.mooctest.site.web.logic.impl;
 
 import cn.iselab.mooctest.site.common.constant.AnswerWayConstants;
-import cn.iselab.mooctest.site.data.CaseBlock;
 import cn.iselab.mooctest.site.models.*;
-import cn.iselab.mooctest.site.models.fromKibug.Application;
-import cn.iselab.mooctest.site.models.fromKibug.Report;
 import cn.iselab.mooctest.site.service.*;
-import cn.iselab.mooctest.site.service.fromKibug.ApplicationService;
 import cn.iselab.mooctest.site.service.fromKibug.ReportService;
 import cn.iselab.mooctest.site.web.data.CaseExtendsVO;
 import org.junit.Assert;
@@ -48,8 +44,6 @@ public class CaseLogicImplTest {
     @Mock
     private AppService appService;
     @Mock
-    private ApplicationService applicationService;
-    @Mock
     private UserService userService;
     @Mock
     private RoleService roleService;
@@ -169,45 +163,6 @@ public class CaseLogicImplTest {
     }
 
     @Test
-    public void should_returnCaseList_when_givenTaskId() throws Exception {
-        //arrange
-        List<Long> caseIds = new ArrayList<>();
-        caseIds.add(456L);
-        CaseBlock caseBlock = new CaseBlock();
-        caseBlock.setCaseIds(caseIds);
-        List<CaseBlock> caseBlockList = new ArrayList<>();
-        caseBlockList.add(caseBlock);
-        Application app = new Application();
-        app.setId(789L);
-        app.setAppLocation("appLocation");
-        when(caseService.getCaseExtendsById(456L)).thenReturn(caseExtends);
-        when(taskService.getCaseBlocks(123L)).thenReturn(caseBlockList);
-        when(applicationService.getAppById(789)).thenReturn(app);
-        //action
-        List<CaseExtendsVO> result = caseLogic.getCasesByTaskId(123L);
-        //assert
-        Assert.assertEquals(Long.valueOf(456L),result.get(0).getId());
-        Assert.assertEquals("appLocation",result.get(0).getAppLocation());
-    }
-
-    @Test
-    public void should_returnCaseExtends_when_givenKibugCaseExtendsId() throws Exception {
-        //arrange
-        App app=new App();
-        app.setName("Test");
-        Application application=new Application();
-        application.setName("Target");
-        when(caseService.getCaseExtendsById(123)).thenReturn(caseExtends);
-        when(appService.findById(anyLong())).thenReturn(app);
-        when(applicationService.getAppById(789L)).thenReturn(application);
-        //action
-        CaseExtendsVO result = caseLogic.getCaseExtends(123L);
-        //assert
-        Assert.assertEquals(Long.valueOf(456L),result.getId());
-        Assert.assertEquals("Target",result.getTargetName());
-    }
-
-    @Test
     public void should_returnCaseExtends_when_givenDevCaseExtendsId() throws Exception {
         //arrange
         App app=new App();
@@ -253,50 +208,6 @@ public class CaseLogicImplTest {
         Assert.assertEquals(Long.valueOf(456L),result.getContent().get(0).getId());
     }
 
-    @Test
-    public void should_return_CaseList_when_givenKibugExamId_and_isManager() throws Exception{
-
-        User user=new User();
-        user.setId(1L);
-
-        Role role=new Role();
-        role.setId(2L);
-        Role role1=new Role();
-        role1.setId(3L);
-        List<Role> roles=new ArrayList<>();
-        roles.add(role);
-        roles.add(role1);
-
-        CaseBlock caseBlock = new CaseBlock();
-        List<Long> caseIds=new ArrayList<>();
-        caseIds.add(1L);
-        caseBlock.setCaseIds(caseIds);
-        List<CaseBlock> caseBlockList = new ArrayList<>();
-        caseBlockList.add(caseBlock);
-
-        Application application=new Application();
-
-        Report report=new Report();
-        report.setId(1L);
-
-        caseExtendsVOList.get(0).setReportId(1L);
-        caseExtendsVOList.get(0).setCaseReportUrl("/report/list/1/1");
-
-//        when(userService.findByEmail(anyString())).thenReturn(user);
-        when(roleService.getRolesOfUser(anyLong())).thenReturn(roles);
-        when(exam2CaseService.getCaseBlocks(anyLong(),anyLong())).thenReturn(caseBlockList);
-        when(caseService.getCaseExtendsById(anyLong())).thenReturn(caseExtends);
-        when(applicationService.getAppById(anyLong())).thenReturn(application);
-        when(reportService.getReport(anyLong(),anyLong(),anyLong())).thenReturn(report);
-        when(openId2UserIdService.findOpenIdByUserId(anyLong())).thenReturn("test");
-
-        List<CaseExtendsVO> result=caseLogic.getCasesForExam(1L,1L,1L);
-
-        Assert.assertEquals(caseExtendsVOList.get(0).getReportId(),result.get(0).getReportId());
-        Assert.assertEquals(caseExtendsVOList.get(0).getCaseReportUrl(),result.get(0).getCaseReportUrl());
-
-    }
-
     public void should_throwException_when_update_caseExtendsIdNotExists(){
         //arrange
         when(caseService.getCaseExtendsById(17L)).thenReturn(null);

mooctest-site-server/src/test/java/cn/iselab/mooctest/site/web/logic/impl/TargetLogicImplTest.java

@@ -1,21 +1,10 @@
 package cn.iselab.mooctest.site.web.logic.impl;
 
-import cn.iselab.mooctest.site.web.response.ResponseMessage;
-import cn.iselab.mooctest.site.web.response.SuccessResult;
 import cn.iselab.mooctest.site.models.App;
-import cn.iselab.mooctest.site.models.DevTarget;
-import cn.iselab.mooctest.site.models.fromKibug.Application;
 import cn.iselab.mooctest.site.service.AppService;
 import cn.iselab.mooctest.site.service.TargetService;
-import cn.iselab.mooctest.site.service.fromKibug.ApplicationService;
-import cn.iselab.mooctest.site.web.data.targetVO.TargetViewVO;
-import cn.iselab.mooctest.site.web.data.TargetDevVO;
-import cn.iselab.mooctest.site.web.data.TargetKibugVO;
 import cn.iselab.mooctest.site.web.data.TargetVO;
-import cn.iselab.mooctest.site.web.data.wrapper.TargetDevVOWrapper;
-import cn.iselab.mooctest.site.web.data.wrapper.TargetKibugVOWrapper;
 import cn.iselab.mooctest.site.web.data.wrapper.TargetVOWrapper;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -24,20 +13,13 @@ import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.mockito.runners.MockitoJUnitRunner;
 import org.springframework.boot.test.SpringApplicationConfiguration;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.test.context.web.WebAppConfiguration;
 
 import java.sql.Timestamp;
-import java.util.ArrayList;
-import java.util.List;
 
 import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyLong;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.when;
 
 /**
  * Created by ROGK on 2017/6/19.
@@ -47,21 +29,6 @@ import static org.mockito.Mockito.when;
 @SpringApplicationConfiguration(classes = cn.iselab.mooctest.site.Application.class)
 public class TargetLogicImplTest {
 
-    @InjectMocks
-    private TargetLogicImpl targetLogic = new TargetLogicImpl();
-    @Mock
-    private TargetVOWrapper targetVOWrapper;
-    @Mock
-    private TargetKibugVOWrapper targetKibugVOWrapper;
-    @Mock
-    private TargetDevVOWrapper targetDevVOWrapper;
-    @Mock
-    private ApplicationService applicationService;
-    @Mock
-    private AppService appService;
-    @Mock
-    private TargetService targetService;
-
     private long expectID;
     TargetVO targetVO=new TargetVO();
     App app = new App();
@@ -109,41 +76,4 @@ public class TargetLogicImplTest {
 //        Page<TargetVO> result=targetLogic.getTargets(17L,"test",pageable);
 //        Assert.assertEqualsals(result,expect);
     }
-
-    @Test
-    public void should_return_TargetKibugVO_when_TargetKibugExists()throws Exception{
-        TargetKibugVO targetKibugVO=new TargetKibugVO();
-        targetKibugVO.setName("test");
-        targetKibugVO.setPlatform("Android");
-        targetKibugVO.setAppLocation("test");
-        targetKibugVO.setTargetType(6L);
-        targetKibugVO.setVisible(false);
-        targetKibugVO.setUrl("test");
-        targetKibugVO.setCreateTimeMillis(1498469299L);
-
-        SuccessResult expect=new SuccessResult();
-        expect.put(ResponseMessage.ITEM_RESULT,targetKibugVO);
-
-        App app=new App();
-        app.setName("test");
-        app.setId(1L);
-        app.setCreateTime(new Timestamp(1498469299));
-        app.setTargetType(6L);
-        app.setVisible(false);
-        when(appService.getAppById(anyLong())).thenReturn(app);
-
-        Application application=new Application();
-        application.setManagerId(17L);
-        application.setName("test");
-        application.setPlatform(new Short("1"));
-        application.setAppLocation("test");
-        application.setCreateTimeMillis(1498469299L);
-        when(applicationService.getApplicaitonByUploaderCaseId(anyLong())).thenReturn(application);
-
-        when(targetKibugVOWrapper.wrap(app,application)).thenReturn(targetKibugVO);
-
-        TargetViewVO result=targetLogic.getTarget(1L);
-
-        Assert.assertEquals(expect.get("data"),"");
-    }
 }