Project

General

Profile

« Previous | Next » 

Revision 49184

Refactored Pid resolver

View differences:

DLIParserTest.java
11 11
import eu.dnetlib.dli.resolver.NCBINResolver;
12 12
import eu.dnetlib.dli.resolver.OpenAireParser;
13 13
import eu.dnetlib.dli.resolver.model.CompletionStatus;
14
import eu.dnetlib.dli.resolver.model.ObjectProvenance;
14
import eu.dnetlib.dli.resolver.model.DLIObjectProvenance;
15
import eu.dnetlib.dli.resolver.model.DLIResolvedObject;
15 16
import eu.dnetlib.dli.resolver.model.ObjectProvisionMode;
16
import eu.dnetlib.dli.resolver.model.ResolvedObject;
17 17
import eu.dnetlib.dli.resolver.model.serializer.ResolverSerializer;
18 18
import eu.dnetlib.enabling.locators.UniqueServiceLocator;
19 19
import eu.dnetlib.resolver.parser.DMFResolverParser;
20 20
import eu.dnetlib.resolver.parser.PMFResolverParser;
21 21
import eu.dnetlib.resolver.parser.ScholixResolverParser;
22
import eu.dnetlib.resolver.store.ConfigurationResolverStoreTestConfig;
23 22
import eu.dnetlib.rmi.enabling.ISLookUpException;
24 23
import eu.dnetlib.rmi.enabling.ISLookUpService;
25 24
import org.apache.commons.io.IOUtils;
......
29 28
import org.junit.Before;
30 29
import org.junit.Ignore;
31 30
import org.junit.Test;
32
import org.junit.runner.RunWith;
33 31
import org.mockito.Mock;
34 32
import org.mockito.Mockito;
35 33
import org.springframework.beans.factory.annotation.Autowired;
36
import org.springframework.test.context.ContextConfiguration;
37
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
38 34

  
39 35
import static org.mockito.Mockito.when;
40 36

  
......
96 92
		final InputStream resourceAsStream = getClass().getResourceAsStream("/eu/dnetlib/dli/parser/InputRecordDMF.xml");
97 93
		String str = IOUtils.toString(resourceAsStream);
98 94
		DMFResolverParser parser = new DMFResolverParser();
99
		ResolvedObject object = parser.parseObject(str);
100
		Assert.assertNotNull(object);
95
        DLIResolvedObject object = parser.parseObject(str);
96
        Assert.assertNotNull(object);
101 97
		Assert.assertNotNull(object.getTitles());
102 98
		Assert.assertNotNull(object.getType());
103 99
		object.setTitles(Arrays.asList("TITOLO 1", "TITOLO 2"));
104 100
		Assert.assertEquals(CompletionStatus.complete.toString(), object.getCompletionStatus());
105
		ResolvedObject nullObject = parser.parseObject(IOUtils.toString(getClass().getResourceAsStream("/eu/dnetlib/dli/parser/InputRecordScholix.xml")));
106
		Assert.assertNull(nullObject);
101
        DLIResolvedObject nullObject = parser.parseObject(IOUtils.toString(getClass().getResourceAsStream("/eu/dnetlib/dli/parser/InputRecordScholix.xml")));
102
        Assert.assertNull(nullObject);
107 103
		nullObject = parser.parseObject(IOUtils.toString(getClass().getResourceAsStream("/eu/dnetlib/dli/parser/InputPMFRecord.xml")));
108 104
		Assert.assertNull(nullObject);
109 105

  
......
116 112
		String str = IOUtils.toString(resourceAsStream);
117 113

  
118 114
		PMFResolverParser parser = new PMFResolverParser();
119
		ResolvedObject object = parser.parseObject(str);
120
		Assert.assertNotNull(object.getResolvedDate());
115
        DLIResolvedObject object = parser.parseObject(str);
116
        Assert.assertNotNull(object.getResolvedDate());
121 117
	}
122 118

  
123 119

  
......
127 123
		final InputStream resourceAsStream = getClass().getResourceAsStream("/eu/dnetlib/dli/parser/InputRecordOpenaire.xml");
128 124
		String str = IOUtils.toString(resourceAsStream);
129 125
		DMFResolverParser parser = new DMFResolverParser();
130
		ResolvedObject object = parser.parseObject(str);
131
		System.out.println(object.getType());
126
        DLIResolvedObject object = parser.parseObject(str);
127
        System.out.println(object.getType());
132 128
		object.getRelations().forEach(it -> System.out.println(it.getTargetPID()));
133 129
		Assert.assertTrue(object.getCompletionStatus().equals("complete"));
134 130
		System.out.println("object = " + object);
......
147 143

  
148 144
		String str = IOUtils.toString(resourceAsStream);
149 145
		ScholixResolverParser parser = new ScholixResolverParser();
150
		ResolvedObject object = parser.parseObject(str);
146
        DLIResolvedObject object = parser.parseObject(str);
151 147

  
152 148
		log.debug("object = " + object);
153 149

  
......
160 156

  
161 157
		Assert.assertTrue(object.getRelations().size() == 1);
162 158

  
163
		ResolvedObject nullObject = parser.parseObject(IOUtils.toString(getClass().getResourceAsStream("/eu/dnetlib/dli/parser/InputRecordDMF.xml")));
164
		Assert.assertNull(nullObject);
159
        DLIResolvedObject nullObject = parser.parseObject(IOUtils.toString(getClass().getResourceAsStream("/eu/dnetlib/dli/parser/InputRecordDMF.xml")));
160
        Assert.assertNull(nullObject);
165 161
		nullObject = parser.parseObject(IOUtils.toString(getClass().getResourceAsStream("/eu/dnetlib/dli/parser/InputPMFRecord.xml")));
166 162
		Assert.assertNull(nullObject);
167 163

  
......
173 169

  
174 170
		String str = IOUtils.toString(resourceAsStream);
175 171
		ScholixResolverParser parser = new ScholixResolverParser();
176
		ResolvedObject object = parser.parseObject(str);
172
        DLIResolvedObject object = parser.parseObject(str);
177 173

  
178 174
		log.debug("object = " + object);
179 175

  
......
200 196
//		Assert.assertNotNull(object.getRelations().get(0).getTargetPID().getType());
201 197
//
202 198
//
203
//		ResolvedObject nullObject = parser.parseObject(IOUtils.toString(getClass().getResourceAsStream("/eu/dnetlib/dli/parser/InputRecordDMF.xml")));
199
//		DLIResolvedObject nullObject = parser.parseObject(IOUtils.toString(getClass().getResourceAsStream("/eu/dnetlib/dli/parser/InputRecordDMF.xml")));
204 200
//		Assert.assertNull(nullObject);
205 201
//		nullObject = parser.parseObject(IOUtils.toString(getClass().getResourceAsStream("/eu/dnetlib/dli/parser/InputPMFRecord.xml")));
206 202
//		Assert.assertNull(nullObject);
......
214 210
		String xml = IOUtils.toString(resource);
215 211

  
216 212
		PMFResolverParser parser = new PMFResolverParser();
217
		final ResolvedObject resolvedObject = parser.parseObject(xml);
218
		Assert.assertNotNull(resolvedObject);
213
        final DLIResolvedObject resolvedObject = parser.parseObject(xml);
214
        Assert.assertNotNull(resolvedObject);
219 215
		log.debug("resolvedObject = " + resolvedObject);
220 216

  
221 217
		Assert.assertNotNull(resolvedObject.getRelations());
222 218
		resolvedObject.getRelations().forEach(it -> Assert.assertNotNull(it));
223 219

  
224
		ResolvedObject nullObject = parser.parseObject(IOUtils.toString(getClass().getResourceAsStream("/eu/dnetlib/dli/parser/InputRecordScholix.xml")));
225
		Assert.assertNull(nullObject);
220
        DLIResolvedObject nullObject = parser.parseObject(IOUtils.toString(getClass().getResourceAsStream("/eu/dnetlib/dli/parser/InputRecordScholix.xml")));
221
        Assert.assertNull(nullObject);
226 222
		nullObject = parser.parseObject(IOUtils.toString(getClass().getResourceAsStream("/eu/dnetlib/dli/parser/InputRecordDMF.xml")));
227 223
		Assert.assertNull(nullObject);
228 224
	}
......
235 231
		final String record = IOUtils.toString(resource);
236 232

  
237 233
		final OpenAireParser parser = new OpenAireParser();
238
		final ResolvedObject object = parser.parseObject(record);
239
		object.setPid("od_______908::ff0270cae25acd9367ef26a53ee5e4a3");
234
        final DLIResolvedObject object = parser.parseObject(record);
235
        object.setPid("od_______908::ff0270cae25acd9367ef26a53ee5e4a3");
240 236
		object.setPidType("openaire");
241 237

  
242
		ObjectProvenance provenance = new ObjectProvenance();
243
		provenance.setCompletionStatus(CompletionStatus.complete.toString());
238
        final DLIObjectProvenance provenance = new DLIObjectProvenance();
239
        provenance.setCompletionStatus(CompletionStatus.complete.toString());
244 240
		provenance.setDatasourceId("dli::r3d100010778");
245 241
		provenance.setDatasource("NCBI Nucleotide");
246 242
		provenance.setProvisionMode(ObjectProvisionMode.resolved.toString());
......
254 250
	public void testProteinParser() throws IOException {
255 251
		final NCBINResolver resolver = new NCBINResolver();
256 252
		resolver.setNCBINParser(new NCBINParser());
257
		final ResolvedObject p02768 = resolver.resolve("U36380", "protein");
253
        final DLIResolvedObject p02768 = resolver.resolve("U36380", "protein");
258 254

  
259 255
		log.debug(p02768.getDescription());
260 256
		Assert.assertNotNull(p02768);

Also available in: Unified diff