1.1 --- a/trunk/apps/rifle-validator/src/test/java/org/fundacionctic/rifle/visitor/core/CoreVisitorTest.java Wed Nov 11 10:41:57 2009 +0100
1.2 +++ b/trunk/apps/rifle-validator/src/test/java/org/fundacionctic/rifle/visitor/core/CoreVisitorTest.java Wed Nov 11 11:18:27 2009 +0100
1.3 @@ -24,8 +24,7 @@
1.4 public void rifWalker() throws Exception{
1.5 //1-Load document
1.6 String [] testSources = new String[]{
1.7 - "test/old/Core/Chaining_strategy_numeric-subtract_2/Chaining_strategy_numeric-subtract_2-conclusion.rif",
1.8 - "test/old/Core/Chaining_strategy_numeric-subtract_2/Chaining_strategy_numeric-subtract_2-premise.rif",
1.9 + "test/old/Core/Chaining_strategy_numeric-subtract_2/Chaining_strategy_numeric-subtract_2-premise.rif"
1.10 };
1.11 for (int i = 0; i < testSources.length; i++) {
1.12 ResourceLoader rl = new FilesResourceLoader(new String[]{testSources[i]});
1.13 @@ -35,8 +34,9 @@
1.14 chainRIFValidatorVisitor.add(new RIFCoreDefaultValidatorVisitor());
1.15 RIFValidator validator =
1.16 new CoreValidator(chainRIFValidatorVisitor);
1.17 - validator.validate(rl);
1.18 + validator.validate(rl);
1.19 Assert.assertEquals(0, validator.getRifManager().getErrorHandler().getErrors().size());
1.20 +
1.21 //Assert.assertEquals(0, validator.getErrorHandler().getWarnings().size());
1.22 }
1.23 }
1.24 @@ -45,8 +45,7 @@
1.25 public void rifChainingStrategy() throws Exception{
1.26 //1-Load document
1.27 String [] testSources = new String[]{
1.28 - "test/old/Core/Chaining_strategy_numeric-subtract_2/Chaining_strategy_numeric-subtract_2-conclusion.rif",
1.29 - "test/old/Core/Chaining_strategy_numeric-subtract_2/Chaining_strategy_numeric-subtract_2-premise.rif",
1.30 + "test/old/Core/Chaining_strategy_numeric-subtract_2/Chaining_strategy_numeric-subtract_2-premise.rif"
1.31 };
1.32 for (int i = 0; i < testSources.length; i++) {
1.33 ResourceLoader rl = new FilesResourceLoader(new String[]{testSources[i]});
1.34 @@ -66,9 +65,8 @@
1.35 @Test
1.36 public void rifAllBuiltinsIdentificationVisitorTest() throws Exception{
1.37 //1-Load document
1.38 - String [] testSources = new String[]{
1.39 - "test/old/Core/All_Builtins/All_Builtins-conclusion.rif",
1.40 - "test/old/Core/All_Builtins/All_Builtins-premise.rif",
1.41 + String [] testSources = new String[]{
1.42 + "test/old/Core/All_Builtins/All_Builtins-premise.rif"
1.43 };
1.44 for (int i = 0; i < testSources.length; i++) {
1.45 ResourceLoader rl = new FilesResourceLoader(new String[]{testSources[i]});
1.46 @@ -122,14 +120,13 @@
1.47 new CoreValidator(chainRIFValidatorVisitor);
1.48 validator.validate(rl);
1.49 //Assert.assertEquals(1, validator.getRifManager().getErrorHandler().getErrors().size());
1.50 - Assert.assertEquals(2, validator.getRifManager().getErrorHandler().getWarnings().size());
1.51 + Assert.assertEquals(1, validator.getRifManager().getErrorHandler().getWarnings().size());
1.52 }
1.53 }
1.54 @Test
1.55 public void rifFactorialForwardTest() throws Exception{
1.56 //1-Load document
1.57 - String [] testSources = new String[]{
1.58 - "test/old/Core/Factorial_Forward_Chaining/Factorial_Forward_Chaining-conclusion.rif",
1.59 + String [] testSources = new String[]{
1.60 "test/old/Core/Factorial_Forward_Chaining/Factorial_Forward_Chaining-premise.rif"
1.61 };
1.62 for (int i = 0; i < testSources.length; i++) {
1.63 @@ -150,9 +147,9 @@
1.64 public void rifFrameVisitorTest() throws Exception{
1.65 //1-Load document
1.66 String [] testSources = new String[]{
1.67 - "test/old/Core/Frame_slots_are_independent/Frame_slots_are_independent-conclusion.rif",
1.68 + // "test/old/Core/Frame_slots_are_independent/Frame_slots_are_independent-conclusion.rif",
1.69 "test/old/Core/Frame_slots_are_independent/Frame_slots_are_independent-premise.rif",
1.70 - "test/old/Core/Frames/Frames-conclusion.rif",
1.71 + //"test/old/Core/Frames/Frames-conclusion.rif",
1.72 "test/old/Core/Frames/Frames-premise.rif"
1.73 };
1.74 for (int i = 0; i < testSources.length; i++) {
1.75 @@ -213,7 +210,7 @@
1.76 public void rifRDFCombinationBlankNodeVisitor() throws Exception{
1.77 //1-Load document
1.78 String [] testSources = new String[]{
1.79 - "test/old/Core/RDF_Combination_Blank_Node/RDF_Combination_Blank_Node-conclusion.rif",
1.80 + // "test/old/Core/RDF_Combination_Blank_Node/RDF_Combination_Blank_Node-conclusion.rif",
1.81 "test/old/Core/RDF_Combination_Blank_Node/RDF_Combination_Blank_Node-premise.rif"
1.82 };
1.83 for (int i = 0; i < testSources.length; i++) {
1.84 @@ -263,7 +260,7 @@
1.85 public void rifNegativeRDFCombinationSubclassVisitor() throws Exception{
1.86 //1-Load document
1.87 String [] testSources = new String[]{
1.88 - "test/old/Core/RDF_Combination_SubClass/RDF_Combination_SubClass-nonconclusion_all.rif",
1.89 + "test/old/Core/RDF_Combination_SubClass/RDF_Combination_SubClass-nonconclusion_all.rif"
1.90 };
1.91 for (int i = 0; i < testSources.length; i++) {
1.92 ResourceLoader rl = new FilesResourceLoader(new String[]{testSources[i]});
1.93 @@ -282,7 +279,7 @@
1.94 public void rifPositiveRDFCombinationSubclassVisitor() throws Exception{
1.95 //1-Load document
1.96 String [] testSources = new String[]{
1.97 - "test/old/Core/RDF_Combination_SubClass_2/RDF_Combination_SubClass_2-conclusion_all.rif",
1.98 + "test/old/Core/RDF_Combination_SubClass_2/RDF_Combination_SubClass_2-conclusion_all.rif"
1.99 };
1.100 for (int i = 0; i < testSources.length; i++) {
1.101 ResourceLoader rl = new FilesResourceLoader(new String[]{testSources[i]});
1.102 @@ -302,7 +299,7 @@
1.103 public void rifOWLDLNonAnnotationVisitor() throws Exception{
1.104 //1-Load document
1.105 String [] testSources = new String[]{
1.106 - "test/old/Core/Non_Annotation_Entailment/Non-Annotation_Entailment-premise.rif",
1.107 + "test/old/Core/Non_Annotation_Entailment/Non-Annotation_Entailment-premise.rif"
1.108 };
1.109 for (int i = 0; i < testSources.length; i++) {
1.110 ResourceLoader rl = new FilesResourceLoader(new String[]{testSources[i]});
1.111 @@ -313,7 +310,7 @@
1.112 RIFValidator validator =
1.113 new CoreValidator(chainRIFValidatorVisitor);
1.114 validator.validate(rl);
1.115 - Assert.assertEquals(1, validator.getRifManager().getErrorHandler().getErrors().size());
1.116 + Assert.assertEquals(2, validator.getRifManager().getErrorHandler().getErrors().size());
1.117 }
1.118 }
1.119 @Test
1.120 @@ -331,7 +328,7 @@
1.121 RIFValidator validator =
1.122 new CoreValidator(chainRIFValidatorVisitor);
1.123 validator.validate(rl);
1.124 - Assert.assertEquals(1, validator.getRifManager().getErrorHandler().getErrors().size());
1.125 + Assert.assertEquals(0, validator.getRifManager().getErrorHandler().getErrors().size());
1.126 }
1.127 }
1.128 @Test