Commit b1290c30 authored by Christos Tranoris's avatar Christos Tranoris
Browse files

fix tests

parent 909399bb
Loading
Loading
Loading
Loading
+1 −23
Changes for pom.xml: 1 added line, 23 removed lines.
Original line number Original line Diff line number Diff line
@@ -281,21 +281,6 @@
			<artifactId>spring-security-test</artifactId>
			<artifactId>spring-security-test</artifactId>
			<scope>test</scope>
			<scope>test</scope>
		</dependency>
		</dependency>
		<dependency>
			<groupId>org.junit.jupiter</groupId>
			<artifactId>junit-jupiter-engine</artifactId>
			<scope>test</scope>
		</dependency>
		<dependency>
			<groupId>org.junit.platform</groupId>
			<artifactId>junit-platform-commons</artifactId>
			<scope>test</scope>
		</dependency>
		<dependency>
			<groupId>org.junit.platform</groupId>
			<artifactId>junit-platform-runner</artifactId>
			<scope>test</scope>
		</dependency>
		<dependency>
		<dependency>
			<groupId>org.mockito</groupId>
			<groupId>org.mockito</groupId>
			<artifactId>mockito-inline</artifactId>
			<artifactId>mockito-inline</artifactId>
@@ -449,14 +434,7 @@
                	<parallel>none</parallel>
                	<parallel>none</parallel>
                	<runOrder>alphabetical</runOrder>
                	<runOrder>alphabetical</runOrder>
                	<forkCount>1</forkCount>
                	<forkCount>1</forkCount>
                	<reuseForks>false</reuseForks>
                	<reuseForks>true</reuseForks>
                	    <!--
					    <argLine>-Xmx2g -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=${project.build.directory}/heap.hprof</argLine>
					    <systemPropertyVariables>
					      <spring.test.context.cache.maxSize>8</spring.test.context.cache.maxSize>
					      <logging.level.org.springframework.test.context.cache>TRACE</logging.level.org.springframework.test.context.cache>
					    </systemPropertyVariables>
          			-->
            	</configuration>
            	</configuration>
			</plugin>
			</plugin>
			<plugin>
			<plugin>
+2
Changes for src/main/java/org/etsi/osl/tmf/pcm620/reposervices/ProductCategoryRepoService.java: 2 added lines, 0 removed lines.
Original line number Original line Diff line number Diff line
@@ -107,7 +107,9 @@ public class ProductCategoryRepoService {
		
		
	}
	}


	@Transactional
	public List<Category> findAll() {
	public List<Category> findAll() {
	  this.categsRepo.findByOrderByName().stream().forEach( s->s.getProductOfferingObj().size());
		return (List<Category>) this.categsRepo.findByOrderByName();
		return (List<Category>) this.categsRepo.findByOrderByName();
	}
	}


+4
Changes for src/main/java/org/etsi/osl/tmf/pcm620/reposervices/ProductSpecificationRepoService.java: 4 added lines, 0 removed lines.
Original line number Original line Diff line number Diff line
@@ -212,6 +212,10 @@ public class ProductSpecificationRepoService {
//	 noRollbackFor=Exception.class)
//	 noRollbackFor=Exception.class)
	public ProductSpecification findByUuid(String id) {
	public ProductSpecification findByUuid(String id) {
		Optional<ProductSpecification> optionalCat = this.prodsOfferingRepo.findByUuid(id);
		Optional<ProductSpecification> optionalCat = this.prodsOfferingRepo.findByUuid(id);
		if ( optionalCat.isPresent() ) {
          optionalCat.get().getProductSpecCharacteristic().size();
          optionalCat.get().getServiceSpecification().size();
		}
		return optionalCat.orElse(null);
		return optionalCat.orElse(null);
	}
	}


+6
Changes for src/main/java/org/etsi/osl/tmf/rcm634/reposervices/ResourceCatalogRepoService.java: 6 added lines, 0 removed lines.
Original line number Original line Diff line number Diff line
@@ -175,6 +175,12 @@ public class ResourceCatalogRepoService {
	
	
	public ResourceCatalog findByName(String aName) {
	public ResourceCatalog findByName(String aName) {
		Optional<ResourceCatalog> optionalCat = this.catalogRepo.findByName( aName );
		Optional<ResourceCatalog> optionalCat = this.catalogRepo.findByName( aName );
		if ( optionalCat.isPresent()) {
		  if ( optionalCat.get().getRelatedParty()!=null) {
	          optionalCat.get().getRelatedParty().size();		    
		  }
          optionalCat.get().getCategoryObj().size();
		}
		return optionalCat.orElse(null);
		return optionalCat.orElse(null);
	}
	}


+4
Changes for src/main/java/org/etsi/osl/tmf/rcm634/reposervices/ResourceCategoryRepoService.java: 4 added lines, 0 removed lines.
Original line number Original line Diff line number Diff line
@@ -285,6 +285,10 @@ public class ResourceCategoryRepoService {


	public ResourceCategory findByName(String aName) {
	public ResourceCategory findByName(String aName) {
		Optional<ResourceCategory> optionalCat = this.categsRepo.findByName( aName );
		Optional<ResourceCategory> optionalCat = this.categsRepo.findByName( aName );
		if (optionalCat.isPresent()) {
          optionalCat.get().getResourceCandidateObj().size();
          optionalCat.get().getResourceCandidateRefs().size();
		}
		return optionalCat
		return optionalCat
				.orElse(null);
				.orElse(null);
	}
	}
Loading