Tighten up regex

CalebFenton · Jul 26, 2016 · 2c11fe1 · 2c11fe1
1 parent ce1e2ce
commit 2c11fe1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/lib/dex-oracle/smali_file.rb b/lib/dex-oracle/smali_file.rb
@@ -57,7 +57,7 @@ def parse_methods
     body = nil
     @content.each_line do |line|
       if in_method
-        if /^\.end method/ =~ line
+        if /^\.end method$/ =~ line
           in_method = false
           @methods << SmaliMethod.new(@class, method_signature, body)
           next

diff --git a/spec/dex-oracle/smali_file_spec.rb b/spec/dex-oracle/smali_file_spec.rb
@@ -29,10 +29,11 @@
     describe '#update' do
       subject { smali_file.content }
       it 'should update modified methods' do
-        allow(File).to receive(:open)
         method = smali_file.methods.first
         method.modified = true
         method.body = "\nreturn-void\n"
+        # Make sure we don't save it
+        allow(File).to receive(:open)
         smali_file.update
         should eq ".class public LHelloWorld; # COMMENT;\n.super Ljava/lang/Object; # YEAH ;\n.implements Lsome/Interface1;\n.implements Lsome/Interface2;\n\n.field public static final someField:Z\n\n.method public static main([Ljava/lang/String;)V\nreturn-void\n.end method\n\n"
       end