Changeset 1283


Ignore:
Timestamp:
05/11/11 13:48:58 (13 years ago)
Author:
twagoo
Message:

Made test package work with additional DI and SpringServlet?

Location:
ComponentRegistry/trunk/ComponentRegistry/src/test
Files:
6 edited
4 copied

Legend:

Unmodified
Added
Removed

  • ComponentRegistry/trunk/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/impl/filesystem/CMDComponentSpecExpanderTest.java

    r1279 r1283  
    11package clarin.cmdi.componentregistry.impl.filesystem;
    22
    3 import clarin.cmdi.componentregistry.impl.filesystem.ComponentRegistryFactoryImpl;
    4 import clarin.cmdi.componentregistry.impl.filesystem.CMDComponentSpecExpander;
    5 import clarin.cmdi.componentregistry.impl.filesystem.ComponentRegistryImpl;
     3import clarin.cmdi.componentregistry.Configuration;
    64import static org.junit.Assert.assertEquals;
    75
    8 import java.io.ByteArrayOutputStream;
    96import java.io.File;
    107import java.util.List;
    118
    12 import org.apache.commons.io.FileUtils;
    139import org.junit.After;
    1410import org.junit.Test;
    … …  
    2016import clarin.cmdi.componentregistry.rest.DummyPrincipal;
    2117import clarin.cmdi.componentregistry.rest.RegistryTestHelper;
     18import org.junit.Before;
    2219
    2320public class CMDComponentSpecExpanderTest {
    2421
    2522    private File tmpRegistryDir;
     23    private File registryDir;
     24
     25    @Before
     26    public void startClean() {
     27        registryDir = ComponentRegistryTestCase.createTempRegistryDir();
     28        Configuration.getInstance().setRegistryRoot(registryDir);
     29        Configuration.getInstance().init();
     30        ComponentRegistryFactoryImpl.getInstance().reset();
     31        ComponentRegistryFactoryImpl.getInstance().setConfiguration(Configuration.getInstance());
     32    }
     33
     34    @After
     35    public void cleanUp() {
     36        ComponentRegistryTestCase.cleanUpRegistryDir(registryDir);
     37        ComponentRegistryFactoryImpl.getInstance().reset();
     38        ComponentRegistryFactoryImpl.getInstance().setConfiguration(null);
     39        registryDir = null;
     40    }
    2641
    2742    @Test

  • ComponentRegistry/trunk/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/impl/filesystem/ComponentRegistryFactoryTest.java

    r1279 r1283  
    55import clarin.cmdi.componentregistry.MDMarshaller;
    66import clarin.cmdi.componentregistry.UserCredentials;
    7 import clarin.cmdi.componentregistry.impl.filesystem.ComponentRegistryFactoryImpl;
    87import static org.junit.Assert.assertEquals;
    98import static org.junit.Assert.assertFalse;
    … …  
    110109        Configuration.getInstance().init();
    111110        ComponentRegistryFactoryImpl.getInstance().reset();
     111        ComponentRegistryFactoryImpl.getInstance().setConfiguration(Configuration.getInstance());
    112112    }
    113113

  • ComponentRegistry/trunk/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/impl/filesystem/ComponentRegistryImplTest.java

    r1279 r1283  
    22
    33import clarin.cmdi.componentregistry.ComponentRegistry;
     4import clarin.cmdi.componentregistry.Configuration;
    45import clarin.cmdi.componentregistry.DeleteFailedException;
    56import clarin.cmdi.componentregistry.ResourceConfig;
    … …  
    3334import clarin.cmdi.componentregistry.rest.DummyPrincipal;
    3435import clarin.cmdi.componentregistry.rest.RegistryTestHelper;
     36import org.junit.After;
     37import org.junit.Before;
    3538
    3639public class ComponentRegistryImplTest extends ComponentRegistryTestCase {
     40
     41    private File registryDir;
     42
     43    @Before
     44    public void startClean() {
     45        registryDir = ComponentRegistryTestCase.createTempRegistryDir();
     46        Configuration.getInstance().setRegistryRoot(registryDir);
     47        Configuration.getInstance().init();
     48        ComponentRegistryFactoryImpl.getInstance().reset();
     49        ComponentRegistryFactoryImpl.getInstance().setConfiguration(Configuration.getInstance());
     50    }
     51
     52    @After
     53    public void cleanUp() {
     54        ComponentRegistryTestCase.cleanUpRegistryDir(registryDir);
     55        ComponentRegistryFactoryImpl.getInstance().reset();
     56        ComponentRegistryFactoryImpl.getInstance().setConfiguration(null);
     57        registryDir = null;
     58    }
    3759
    3860    @Test

  • ComponentRegistry/trunk/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/impl/filesystem/ComponentRegistryTestCase.java

    r1279 r1283  
    33import clarin.cmdi.componentregistry.Configuration;
    44import clarin.cmdi.componentregistry.UserCredentials;
    5 import clarin.cmdi.componentregistry.impl.filesystem.ComponentRegistryFactoryImpl;
    6 import clarin.cmdi.componentregistry.impl.filesystem.ComponentRegistryImpl;
    75import static org.junit.Assert.assertTrue;
    86

  • ComponentRegistry/trunk/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/rest/ComponentRegistryRestServiceTestCase.java

    r1277 r1283  
    2121import com.sun.jersey.multipart.impl.FormDataMultiPartDispatchProvider;
    2222import com.sun.jersey.spi.container.servlet.WebComponent;
     23import com.sun.jersey.spi.spring.container.servlet.SpringServlet;
    2324import com.sun.jersey.test.framework.AppDescriptor;
    2425import com.sun.jersey.test.framework.JerseyTest;
    2526import com.sun.jersey.test.framework.WebAppDescriptor;
     27import org.springframework.web.context.ContextLoaderListener;
     28import org.springframework.web.context.request.RequestContextListener;
    2629
    2730public abstract class ComponentRegistryRestServiceTestCase extends JerseyTest {
    … …  
    3841    @Override
    3942    protected AppDescriptor configure() {
    40         WebAppDescriptor.Builder builder = new WebAppDescriptor.Builder().initParam(WebComponent.RESOURCE_CONFIG_CLASS,
    41                 ClassNamesResourceConfig.class.getName()).initParam(ClassNamesResourceConfig.PROPERTY_CLASSNAMES,
    42                 FormDataMultiPartDispatchProvider.class.getName() + ";" + ComponentRegistryRestService.class.getName()).addFilter(
    43                 DummySecurityFilter.class, "DummySecurityFilter");
     43        WebAppDescriptor.Builder builder = new WebAppDescriptor.Builder()
     44                .contextParam("contextConfigLocation", "classpath:applicationContext.xml")
     45                .servletClass(SpringServlet.class)
     46                .initParam(WebComponent.RESOURCE_CONFIG_CLASS,ClassNamesResourceConfig.class.getName())
     47                .initParam(ClassNamesResourceConfig.PROPERTY_CLASSNAMES,FormDataMultiPartDispatchProvider.class.getName() + ";" + ComponentRegistryRestService.class.getName())
     48                .addFilter(DummySecurityFilter.class, "DummySecurityFilter")
     49                .requestListenerClass(RequestContextListener.class)
     50                .contextListenerClass(ContextLoaderListener.class)
     51                ;
    4452        return builder.build();
    4553    }

  • ComponentRegistry/trunk/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/rest/MDValidatorTest.java

    r1279 r1283  
    1717
    1818import clarin.cmdi.componentregistry.ComponentRegistry;
     19import clarin.cmdi.componentregistry.Configuration;
    1920import clarin.cmdi.componentregistry.impl.filesystem.ComponentRegistryFactoryImpl;
    2021import clarin.cmdi.componentregistry.impl.filesystem.ComponentRegistryTestCase;
    … …  
    2627    private static File registryDir;
    2728    private static ComponentRegistry testRegistry;
     29    private static ComponentRegistry publicRegistry;
    2830
    2931    @Before
    … …  
    3133        registryDir = ComponentRegistryTestCase.createTempRegistryDir();
    3234        testRegistry = ComponentRegistryTestCase.getTestRegistry(registryDir);
     35        publicRegistry = testRegistry;
     36
     37        Configuration.getInstance().setRegistryRoot(registryDir);
     38        Configuration.getInstance().init();
     39        ComponentRegistryFactoryImpl.getInstance().setConfiguration(Configuration.getInstance());
    3340    }
    3441
    … …  
    3643    public void deleteRegistry() {
    3744        ComponentRegistryTestCase.cleanUpRegistryDir(registryDir);
     45        ComponentRegistryFactoryImpl.getInstance().setConfiguration(null);
     46        registryDir = null;
    3847    }
    3948
    … …  
    5665
    5766        ProfileDescription desc = ProfileDescription.createNewDescription();
    58         MDValidator validator = new MDValidator(input, desc, testRegistry, null);
     67        MDValidator validator = new MDValidator(input, desc, testRegistry, null, publicRegistry);
    5968        assertTrue(validator.validate());
    6069    }
    … …  
    7281
    7382        ProfileDescription desc = ProfileDescription.createNewDescription();
    74         MDValidator validator = new MDValidator(input, desc, testRegistry, null);
     83        MDValidator validator = new MDValidator(input, desc, testRegistry, null, publicRegistry);
    7584        assertFalse(validator.validate());
    7685        assertTrue(validator.getErrorMessages().get(0).startsWith(MDValidator.COMPONENT_NOT_PUBLICLY_REGISTERED_ERROR));
    … …  
    92101
    93102        ProfileDescription desc = ProfileDescription.createNewDescription();
    94         MDValidator validator = new MDValidator(new ByteArrayInputStream(profileContent.getBytes()), desc, testRegistry, null);
     103        MDValidator validator = new MDValidator(new ByteArrayInputStream(profileContent.getBytes()), desc, testRegistry, null, publicRegistry);
    95104        assertFalse(validator.validate());
    96105        assertEquals(2, validator.getErrorMessages().size());
    … …  
    99108
    100109        RegistryTestHelper.addComponent(testRegistry, id1);
    101         validator = new MDValidator(new ByteArrayInputStream(profileContent.getBytes()), desc, testRegistry, null);
     110        validator = new MDValidator(new ByteArrayInputStream(profileContent.getBytes()), desc, testRegistry, null, publicRegistry);
    102111        assertFalse(validator.validate());
    103112        assertEquals(1, validator.getErrorMessages().size());
    … …  
    105114
    106115        RegistryTestHelper.addComponent(testRegistry, id2);
    107         validator = new MDValidator(new ByteArrayInputStream(profileContent.getBytes()), desc, testRegistry, null);
     116        validator = new MDValidator(new ByteArrayInputStream(profileContent.getBytes()), desc, testRegistry, null, publicRegistry);
    108117        assertTrue("component is registered should be valid now", validator.validate());
    109118        assertEquals(0, validator.getErrorMessages().size());
    … …  
    114123        String id1 = "component1";
    115124        String id2 = "component2";
    116         ComponentRegistry userRegistry = ComponentRegistryFactoryImpl.getInstance()
    117                 .getComponentRegistry(true, DummyPrincipal.DUMMY_CREDENTIALS);
     125        ComponentRegistry userRegistry = ComponentRegistryFactoryImpl.getInstance().getComponentRegistry(true, DummyPrincipal.DUMMY_CREDENTIALS);
    118126
    119127        String profileContent = "";
    … …  
    127135
    128136        ProfileDescription desc = ProfileDescription.createNewDescription();
    129         MDValidator validator = new MDValidator(new ByteArrayInputStream(profileContent.getBytes()), desc, userRegistry, userRegistry);
     137        MDValidator validator = new MDValidator(new ByteArrayInputStream(profileContent.getBytes()), desc, userRegistry, userRegistry, publicRegistry);
    130138        assertFalse(validator.validate());
    131139        assertEquals(2, validator.getErrorMessages().size());
    … …  
    135143        RegistryTestHelper.addComponent(userRegistry, id1);
    136144        RegistryTestHelper.addComponent(testRegistry, id2);
    137         validator = new MDValidator(new ByteArrayInputStream(profileContent.getBytes()), desc, testRegistry, userRegistry);
     145        validator = new MDValidator(new ByteArrayInputStream(profileContent.getBytes()), desc, testRegistry, null, publicRegistry);
    138146        assertFalse(validator.validate());
    139147        assertEquals(1, validator.getErrorMessages().size());
    140148        assertTrue(validator.getErrorMessages().get(0).startsWith(MDValidator.COMPONENT_NOT_PUBLICLY_REGISTERED_ERROR));
    141149
    142         validator = new MDValidator(new ByteArrayInputStream(profileContent.getBytes()), desc, userRegistry, userRegistry);
     150        validator = new MDValidator(new ByteArrayInputStream(profileContent.getBytes()), desc, userRegistry, userRegistry, publicRegistry);
    143151        assertTrue(validator.validate());
    144152        assertEquals(0, validator.getErrorMessages().size());
    … …  
    161169
    162170        ComponentDescription desc = ComponentDescription.createNewDescription();
    163         MDValidator validator = new MDValidator(new ByteArrayInputStream(content.getBytes()), desc, testRegistry, null);
     171        MDValidator validator = new MDValidator(new ByteArrayInputStream(content.getBytes()), desc, testRegistry, null, publicRegistry);
    164172        assertFalse(validator.validate());
    165173        assertEquals(1, validator.getErrorMessages().size());
    … …  
    167175
    168176        RegistryTestHelper.addComponent(testRegistry, id1);
    169         validator = new MDValidator(new ByteArrayInputStream(content.getBytes()), desc, testRegistry, null);
     177        validator = new MDValidator(new ByteArrayInputStream(content.getBytes()), desc, testRegistry, null, publicRegistry);
    170178        assertTrue(validator.validate());
    171179        assertEquals(0, validator.getErrorMessages().size());
    172180
    173181    }
    174 
    175182}
Note: See TracChangeset for help on using the changeset viewer.