test/sun/security/smartcardio/TestMultiplePresent.java

rev 13550 : imported patch 8059212-Modify-smartcardio-manual-regression-tests-so-that-they-do-not-just-fail-if-no-cardreader-found

*** 1,7 ****
  /*
!  * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 39,58 ****
  
  public class TestMultiplePresent {
  
      public static void main(String[] args) throws Exception {
          Utils.setLibrary(args);
!         TerminalFactory factory = TerminalFactory.getInstance("PC/SC", null);
          System.out.println(factory);
  
          CardTerminals terminals = factory.terminals();
          List<CardTerminal> list = terminals.list();
          System.out.println("Terminals: " + list);
          boolean multipleReaders = true;
          if (list.size() < 2) {
              if (list.isEmpty()) {
!                 throw new Exception("no terminals");
              }
              System.out.println("Only one reader present, using simplified test");
              multipleReaders = false;
          }
  
--- 39,65 ----
  
  public class TestMultiplePresent {
  
      public static void main(String[] args) throws Exception {
          Utils.setLibrary(args);
!         TerminalFactory factory = Utils.getTerminalFactory(null);
!         if (factory == null) {
!             System.out.println("Skipping the test: " +
!                     "no card terminals available");
!             return;
!         }
          System.out.println(factory);
  
          CardTerminals terminals = factory.terminals();
          List<CardTerminal> list = terminals.list();
          System.out.println("Terminals: " + list);
          boolean multipleReaders = true;
          if (list.size() < 2) {
              if (list.isEmpty()) {
!                 System.out.println("Skipping the test: " +
!                         "no card terminals available");
!                 return;
              }
              System.out.println("Only one reader present, using simplified test");
              multipleReaders = false;
          }