You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2019/07/25 12:53:14 UTC

[isis] branch v2 updated: ISIS-2125 restore previous fixture script smoketest

This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/v2 by this push:
     new 3a43da2  ISIS-2125 restore previous fixture script smoketest
3a43da2 is described below

commit 3a43da2a48930a9d363fc2b66e9e879c42e332f8
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Jul 25 14:53:06 2019 +0200

    ISIS-2125 restore previous fixture script smoketest
---
 .../JdoBootstrappingTest_usingFixtures.java        | 31 ++--------------------
 1 file changed, 2 insertions(+), 29 deletions(-)

diff --git a/examples/smoketest/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest_usingFixtures.java b/examples/smoketest/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest_usingFixtures.java
index bfbebde..b537308 100644
--- a/examples/smoketest/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest_usingFixtures.java
+++ b/examples/smoketest/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest_usingFixtures.java
@@ -21,20 +21,13 @@ package org.apache.isis.testdomain.bootstrapping;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import java.util.HashSet;
-import java.util.Set;
-
 import javax.inject.Inject;
 
 import org.apache.isis.applib.services.repository.RepositoryService;
 import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
-import org.apache.isis.runtime.system.context.IsisContext;
-import org.apache.isis.testdomain.jdo.Book;
 import org.apache.isis.testdomain.jdo.Inventory;
 import org.apache.isis.testdomain.jdo.JdoTestDomainModule;
 import org.apache.isis.testdomain.jdo.JdoTestDomainPersona;
-import org.apache.isis.testdomain.jdo.Product;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -60,31 +53,11 @@ class JdoBootstrappingTest_usingFixtures {
 	@BeforeEach
 	void setUp() {
 	    
-	    val txTemplate = IsisContext.createTransactionTemplate();
-	    val txMan = txTemplate.getTransactionManager();
-	    
-	    
-	    val status = txMan.getTransaction(null);
-
         // cleanup
-        //fixtureScripts.runBuilderScript(JdoTestDomainPersona.PurgeAll.builder());
+        fixtureScripts.runBuilderScript(JdoTestDomainPersona.PurgeAll.builder());
 
         // given
-        //fixtureScripts.runBuilderScript(JdoTestDomainPersona.InventoryWith1Book.builder());
-        
-        Set<Product> products = new HashSet<>();
-        
-        products.add(Book.of(
-                "Sample Book", "A sample book for testing.", 99.,
-                "Sample Author", "Sample ISBN", "Sample Publisher"));
-        
-        val inventory = Inventory.of("Sample Inventory", products);
-        repository.persist(inventory);
-    
-        txMan.commit(status);
-		
-		System.out.println("!!! AFTER SETUP");
-		
+        fixtureScripts.runBuilderScript(JdoTestDomainPersona.InventoryWith1Book.builder());
 	}
 
 	@Test @Rollback(false)