Revision da39aca0
Added by Andreas Müller about 7 years ago
cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/SecurityTest.java | ||
---|---|---|
130 | 130 |
@DataSet |
131 | 131 |
public void testHasPermission(){ |
132 | 132 |
|
133 |
Taxon taxon = Taxon.NewInstance(BotanicalName.NewInstance(Rank.GENUS()),null);
|
|
133 |
Taxon taxon = Taxon.NewInstance(TaxonNameBase.NewBotanicalInstance(Rank.GENUS()),null);
|
|
134 | 134 |
|
135 | 135 |
authentication = authenticationManager.authenticate(tokenForTaxonomist); |
136 | 136 |
boolean hasPermission = permissionEvaluator.hasPermission(authentication, taxon, Operation.UPDATE); |
... | ... | |
215 | 215 |
@Ignore // FIXME http://dev.e-taxonomy.eu/trac/ticket/3098 |
216 | 216 |
public void testHasPermissions(){ |
217 | 217 |
|
218 |
Taxon taxon = Taxon.NewInstance(BotanicalName.NewInstance(Rank.GENUS()),null);
|
|
218 |
Taxon taxon = Taxon.NewInstance(TaxonNameBase.NewBotanicalInstance(Rank.GENUS()),null);
|
|
219 | 219 |
|
220 | 220 |
authentication = authenticationManager.authenticate(tokenForTaxonomist); |
221 | 221 |
boolean hasPermission = permissionEvaluator.hasPermission(authentication, taxon, Operation.ALL); |
... | ... | |
233 | 233 |
SecurityContext context = SecurityContextHolder.getContext(); |
234 | 234 |
context.setAuthentication(authentication); |
235 | 235 |
|
236 |
Taxon expectedTaxon = Taxon.NewInstance(BotanicalName.NewInstance(Rank.SPECIES()), null);
|
|
236 |
Taxon expectedTaxon = Taxon.NewInstance(TaxonNameBase.NewBotanicalInstance(Rank.SPECIES()), null);
|
|
237 | 237 |
expectedTaxon.getName().setTitleCache("Newby admin", true); |
238 | 238 |
UUID uuid = taxonService.save(expectedTaxon).getUuid(); |
239 | 239 |
commitAndStartNewTransaction(null); |
... | ... | |
243 | 243 |
authentication = authenticationManager.authenticate(tokenForTaxonEditor); |
244 | 244 |
context = SecurityContextHolder.getContext(); |
245 | 245 |
context.setAuthentication(authentication); |
246 |
expectedTaxon = Taxon.NewInstance(BotanicalName.NewInstance(Rank.GENUS()), null);
|
|
246 |
expectedTaxon = Taxon.NewInstance(TaxonNameBase.NewBotanicalInstance(Rank.GENUS()), null);
|
|
247 | 247 |
expectedTaxon.getName().setTitleCache("Newby taxonEditor", true); |
248 | 248 |
uuid = taxonService.saveOrUpdate(expectedTaxon); |
249 | 249 |
commitAndStartNewTransaction(null); |
... | ... | |
1091 | 1091 |
authentication = authenticationManager.authenticate(tokenForTaxonomist); |
1092 | 1092 |
context.setAuthentication(authentication); |
1093 | 1093 |
|
1094 |
Synonym syn = Synonym.NewInstance(BotanicalName.NewInstance(Rank.SPECIES()), null);
|
|
1094 |
Synonym syn = Synonym.NewInstance(TaxonNameBase.NewBotanicalInstance(Rank.SPECIES()), null);
|
|
1095 | 1095 |
UUID synUuid = UUID.randomUUID(); |
1096 | 1096 |
syn.setUuid(synUuid); |
1097 | 1097 |
try{ |
... | ... | |
1119 | 1119 |
// 2) test for denial |
1120 | 1120 |
authentication = authenticationManager.authenticate(tokenForDescriptionEditor); |
1121 | 1121 |
context.setAuthentication(authentication); |
1122 |
Synonym syn = Synonym.NewInstance(BotanicalName.NewInstance(Rank.SPECIES()), null);
|
|
1122 |
Synonym syn = Synonym.NewInstance(TaxonNameBase.NewBotanicalInstance(Rank.SPECIES()), null);
|
|
1123 | 1123 |
UUID synUuid = syn.getUuid(); |
1124 | 1124 |
try{ |
1125 | 1125 |
taxonService.saveOrUpdate(syn); |
... | ... | |
1150 | 1150 |
// test for success |
1151 | 1151 |
TaxonNode acherontia_node = taxonNodeService.load(ACHERONTIA_NODE_UUID); |
1152 | 1152 |
long numOfChildNodes = acherontia_node.getChildNodes().size(); |
1153 |
TaxonNode acherontia_child_node = acherontia_node.addChildTaxon(Taxon.NewInstance(BotanicalName.NewInstance(Rank.SPECIES()), null), null, null);
|
|
1153 |
TaxonNode acherontia_child_node = acherontia_node.addChildTaxon(Taxon.NewInstance(TaxonNameBase.NewBotanicalInstance(Rank.SPECIES()), null), null, null);
|
|
1154 | 1154 |
|
1155 | 1155 |
try{ |
1156 | 1156 |
taxonNodeService.saveOrUpdate(acherontia_child_node); |
... | ... | |
1181 | 1181 |
// test for denial |
1182 | 1182 |
TaxonNode acherontiini_node = taxonNodeService.load(ACHERONTIINI_NODE_UUID); |
1183 | 1183 |
int numOfChildNodes = acherontiini_node.getCountChildren(); |
1184 |
acherontiini_node.addChildTaxon(Taxon.NewInstance(BotanicalName.NewInstance(Rank.GENUS()), null), null, null);
|
|
1184 |
acherontiini_node.addChildTaxon(Taxon.NewInstance(TaxonNameBase.NewBotanicalInstance(Rank.GENUS()), null), null, null);
|
|
1185 | 1185 |
|
1186 | 1186 |
try{ |
1187 | 1187 |
logger.debug("=============================="); |
Also available in: Unified diff
ref #6365 merge static methods from BotanicaName to TaxonNameBase