diff --git a/src/java/utils/GeneratorNumber.java b/src/java/utils/GeneratorNumber.java index 24a0e49..0743cc3 100644 --- a/src/java/utils/GeneratorNumber.java +++ b/src/java/utils/GeneratorNumber.java @@ -21,17 +21,13 @@ public int getNumber() { } public void read() { - Properties props = new Properties(); InputStream input = null; try { File f = new File("settings.properties"); input = new FileInputStream(f); props.load(input); - input.close(); - } catch (IOException ex) { - java.util.logging.Logger.getLogger(GeneratorNumber.class.getName()).log(java.util.logging.Level.SEVERE, null, ex); - } + } catch (IOException ex) { java.util.logging.Logger.getLogger(GeneratorNumber.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);} setDigits(Integer.parseInt(props.getProperty("DigitsCount"))); } diff --git a/src/test/model/ComputerGeneratorTest.java b/src/test/model/ComputerGeneratorTest.java index 4748e39..923ccbc 100644 --- a/src/test/model/ComputerGeneratorTest.java +++ b/src/test/model/ComputerGeneratorTest.java @@ -13,7 +13,7 @@ public class ComputerGeneratorTest { @Test public void testGenerateAndCheck() { InputGetter.setInputNumber(12345); - gen.read(); + gen.setDigits(5); generator.setGenerateStatus(ComputerGenerator.GenerateStatus.GENERATING); while (generator.getGenerateStatus() != ComputerGenerator.GenerateStatus.FINISHED) { generator.generateAndCheck(gen); diff --git a/src/test/utils/GeneratorNumberTest.java b/src/test/utils/GeneratorNumberTest.java index 102feea..eff28b9 100644 --- a/src/test/utils/GeneratorNumberTest.java +++ b/src/test/utils/GeneratorNumberTest.java @@ -11,13 +11,13 @@ public class GeneratorNumberTest { @Test public void testRead() { gen.read(); - Logger.getLogger(GeneratorNumber.class.getName()).log(Level.ALL, ""); - } @Test public void testGenerate() { gen.getNumber(); } + + }