Commit 63774ac9 by lepdou

update

parent 66c4f954
...@@ -3,21 +3,19 @@ package com.ctrip.framework.apollo.portal.service.txtresolver; ...@@ -3,21 +3,19 @@ package com.ctrip.framework.apollo.portal.service.txtresolver;
import com.ctrip.framework.apollo.core.ConfigConsts; import com.ctrip.framework.apollo.core.ConfigConsts;
import com.ctrip.framework.apollo.core.dto.ItemChangeSets; import com.ctrip.framework.apollo.core.dto.ItemChangeSets;
import com.ctrip.framework.apollo.core.dto.ItemDTO; import com.ctrip.framework.apollo.core.dto.ItemDTO;
import com.ctrip.framework.apollo.portal.AbstractIntegrationTest; import com.ctrip.framework.apollo.portal.AbstractUnitTest;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Test; import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired; import org.mockito.InjectMocks;
import org.springframework.beans.factory.annotation.Qualifier;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
public class FileTextResolverTest extends AbstractIntegrationTest { public class FileTextResolverTest extends AbstractUnitTest {
@Qualifier("fileTextResolver") @InjectMocks
@Autowired private FileTextResolver resolver;
private ConfigTextResolver resolver;
private final String CONFIG_TEXT = "config_text"; private final String CONFIG_TEXT = "config_text";
private final long NAMESPACE = 1000; private final long NAMESPACE = 1000;
......
...@@ -4,22 +4,20 @@ package com.ctrip.framework.apollo.portal.service.txtresolver; ...@@ -4,22 +4,20 @@ package com.ctrip.framework.apollo.portal.service.txtresolver;
import com.ctrip.framework.apollo.core.dto.ItemChangeSets; import com.ctrip.framework.apollo.core.dto.ItemChangeSets;
import com.ctrip.framework.apollo.core.dto.ItemDTO; import com.ctrip.framework.apollo.core.dto.ItemDTO;
import com.ctrip.framework.apollo.core.exception.BadRequestException; import com.ctrip.framework.apollo.core.exception.BadRequestException;
import com.ctrip.framework.apollo.portal.AbstractIntegrationTest; import com.ctrip.framework.apollo.portal.AbstractUnitTest;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Test; import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired; import org.mockito.InjectMocks;
import org.springframework.beans.factory.annotation.Qualifier;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
public class PropertyResolverTest extends AbstractIntegrationTest { public class PropertyResolverTest extends AbstractUnitTest {
@Autowired @InjectMocks
@Qualifier("propertyResolver") private PropertyResolver resolver;
private ConfigTextResolver resolver;
@Test @Test
public void testEmptyText() { public void testEmptyText() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment