Changeset 5765 for branches/OKBJavaConnector/src/test

Timestamp:

03/19/11 11:22:36 (14 years ago)

Author:

mholper

Message:

first call against AdminService working, WSIT-Files adapted (added TrustCallBackHandler) #1441

File:

• branches/OKBJavaConnector/src/test/java/at/hl/okb/wsclient/OKBClientTest.java (modified) (3 diffs)

branches/OKBJavaConnector/src/test/java/at/hl/okb/wsclient/OKBClientTest.java

@@ -9 +9 @@
 import org.junit.Test;
 
+import com.heuristiclab.okb.wsclient.Exception.OKBWebServiceFailedException;
 import com.heuristiclab.okb.wsclient.admin.AdministrationService;
 import com.heuristiclab.okb.wsclient.admin.Algorithm;
+import com.heuristiclab.okb.wsclient.admin.AlgorithmClass;
 import com.heuristiclab.okb.wsclient.admin.ArrayOfAlgorithm;
 import com.heuristiclab.okb.wsclient.admin.IAdministrationService;
+import com.heuristiclab.okb.wsclient.admin.ObjectFactory;
 
 
@@ -55 +58 @@
   }
   
-//  @Test
-//  public void AddAlgorithmTest() throws Exception {
-//
-//    ObjectFactory fac = new ObjectFactory();
-//    AddAlgorithm addA = fac.createAddAlgorithm();
-//    addA.setDto(fac.createAddAlgorithmDto(fac.createAlgorithm()));
-//    Long retval = 0L;
-//    
-////    if (port.getAlgorithm(2L)!=null)
-////      port.deleteAlgorithm(2L);
-//    
-//
-//    Algorithm a = fac.createAlgorithm();
-//    a.setAlgorithmClassId(1L);
-//    a.setDescription(fac.createNamedOKBItemDescription("a new Algo"));
-//    a.setId(2L);
-//    a.setName(fac.createNamedOKBItemName("Algorithm Name 6"));
-//    a.setPlatformId(1L);
-//    try {
-//      retval = port.addAlgorithm(a);
-//    } catch (Exception e) {
-//      throw new OKBWebServiceFailedException(e.getMessage());
-//    }
-//    assertTrue("Algortihm wasn't added", retval > 0);
-//  }
-//
+  //TODO: fix -->Problem deleting existing Algorithm
+  @Test
+  public void AddAlgorithmTest() throws Exception {
+
+    ObjectFactory fac = new ObjectFactory();
+    Long retval = 0L;
+    
+    //delete existing Algo and Class first
+    if (port.getAlgorithmClass(1000L)!=null) {
+      port.deleteAlgorithmClass(1000L);
+    }
+    if (port.getAlgorithm(1000L)!=null) {
+      port.deleteAlgorithm(1000L);
+    }
+  
+    //add AlgorithmClassId first
+    AddAlgorithmClassTest();
+    Algorithm a = fac.createAlgorithm();
+      
+    a.setAlgorithmClassId(1000L);
+    a.setDescription(fac.createNamedOKBItemDescription("a new Algo"));
+    a.setId(1000L);
+    a.setName(fac.createNamedOKBItemName("Algorithm Name 6"));
+    a.setPlatformId(1L);
+    try {
+      retval = port.addAlgorithm(a);
+    } catch (Exception e) {
+      throw new OKBWebServiceFailedException(e.getMessage());
+    }
+    assertTrue("Algortihm wasn't added", retval > 0);
+  }
+  
+  @Test
+  public void AddAlgorithmClassTest() throws Exception {
+
+    ObjectFactory fac = new ObjectFactory();
+    Long retval = 0L;
+    
+    //delete existing Algo first (if exists)
+    if (port.getAlgorithmClass(1000L)!=null) {
+      port.deleteAlgorithmClass(1000L);
+    }   
+    
+    AlgorithmClass a = fac.createAlgorithmClass();
+    a.setId(1000L);
+    a.setName(fac.createNamedOKBItemName("a new AlgoClass"));
+    
+    try {
+      retval = port.addAlgorithmClass(a);
+    } catch (Exception e) {
+      throw new OKBWebServiceFailedException(e.getMessage());
+    }
+    assertTrue("AlgortihmClass wasn't added", retval > 0);
+  } 
+
   @Test
   public void GetAlgorithmsTest() {
 
     ArrayOfAlgorithm algos = port.getAlgorithms();
-
+    
     for (Algorithm algo : algos.getAlgorithm()) {
       System.out.println("algo ClassId:=" + algo.getAlgorithmClassId());
@@ -97 +129 @@
     assertTrue("No Algorithms found!", algos.getAlgorithm().size() > 0);
   }
+  
+